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

Fix #14160 (#14161)

Browse source 
* Fix #14160

* Add testcase
This commit is contained in:
Clyybber 2020-04-30 02:01:07 +02:00 • committed by GitHub
commit d6e1b5c070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/ccgexprs.nim
View file

@ -2450,6 +2450,8 @@ proc genStmtList(p: BProc, n: PNode) =
genStmtListExprImpl: genStmtListExprImpl:
genStmts(p, n[^1]) genStmts(p, n[^1])
from parampatterns import isLValue
proc upConv(p: BProc, n: PNode, d: var TLoc) = proc upConv(p: BProc, n: PNode, d: var TLoc) =
var a: TLoc var a: TLoc
initLocExpr(p, n[0], a) initLocExpr(p, n[0], a)
@ -2468,7 +2470,11 @@ proc upConv(p: BProc, n: PNode, d: var TLoc) =
linefmt(p, cpsStmts, "if (!#isObj($1, $2)){ #raiseObjectConversionError(); $3}$n", linefmt(p, cpsStmts, "if (!#isObj($1, $2)){ #raiseObjectConversionError(); $3}$n",
[r, checkFor, raiseInstr(p)]) [r, checkFor, raiseInstr(p)])
if n[0].typ.kind != tyObject: if n[0].typ.kind != tyObject:
putIntoDest(p, d, n, if n.isLValue:
putIntoDest(p, d, n,
"(*(($1*) (&($2))))" % [getTypeDesc(p.module, n.typ), rdLoc(a)], a.storage)
else:
putIntoDest(p, d, n,
"(($1) ($2))" % [getTypeDesc(p.module, n.typ), rdLoc(a)], a.storage) "(($1) ($2))" % [getTypeDesc(p.module, n.typ), rdLoc(a)], a.storage)
else: else:
putIntoDest(p, d, n, "(*($1*) ($2))" % putIntoDest(p, d, n, "(*($1*) ($2))" %

15
tests/ccgbugs/t14160.nim Normal file
View file

@ -0,0 +1,15 @@
type
TPassContext = object of RootObj
PPassContext = ref TPassContext
PCtx = ref object of TPassContext
a: int
ModuleGraph = object
vm: RootRef
proc main() =
var g = ModuleGraph(vm: new(Pctx))
PCtx(g.vm) = nil #This generates invalid C code
main()