jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #12281 [backport]

Browse source
This commit is contained in:
Andreas Rumpf 2019-09-30 20:42:16 +02:00
commit 72acf5de94
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/sempass2.nim
View file

@ -751,7 +751,9 @@ proc track(tracked: PEffects, n: PNode) =
discard discard
else: else:
message(tracked.config, arg.info, warnProveInit, $arg) message(tracked.config, arg.info, warnProveInit, $arg)
createTypeBoundOps(tracked.graph, tracked.c, n[1].typ.lastSon, n.info) # check required for 'nim check':
if n[1].typ.len > 0:
createTypeBoundOps(tracked.graph, tracked.c, n[1].typ.lastSon, n.info)
for i in 0 ..< safeLen(n): for i in 0 ..< safeLen(n):
track(tracked, n.sons[i]) track(tracked, n.sons[i])
of nkDotExpr: of nkDotExpr:

11
compiler/vm.nim
View file

@ -1567,19 +1567,20 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
regs[ra].node.strVal = opSlurp(regs[rb].node.strVal, c.debug[pc], regs[ra].node.strVal = opSlurp(regs[rb].node.strVal, c.debug[pc],
c.module, c.config) c.module, c.config)
of opcGorge: of opcGorge:
decodeBC(rkNode)
inc pc
let rd = c.code[pc].regA
createStr regs[ra]
if defined(nimsuggest) or c.config.cmd == cmdCheck: if defined(nimsuggest) or c.config.cmd == cmdCheck:
discard "don't run staticExec for 'nim suggest'" discard "don't run staticExec for 'nim suggest'"
regs[ra].node.strVal = ""
else: else:
when defined(nimcore): when defined(nimcore):
decodeBC(rkNode)
inc pc
let rd = c.code[pc].regA
createStr regs[ra]
regs[ra].node.strVal = opGorge(regs[rb].node.strVal, regs[ra].node.strVal = opGorge(regs[rb].node.strVal,
regs[rc].node.strVal, regs[rd].node.strVal, regs[rc].node.strVal, regs[rd].node.strVal,
c.debug[pc], c.config)[0] c.debug[pc], c.config)[0]
else: else:
regs[ra].node.strVal = ""
globalError(c.config, c.debug[pc], "VM is not built with 'gorge' support") globalError(c.config, c.debug[pc], "VM is not built with 'gorge' support")
of opcNError, opcNWarning, opcNHint: of opcNError, opcNWarning, opcNHint:
decodeB(rkNode) decodeB(rkNode)