From 7576387dfe0b59fbf5fc2b095ce4c431b3f04ea9 Mon Sep 17 00:00:00 2001
From: Andrii Riabushenko <cdome@bk.ru>
Date: Sun, 19 Jan 2020 20:21:26 +0000
Subject: revert last commit

---
 compiler/ccgexprs.nim | 3 +--
 compiler/ccgtypes.nim | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'compiler')

diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
index eed29ff4b..885ee3486 100644
--- a/compiler/ccgexprs.nim
+++ b/compiler/ccgexprs.nim
@@ -2818,11 +2818,10 @@ proc getNullValueAux(p: BProc; t: PType; obj, constOrNil: PNode,
     # designated initilization is the only way to init non first element of unions
     # branches are allowed to have no members (b.len == 0), in this case they don't need initializer
     if  b.kind == nkRecList and b.len > 0:
-      result.add "._i" & $selectedBranch & " = {"
+      result.add "._" &  mangleRecFieldName(p.module, obj[0].sym) & "_" & $selectedBranch & " = {"
       getNullValueAux(p, t,  b, constOrNil, result, countB, isConst, info)
       result.add "}"
     elif b.kind == nkSym:
-      result.add "." & lastSon(obj[selectedBranch]).sym.loc.r & " = "
       getNullValueAux(p, t,  b, constOrNil, result, countB, isConst, info)
     result.add "}"
     
diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim
index 2bcaa5dc3..905f8999e 100644
--- a/compiler/ccgtypes.nim
+++ b/compiler/ccgtypes.nim
@@ -525,7 +525,8 @@ proc genRecordFieldsAux(m: BModule, n: PNode,
       of nkOfBranch, nkElse:
         let k = lastSon(n[i])
         if k.kind != nkSym:
-          let a = genRecordFieldsAux(m, k, rectype, check, unionPrefix & "_i" & $i & ".")
+          let structName = "_" & mangleRecFieldName(m, n[0].sym) & "_" & $i
+          let a = genRecordFieldsAux(m, k, rectype, check, unionPrefix & $structName & ".")
           if a != nil:
             if tfPacked notin rectype.flags:
               unionBody.add("struct {")
@@ -535,7 +536,7 @@ proc genRecordFieldsAux(m: BModule, n: PNode,
               else:
                 unionBody.addf("#pragma pack(push, 1)$nstruct{", [])
             unionBody.add(a)
-            unionBody.addf("} _i$1;$n", [rope($i)])
+            unionBody.addf("} $1;$n", [structName])
             if tfPacked in rectype.flags and hasAttribute notin CC[m.config.cCompiler].props:
               unionBody.addf("#pragma pack(pop)$n", [])
         else:
-- 
cgit 1.4.1-2-gfad0