jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't introduce 'dispose', use '=dispose', fixes #17003 [backport:1.4] (#17062)

Browse source
This commit is contained in:
Andreas Rumpf 2021-02-17 00:07:37 +01:00 • committed by GitHub
commit e463a67c74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/system/arc.nim
View file

@ -163,7 +163,7 @@ proc nimRawDispose(p: pointer, alignment: int) {.compilerRtl.} =
let hdrSize = align(sizeof(RefHeader), alignment) let hdrSize = align(sizeof(RefHeader), alignment)
alignedDealloc(p -! hdrSize, alignment) alignedDealloc(p -! hdrSize, alignment)
template dispose*[T](x: owned(ref T)) = nimRawDispose(cast[pointer](x), T.alignOf) template `=dispose`*[T](x: owned(ref T)) = nimRawDispose(cast[pointer](x), T.alignOf)
#proc dispose*(x: pointer) = nimRawDispose(x) #proc dispose*(x: pointer) = nimRawDispose(x)
proc nimDestroyAndDispose(p: pointer) {.compilerRtl, raises: [].} = proc nimDestroyAndDispose(p: pointer) {.compilerRtl, raises: [].} =

2
tests/destructor/tbintree2.nim
View file

@ -57,7 +57,7 @@ proc `=destroy`(t: var Tree) {.nodestroy.} =
let x = s.pop let x = s.pop
if x.left != nil: s.add(x.left) if x.left != nil: s.add(x.left)
if x.right != nil: s.add(x.right) if x.right != nil: s.add(x.right)
dispose(x) `=dispose`(x)
`=destroy`(s) `=destroy`(s)
proc hasValue(self: var Tree, x: int32): bool = proc hasValue(self: var Tree, x: int32): bool =