From d6e1b5c070bf58449bf4af210ec099418d496aa5 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 30 Apr 2020 02:01:07 +0200
Subject: Fix #14160 (#14161)

* Fix #14160

* Add testcase
---
 compiler/ccgexprs.nim    |  8 +++++++-
 tests/ccgbugs/t14160.nim | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tests/ccgbugs/t14160.nim

diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
index 806eca744..0b9958ee4 100644
--- a/compiler/ccgexprs.nim
+++ b/compiler/ccgexprs.nim
@@ -2450,6 +2450,8 @@ proc genStmtList(p: BProc, n: PNode) =
   genStmtListExprImpl:
     genStmts(p, n[^1])
 
+from parampatterns import isLValue
+
 proc upConv(p: BProc, n: PNode, d: var TLoc) =
   var a: TLoc
   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",
               [r, checkFor, raiseInstr(p)])
   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)
   else:
     putIntoDest(p, d, n, "(*($1*) ($2))" %
diff --git a/tests/ccgbugs/t14160.nim b/tests/ccgbugs/t14160.nim
new file mode 100644
index 000000000..be7088e29
--- /dev/null
+++ b/tests/ccgbugs/t14160.nim
@@ -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()
-- 
cgit 1.4.1-2-gfad0