Merge branch 'devel' into new-name-mangling

2017-02-02 21:56:34 +01:00 · 2017-02-02 21:56:34 +01:00 · 8af10ae3b9
commit 8af10ae3b9
parent fab69661ad e236039d10
6 changed files with 27 additions and 20 deletions
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@ -932,7 +932,10 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
                            c.module
        var macroCall = newNodeI(nkCall, c.debug[pc])
        macroCall.add(newSymNode(prc))
-        for i in 1 .. rc-1: macroCall.add(regs[rb+i].regToNode)
+        for i in 1 .. rc-1:
+          let node = regs[rb+i].regToNode
+          node.info = c.debug[pc]
+          macroCall.add(node)
        let a = evalTemplate(macroCall, prc, genSymOwner)
        a.recSetFlagIsRef
        ensureKind(rkNode)