still need wrapper

nim-lang · Oct 15, 2024 · c71ae94 · c71ae94
1 parent df5aa30
commit c71ae94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/compiler/cbuilderdecls.nim b/compiler/cbuilderdecls.nim
@@ -68,7 +68,7 @@ type
     siOrderedStruct ## struct constructor, but without named fields on C
     siNamedStruct ## struct constructor, with named fields i.e. C99 designated initializer
     siArray ## array constructor
-    siWrapper ## wrapper for a single field, generates it verbatim, now unused
+    siWrapper ## wrapper for a single field, generates it verbatim
 
   StructInitializer = object
     ## context for building struct initializers, i.e. `{ field1, field2 }`

diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
@@ -3306,7 +3306,11 @@ proc getNullValueAux(p: BProc; t: PType; obj, constOrNil: PNode,
         var branchInit: StructInitializer
         result.addStructInitializer(branchInit, kind = siNamedStruct):
           result.addField(branchInit, name = fieldName):
-            getNullValueAux(p, t, b, constOrNil, result, branchInit, isConst, info)
+            # we need to generate the default value of the single sym,
+            # to do this create a dummy wrapper initializer and recurse
+            var branchFieldInit: StructInitializer
+            result.addStructInitializer(branchFieldInit, kind = siWrapper):
+              getNullValueAux(p, t, b, constOrNil, result, branchFieldInit, isConst, info)
     else:
       # no fields, don't initialize
       return