summary refs log tree commit diff stats
path: root/compiler
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2019-07-15 10:56:20 +0200
committerAraq <rumpf_a@web.de>2019-07-15 10:56:55 +0200
commitedbe02b4e1f028aa3c26f9a1145c25c33a7f5cae (patch)
treec6d5cf90b2f058df6cbc4e6c6b26146798a191f1 /compiler
parentdf53c68a363318c9ce080b6827b573a3d60ec760 (diff)
downloadNim-edbe02b4e1f028aa3c26f9a1145c25c33a7f5cae.tar.gz
newruntime: progress to make 'async' work with --newruntime
Diffstat (limited to 'compiler')
-rw-r--r--compiler/injectdestructors.nim4
-rw-r--r--compiler/lambdalifting.nim2
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/injectdestructors.nim b/compiler/injectdestructors.nim
index 2f883a8b3..a8a2cf97f 100644
--- a/compiler/injectdestructors.nim
+++ b/compiler/injectdestructors.nim
@@ -154,7 +154,7 @@ type
     uninit: IntSet # set of uninit'ed vars
     uninitComputed: bool
 
-const toDebug = "" # "serverNimAsyncContinue"
+const toDebug = "" # "server" # "serverNimAsyncContinue"
 
 template dbg(body) =
   when toDebug.len > 0:
@@ -311,6 +311,8 @@ proc checkForErrorPragma(c: Con; t: PType; ri: PNode; opname: string) =
       m.add "; try to make "
       m.add renderTree(ri)
       m.add " a 'sink' parameter"
+  m.add "; routine: "
+  m.add c.owner.name.s
   localError(c.graph.config, ri.info, errGenerated, m)
 
 proc makePtrType(c: Con, baseType: PType): PType =
diff --git a/compiler/lambdalifting.nim b/compiler/lambdalifting.nim
index 726a64d21..6d87444ec 100644
--- a/compiler/lambdalifting.nim
+++ b/compiler/lambdalifting.nim
@@ -344,7 +344,7 @@ proc createUpField(c: var DetectionPass; dest, dep: PSym; info: TLineInfo) =
   # with cycles properly, so it's better to produce a weak ref (=ptr) here.
   # This seems to be generally correct but since it's a bit risky it's only
   # enabled for gcDestructors.
-  let fieldType = if c.graph.config.selectedGC == gcDestructors:
+  let fieldType = if false: # c.graph.config.selectedGC == gcDestructors:
                     c.getEnvTypeForOwnerUp(dep, info) #getHiddenParam(dep).typ
                   else:
                     c.getEnvTypeForOwner(dep, info)