add -d:nimWorkaround14447

nim-lang · May 28, 2020 · 832063d · 832063d
1 parent d5d03b2
commit 832063d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/compiler/lambdalifting.nim b/compiler/lambdalifting.nim
@@ -291,7 +291,8 @@ proc markAsClosure(g: ModuleGraph; owner: PSym; n: PNode) =
   if illegalCapture(s):
     localError(g.config, n.info,
       ("'$1' is of type <$2> which cannot be captured as it would violate memory" &
-       " safety, declared here: $3") % [s.name.s, typeToString(s.typ), g.config$s.info])
+       " safety, declared here: $3; using '-d:nimWorkaround14447' helps in some cases") %
+      [s.name.s, typeToString(s.typ), g.config$s.info])
   elif owner.typ.callConv notin {ccClosure, ccDefault}:
     localError(g.config, n.info, "illegal capture '$1' because '$2' has the calling convention: <$3>" %
       [s.name.s, owner.name.s, CallingConvToStr[owner.typ.callConv]])

diff --git a/lib/system/iterators.nim b/lib/system/iterators.nim
@@ -1,4 +1,4 @@
-when defined(nimHasLentIterators):
+when defined(nimHasLentIterators) and not defined(nimWorkaround14447):
   template lent2(T): untyped =
     # xxx this should actually depend on T.sizeof >= thresLentSizeof
     # with for example `thresLentSizeof ~= int.sizeof`:

diff --git a/testament/important_packages.nim b/testament/important_packages.nim
@@ -134,4 +134,4 @@ pkg2 "websocket", false, "nim c websocket.nim"
 pkg2 "with"
 pkg2 "ws"
 pkg2 "yaml"
-pkg2 "zero_functional", false, "nim c -r test.nim"
+pkg2 "zero_functional", false, "nim c -r -d:nimWorkaround14447 test.nim"