From 275c7ccf82e03622258c135890c0419e70ee0884 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Tue, 10 Sep 2013 22:04:12 +0200
Subject: [PATCH] fixes #575

---
 compiler/ccgexprs.nim   |  3 +--
 compiler/cgen.nim       |  8 +-------
 lib/system/assign.nim   |  2 ++
 lib/system/channels.nim |  4 +++-
 tests/run/tobjasgn.nim  | 39 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 tests/run/tobjasgn.nim

diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
index 6b39062269..c50fd4536c 100644
--- a/compiler/ccgexprs.nim
+++ b/compiler/ccgexprs.nim
@@ -304,7 +304,7 @@ proc genAssignment(p: BProc, dest, src: TLoc, flags: TAssignmentFlags) =
   of tyObject:
     # XXX: check for subtyping?
     if needsComplexAssignment(ty):
-      if asgnComplexity(ty.n) <= 4:
+      if ty.sons[0].isNil and asgnComplexity(ty.n) <= 4:
         discard getTypeDesc(p.module, ty)
         internalAssert ty.n != nil
         genOptAsgnObject(p, dest, src, flags, ty.n)
@@ -1017,7 +1017,6 @@ proc genObjConstr(p: BProc, e: PNode, d: var TLoc) =
     rawGenNew(p, tmp, nil)
     t = t.sons[0].skipTypes(abstractInst)
     r = ropef("(*$1)", r)
-  # XXX object initialization? but not necessary for temps, is it?
   discard getTypeDesc(p.module, t)
   for i in 1 .. <e.len:
     let it = e.sons[i]
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 0c3f2da840..f33de9df09 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -384,12 +384,6 @@ proc initLocalVar(p: BProc, v: PSym, immediateAsgn: bool) =
     if not immediateAsgn:
       constructLoc(p, v.loc)
 
-proc initTemp(p: BProc, tmp: var TLoc) =
-  # XXX: This is still suspicious.
-  # Objects should always be constructed?
-  if containsGarbageCollectedRef(tmp.t) or isInvalidReturnType(tmp.t):
-    constructLoc(p, tmp)
-
 proc getTemp(p: BProc, t: PType, result: var TLoc) = 
   inc(p.labels)
   if gCmd == cmdCompileToLLVM: 
@@ -402,7 +396,7 @@ proc getTemp(p: BProc, t: PType, result: var TLoc) =
   result.t = getUniqueType(t)
   result.s = OnStack
   result.flags = {}
-  initTemp(p, result)
+  constructLoc(p, result)
 
 proc keepAlive(p: BProc, toKeepAlive: TLoc) =
   when false:
diff --git a/lib/system/assign.nim b/lib/system/assign.nim
index 19d4ebf574..3b43abcd1b 100644
--- a/lib/system/assign.nim
+++ b/lib/system/assign.nim
@@ -73,6 +73,8 @@ proc genericAssignAux(dest, src: Pointer, mt: PNimType, shallow: bool) =
     # sequence reallocations:
     var pint = cast[ptr PNimType](dest)
     pint[] = cast[ptr PNimType](src)[]
+    if mt.base != nil:
+      genericAssignAux(dest, src, mt.base, shallow)
     genericAssignAux(dest, src, mt.node, shallow)
   of tyTuple:
     genericAssignAux(dest, src, mt.node, shallow)
diff --git a/lib/system/channels.nim b/lib/system/channels.nim
index f5bcdec03c..d0294322a2 100644
--- a/lib/system/channels.nim
+++ b/lib/system/channels.nim
@@ -120,7 +120,9 @@ proc storeAux(dest, src: Pointer, mt: PNimType, t: PRawChannel,
     # copy type field:
     var pint = cast[ptr PNimType](dest)
     # XXX use dynamic type here!
-    pint[] = mt
+    pint[] = mt
+    if mt.base != nil:
+      storeAux(dest, src, mt.base, t, mode)
     storeAux(dest, src, mt.node, t, mode)
   of tyTuple:
     storeAux(dest, src, mt.node, t, mode)
diff --git a/tests/run/tobjasgn.nim b/tests/run/tobjasgn.nim
new file mode 100644
index 0000000000..5f411063f2
--- /dev/null
+++ b/tests/run/tobjasgn.nim
@@ -0,0 +1,39 @@
+discard """
+  output: '''0
+pre test a:test b:1 c:2 haha:3
+assignment test a:test b:1 c:2 haha:3
+'''
+"""
+
+type TSomeObj = object of TObject
+  Variable: int
+ 
+var a = TSomeObj()
+ 
+echo a.Variable.`$`
+
+# bug #575
+
+type
+  Something = object of Tobject
+    a: string
+    b, c: int32
+
+type
+  Other = object of Something
+    haha: int
+
+proc `$`(x: Other): string =
+  result = "a:" & x.a & " b:" & $x.b & " c:" & $x.c & " haha:" & $x.haha
+
+var
+  t: Other
+
+t.a = "test"
+t.b = 1
+t.c = 2
+t.haha = 3
+
+echo "pre test ", $t
+var x = t
+echo "assignment test ", x