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

C++ codegen: emit correctly typed code for closures in 'const'; refs #7870

Browse source
This commit is contained in:
Araq 2018-10-02 19:35:24 +02:00
commit 7935c4aa5a
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/ccgexprs.nim
View file

@ -2571,15 +2571,21 @@ proc genConstExpr(p: BProc, n: PNode): Rope =
var t = skipTypes(n.typ, abstractInst) var t = skipTypes(n.typ, abstractInst)
if t.kind == tySequence: if t.kind == tySequence:
result = genConstSeq(p, n, n.typ) result = genConstSeq(p, n, n.typ)
elif t.kind == tyProc and t.callConv == ccClosure and n.len > 0 and elif t.kind == tyProc and t.callConv == ccClosure and n.len > 1 and
n.sons[0].kind == nkNilLit and n.sons[1].kind == nkNilLit: n.sons[1].kind == nkNilLit:
# Conversion: nimcall -> closure.
# this hack fixes issue that nkNilLit is expanded to {NIM_NIL,NIM_NIL} # this hack fixes issue that nkNilLit is expanded to {NIM_NIL,NIM_NIL}
# this behaviour is needed since closure_var = nil must be # this behaviour is needed since closure_var = nil must be
# expanded to {NIM_NIL,NIM_NIL} # expanded to {NIM_NIL,NIM_NIL}
# in VM closures are initialized with nkPar(nkNilLit, nkNilLit) # in VM closures are initialized with nkPar(nkNilLit, nkNilLit)
# leading to duplicate code like this: # leading to duplicate code like this:
# "{NIM_NIL,NIM_NIL}, {NIM_NIL,NIM_NIL}" # "{NIM_NIL,NIM_NIL}, {NIM_NIL,NIM_NIL}"
if n[0].kind == nkNilLit:
result = ~"{NIM_NIL,NIM_NIL}" result = ~"{NIM_NIL,NIM_NIL}"
else:
var d: TLoc
initLocExpr(p, n[0], d)
result = "{(($1) $2),NIM_NIL}" % [getClosureType(p.module, t, clHalfWithEnv), rdLoc(d)]
else: else:
result = genConstSimpleList(p, n) result = genConstSimpleList(p, n)
of nkObjConstr: of nkObjConstr: