diff options
author | LemonBoy <LemonBoy@users.noreply.github.com> | 2019-02-09 19:55:26 +0100 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2019-02-09 19:55:26 +0100 |
commit | 0c4d1fd10b0c69cef2597a59799d87110d613eae (patch) | |
tree | b8580dbb04d434fb504fd2ba46177102b1208e50 | |
parent | 1e88bf1defe2aeb18394e4130f019acb70a63c75 (diff) | |
download | Nim-0c4d1fd10b0c69cef2597a59799d87110d613eae.tar.gz |
Do not walk into type sub-nodes for cast/conv expr (#10616)
-rw-r--r-- | compiler/destroyer.nim | 6 | ||||
-rw-r--r-- | tests/destructor/tcast.nim | 18 |
2 files changed, 24 insertions, 0 deletions
diff --git a/compiler/destroyer.nim b/compiler/destroyer.nim index 22ace3634..6c47c8884 100644 --- a/compiler/destroyer.nim +++ b/compiler/destroyer.nim @@ -601,6 +601,12 @@ proc p(n: PNode; c: var Con): PNode = of nkNone..nkNilLit, nkTypeSection, nkProcDef, nkConverterDef, nkMethodDef, nkIteratorDef, nkMacroDef, nkTemplateDef, nkLambda, nkDo, nkFuncDef: result = n + of nkCast, nkHiddenStdConv, nkHiddenSubConv, nkConv: + result = copyNode(n) + # Destination type + result.add n[0] + # Analyse the inner expression + result.add p(n[1], c) else: result = copyNode(n) recurse(n, result) diff --git a/tests/destructor/tcast.nim b/tests/destructor/tcast.nim new file mode 100644 index 000000000..7d5a1954c --- /dev/null +++ b/tests/destructor/tcast.nim @@ -0,0 +1,18 @@ +discard """ + cmd: '''nim c --newruntime $file''' +""" + +# Make sure we don't walk cast[T] type section while injecting sinks/destructors +block: + type + XY[T] = object + discard + + proc `=`[T](x: var XY[T]; v: XY[T]) {.error.} + proc `=sink`[T](x: var XY[T]; v: XY[T]) {.error.} + + proc main[T]() = + var m = cast[ptr XY[T]](alloc0(sizeof(XY[T]))) + doAssert(m != nil) + + main[int]() |