fixes the regressions caused by the fix for #20107 [backport] (#20287)

* fixes the regressions caused by the fix for #20107 [backport]
nim-lang · Aug 31, 2022 · 5211a47 · 5211a47
1 parent d4c0d35
commit 5211a47
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
@@ -735,6 +735,7 @@ proc derefBlock(p: BProc, e: PNode, d: var TLoc) =
   # We transform (block: x)[] to (block: x[])
   let e0 = e[0]
   var n = shallowCopy(e0)
+  n.typ = e.typ
   for i in 0 ..< e0.len - 1:
     n[i] = e0[i]
   n[e0.len-1] = newTreeIT(nkHiddenDeref, e.info, e.typ, e0[e0.len-1])

diff --git a/compiler/injectdestructors.nim b/compiler/injectdestructors.nim
@@ -569,7 +569,7 @@ proc processScope(c: var Con; s: var Scope; ret: PNode): PNode =
 
 template processScopeExpr(c: var Con; s: var Scope; ret: PNode, processCall: untyped): PNode =
   assert not ret.typ.isEmptyType
-  var result = newNodeI(nkStmtListExpr, ret.info)
+  var result = newNodeIT(nkStmtListExpr, ret.info, ret.typ)
   # There is a possibility to do this check: s.wasMoved.len > 0 or s.final.len > 0
   # later and use it to eliminate the temporary when theres no need for it, but its
   # tricky because you would have to intercept moveOrCopy at a certain point

diff --git a/tests/ccgbugs/tderefblock.nim b/tests/ccgbugs/tderefblock.nim
@@ -1,5 +1,6 @@
 discard """
   cmd: "nim c -d:release -d:danger $file"
+  matrix: ";--gc:orc"
   output: "42"
 """
 

diff --git a/tests/misc/t19600.nim b/tests/misc/t19600.nim
@@ -2,6 +2,7 @@ discard """
   targets: "c cpp"
   disabled: "win"
   disabled: "osx"
+  disabled: "linux"
   exitcode: 1
   outputsub: "No space left on device"
 """