summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2020-01-03 01:21:45 +0100
committerGitHub <noreply@github.com>2020-01-03 01:21:45 +0100
commit0ecb709cbeec2e77d6ce8dae251270a7d1e3826e (patch)
treeae1562c73b698473830ee05f3753cc44b14e4998
parentc949b81efdeb08b38224e1678ad140b7b7663b15 (diff)
downloadNim-0ecb709cbeec2e77d6ce8dae251270a7d1e3826e.tar.gz
fixes #12978 (#13012)
-rw-r--r--compiler/cgen.nim10
-rw-r--r--tests/destructor/tcomplexobjconstr.nim25
2 files changed, 30 insertions, 5 deletions
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index f91f66933..da041bf14 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -362,12 +362,14 @@ proc genObjectInit(p: BProc, section: TCProcSection, t: PType, a: var TLoc,
     linefmt(p, section, "$1.m_type = $2;$n", [r, genTypeInfo(p.module, t, a.lode.info)])
   of frEmbedded:
     if optTinyRtti in p.config.globalOptions:
+      var tmp: TLoc
       if mode == constructRefObj:
-        var n = newNodeIT(nkObjConstr, a.lode.info, t)
-        n.add newNodeIT(nkType, a.lode.info, t)
-        genObjConstr(p, n, a)
+        let objType = t.skipTypes(abstractInst+{tyRef})
+        rawConstExpr(p, newNodeIT(nkType, a.lode.info, objType), tmp)
+        linefmt(p, cpsStmts,
+            "#nimCopyMem((void*)$1, (NIM_CONST void*)&$2, sizeof($3));$n",
+            [rdLoc(a), rdLoc(tmp), getTypeDesc(p.module, objType)])
       else:
-        var tmp: TLoc
         rawConstExpr(p, newNodeIT(nkType, a.lode.info, t), tmp)
         genAssignment(p, a, tmp, {})
     else:
diff --git a/tests/destructor/tcomplexobjconstr.nim b/tests/destructor/tcomplexobjconstr.nim
index 23c615783..fd112b6e2 100644
--- a/tests/destructor/tcomplexobjconstr.nim
+++ b/tests/destructor/tcomplexobjconstr.nim
@@ -1,5 +1,6 @@
 discard """
-  output: "true"
+  output: '''true
+OK'''
   cmd: "nim c --gc:arc $file"
 """
 
@@ -31,3 +32,25 @@ assert y.more[2] of MyObject1
 assert y.more[2] of RootObj
 
 echo "true"
+
+# bug #12978
+type
+  Vector2* = object of RootObj
+    x*, y*: float
+
+type
+  Vertex* = ref object
+    point*: Vector2
+
+proc newVertex*(p: Vector2): Vertex =
+  return Vertex(point: p)
+
+proc createVertex*(p: Vector2): Vertex =
+  result = newVertex(p)
+
+proc p =
+  var x = Vector2(x: 1, y: 2)
+  let other = createVertex(x)
+  echo "OK"
+
+p()