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

make the build more robust

Browse source
This commit is contained in:
Andreas Rumpf 2018-04-30 11:54:26 +02:00
commit 4948cf3b4c
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/ccgexprs.nim
View file

@ -909,9 +909,14 @@ proc genSeqElem(p: BProc, n, x, y: PNode, d: var TLoc) =
if ty.kind in {tyRef, tyPtr}: if ty.kind in {tyRef, tyPtr}:
ty = skipTypes(ty.lastSon, abstractVarRange) # emit range check: ty = skipTypes(ty.lastSon, abstractVarRange) # emit range check:
if optBoundsCheck in p.options: if optBoundsCheck in p.options:
linefmt(p, cpsStmts, if ty.kind == tyString and not defined(nimNoZeroTerminator):
"if (!$2 || (NU)($1) >= (NU)($2->$3)) #raiseIndexError();$n", linefmt(p, cpsStmts,
rdLoc(b), rdLoc(a), lenField(p)) "if (!$2 || (NU)($1) > (NU)($2->$3)) #raiseIndexError();$n",
rdLoc(b), rdLoc(a), lenField(p))
else:
linefmt(p, cpsStmts,
"if (!$2 || (NU)($1) >= (NU)($2->$3)) #raiseIndexError();$n",
rdLoc(b), rdLoc(a), lenField(p))
if d.k == locNone: d.storage = OnHeap if d.k == locNone: d.storage = OnHeap
if skipTypes(a.t, abstractVar).kind in {tyRef, tyPtr}: if skipTypes(a.t, abstractVar).kind in {tyRef, tyPtr}:
a.r = rfmt(nil, "(*$1)", a.r) a.r = rfmt(nil, "(*$1)", a.r)

1
compiler/condsyms.nim
View file

@ -115,3 +115,4 @@ proc initDefines*() =
defineSymbol("nimSymKind") defineSymbol("nimSymKind")
defineSymbol("nimVmEqIdent") defineSymbol("nimVmEqIdent")
defineSymbol("nimNoNil") defineSymbol("nimNoNil")
defineSymbol("nimNoZeroTerminator")