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

fixes #14340

Browse source
This commit is contained in:
Araq 2020-05-14 08:51:47 +02:00
commit 278b4582f5
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/vm.nim
View file

@ -453,7 +453,7 @@ proc opConv(c: PCtx; dest: var TFullReg, src: TFullReg, desttyp, srctyp: PType):
dest.intVal = cast[BiggestInt](value) dest.intVal = cast[BiggestInt](value)
of tyBool: of tyBool:
dest.ensureKind(rkInt) dest.ensureKind(rkInt)
dest.intVal = dest.intVal =
case skipTypes(srctyp, abstractRange).kind case skipTypes(srctyp, abstractRange).kind
of tyFloat..tyFloat64: int(src.floatVal != 0.0) of tyFloat..tyFloat64: int(src.floatVal != 0.0)
else: int(src.intVal != 0) else: int(src.intVal != 0)
@ -668,7 +668,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
elif src.kind notin {nkEmpty..nkFloat128Lit} and idx <% src.len: elif src.kind notin {nkEmpty..nkFloat128Lit} and idx <% src.len:
regs[ra].node = src[idx] regs[ra].node = src[idx]
else: else:
stackTrace(c, tos, pc, formatErrorIndexBound(idx, src.len-1)) stackTrace(c, tos, pc, formatErrorIndexBound(idx, src.safeLen-1))
of opcLdArrAddr: of opcLdArrAddr:
# a = addr(b[c]) # a = addr(b[c])
decodeBC(rkNodeAddr) decodeBC(rkNodeAddr)
@ -679,7 +679,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
if src.kind notin {nkEmpty..nkTripleStrLit} and idx <% src.len: if src.kind notin {nkEmpty..nkTripleStrLit} and idx <% src.len:
regs[ra].nodeAddr = addr src.sons[idx] regs[ra].nodeAddr = addr src.sons[idx]
else: else:
stackTrace(c, tos, pc, formatErrorIndexBound(idx, src.len-1)) stackTrace(c, tos, pc, formatErrorIndexBound(idx, src.safeLen-1))
of opcLdStrIdx: of opcLdStrIdx:
decodeBC(rkInt) decodeBC(rkInt)
let idx = regs[rc].intVal.int let idx = regs[rc].intVal.int
@ -703,7 +703,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
elif idx <% arr.len: elif idx <% arr.len:
writeField(arr[idx], regs[rc]) writeField(arr[idx], regs[rc])
else: else:
stackTrace(c, tos, pc, formatErrorIndexBound(idx, arr.len-1)) stackTrace(c, tos, pc, formatErrorIndexBound(idx, arr.safeLen-1))
of opcLdObj: of opcLdObj:
# a = b.c # a = b.c
decodeBC(rkNode) decodeBC(rkNode)