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

fixes #12612 [backport] (#12681)

Browse source
This commit is contained in:
Andreas Rumpf 2019-11-19 12:09:36 +01:00 • committed by GitHub
commit 56a00da34a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/vmgen.nim
View file

@ -220,9 +220,9 @@ proc getFreeRegister(cc: PCtx; k: TSlotKind; start: int): TRegister =
return TRegister(i) return TRegister(i)
if c.maxSlots >= high(TRegister): if c.maxSlots >= high(TRegister):
globalError(cc.config, cc.bestEffort, "VM problem: too many registers required") globalError(cc.config, cc.bestEffort, "VM problem: too many registers required")
result = TRegister(c.maxSlots) result = TRegister(max(c.maxSlots, start))
c.slots[c.maxSlots] = (inUse: true, kind: k) c.slots[result] = (inUse: true, kind: k)
inc c.maxSlots c.maxSlots = result + 1
proc getTemp(cc: PCtx; tt: PType): TRegister = proc getTemp(cc: PCtx; tt: PType): TRegister =
let typ = tt.skipTypesOrNil({tyStatic}) let typ = tt.skipTypesOrNil({tyStatic})
@ -1483,7 +1483,10 @@ proc checkCanEval(c: PCtx; n: PNode) =
if {sfCompileTime, sfGlobal} <= s.flags: return if {sfCompileTime, sfGlobal} <= s.flags: return
if s.kind in {skVar, skTemp, skLet, skParam, skResult} and if s.kind in {skVar, skTemp, skLet, skParam, skResult} and
not s.isOwnedBy(c.prc.sym) and s.owner != c.module and c.mode != emRepl: not s.isOwnedBy(c.prc.sym) and s.owner != c.module and c.mode != emRepl:
cannotEval(c, n) # little hack ahead for bug #12612: assume gensym'ed variables
# are in the right scope:
if sfGenSym in s.flags and c.prc.sym == nil: discard
else: cannotEval(c, n)
elif s.kind in {skProc, skFunc, skConverter, skMethod, elif s.kind in {skProc, skFunc, skConverter, skMethod,
skIterator} and sfForward in s.flags: skIterator} and sfForward in s.flags:
cannotEval(c, n) cannotEval(c, n)
@ -1558,7 +1561,7 @@ proc genAsgn(c: PCtx; le, ri: PNode; requiresCopy: bool) =
else: else:
if s.kind == skForVar: c.setSlot s if s.kind == skForVar: c.setSlot s
internalAssert c.config, s.position > 0 or (s.position == 0 and internalAssert c.config, s.position > 0 or (s.position == 0 and
s.kind in {skParam,skResult}) s.kind in {skParam, skResult})
var dest: TRegister = s.position + ord(s.kind == skParam) var dest: TRegister = s.position + ord(s.kind == skParam)
assert le.typ != nil assert le.typ != nil
if needsAdditionalCopy(le) and s.kind in {skResult, skVar, skParam}: if needsAdditionalCopy(le) and s.kind in {skResult, skVar, skParam}:
@ -1638,7 +1641,7 @@ proc genRdVar(c: PCtx; n: PNode; dest: var TDest; flags: TGenFlags) =
else: else:
if s.kind == skForVar and c.mode == emRepl: c.setSlot(s) if s.kind == skForVar and c.mode == emRepl: c.setSlot(s)
if s.position > 0 or (s.position == 0 and if s.position > 0 or (s.position == 0 and
s.kind in {skParam,skResult}): s.kind in {skParam, skResult}):
if dest < 0: if dest < 0:
dest = s.position + ord(s.kind == skParam) dest = s.position + ord(s.kind == skParam)
internalAssert(c.config, c.prc.slots[dest].kind < slotSomeTemp) internalAssert(c.config, c.prc.slots[dest].kind < slotSomeTemp)

8
tests/stdlib/tstrformat.nim
View file

@ -134,6 +134,14 @@ doAssert fmt"{nat:3o}" == "100"
doAssert fmt"{nat:3x}" == " 40" doAssert fmt"{nat:3x}" == " 40"
doAssert fmt"{nat:3X}" == " 40" doAssert fmt"{nat:3X}" == " 40"
# bug #12612
proc my_proc =
const value = "value"
const a = &"{value}"
assert a == value
my_proc()
block: block:
template fmt(pattern: string; openCloseChar: char): untyped = template fmt(pattern: string; openCloseChar: char): untyped =
fmt(pattern, openCloseChar, openCloseChar) fmt(pattern, openCloseChar, openCloseChar)