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

Fix for newStringOfCap in VM (#7901)

Browse source
This commit is contained in:
Oscar Nihlgård 2018-06-04 13:38:26 +02:00 • committed by Andreas Rumpf
commit 440212a154
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/vmgen.nim
View file

@ -844,7 +844,8 @@ proc genMagic(c: PCtx; n: PNode; dest: var TDest; m: TMagic) =
of mNewStringOfCap: of mNewStringOfCap:
# we ignore the 'cap' argument and translate it as 'newString(0)'. # we ignore the 'cap' argument and translate it as 'newString(0)'.
# eval n.sons[1] for possible side effects: # eval n.sons[1] for possible side effects:
var tmp = c.genx(n.sons[1]) c.freeTemp(c.genx(n.sons[1]))
var tmp = c.getTemp(n.sons[1].typ)
c.gABx(n, opcLdImmInt, tmp, 0) c.gABx(n, opcLdImmInt, tmp, 0)
if dest < 0: dest = c.getTemp(n.typ) if dest < 0: dest = c.getTemp(n.typ)
c.gABC(n, opcNewStr, dest, tmp) c.gABC(n, opcNewStr, dest, tmp)

8
tests/vm/tvmmisc.nim
View file

@ -82,3 +82,11 @@ block:
assert fileExists("MISSINGFILE") == false assert fileExists("MISSINGFILE") == false
assert dirExists("MISSINGDIR") == false assert dirExists("MISSINGDIR") == false
# #7210
block:
static:
proc f(size: int): int =
var some = newStringOfCap(size)
result = size
doAssert f(4) == 4