diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/vm.nim | 12 | ||||
| -rw-r--r-- | compiler/vmgen.nim | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/compiler/vm.nim b/compiler/vm.nim index be522ced0..c4e8df90e 100644 --- a/compiler/vm.nim +++ b/compiler/vm.nim @@ -76,12 +76,13 @@ proc stackTraceAux(c: PCtx; x: PStackFrame; pc: int; recursionLimit=100) = msgWriteln(s) proc stackTrace(c: PCtx, tos: PStackFrame, pc: int, - msg: TMsgKind, arg = "") = + msg: TMsgKind, arg = "", n: PNode = nil) = msgWriteln("stack trace: (most recent call last)") stackTraceAux(c, tos, pc) # XXX test if we want 'globalError' for every mode - if c.mode == emRepl: globalError(c.debug[pc], msg, arg) - else: localError(c.debug[pc], msg, arg) + let lineInfo = if n == nil: c.debug[pc] else: n.info + if c.mode == emRepl: globalError(lineInfo, msg, arg) + else: localError(lineInfo, msg, arg) proc bailOut(c: PCtx; tos: PStackFrame) = stackTrace(c, tos, c.exceptionInstr, errUnhandledExceptionX, @@ -1245,7 +1246,10 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg = regs[rc].node.strVal, regs[rd].node.strVal, c.debug[pc]) of opcNError: - stackTrace(c, tos, pc, errUser, regs[ra].node.strVal) + decodeB(rkNode) + let a = regs[ra].node + let b = regs[rb].node + stackTrace(c, tos, pc, errUser, a.strVal, if b.kind == nkNilLit: nil else: b) of opcNWarning: message(c.debug[pc], warnUser, regs[ra].node.strVal) of opcNHint: diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim index 6bfc33f00..ed8f3f338 100644 --- a/compiler/vmgen.nim +++ b/compiler/vmgen.nim @@ -1068,7 +1068,7 @@ proc genMagic(c: PCtx; n: PNode; dest: var TDest; m: TMagic) = else: # setter unused(n, dest) - genUnaryStmt(c, n, opcNError) + genBinaryStmt(c, n, opcNError) of mNCallSite: if dest < 0: dest = c.getTemp(n.typ) c.gABC(n, opcCallSite, dest) |