fix

rivetc/src/codegen/__init__.py

@@ -3021,7 +3021,7 @@ def gen_types(self):
                                 ir.Field("_rc_", ir.UINT_T),
                                 ir.Field("_idx_", ir.UINT_T),
                                 ir.Field("obj", ir.Type(union_name))
-                            ], is_tagged_enum = True
+                            ]
                         )
                     )
             elif ts.kind == TypeKind.Trait:
@@ -3154,10 +3154,11 @@ def sort_type_symbols(self, tss):
                     field_deps.append(dep)
             elif ts.kind == TypeKind.Tuple:
                 for f in ts.info.types:
-                    dep = cg_utils.mangle_symbol(f.symbol())
+                    fsym = f.symbol()
+                    dep = cg_utils.mangle_symbol(fsym)
                     if dep not in typ_names or dep in field_deps or isinstance(
                         f, type.Option
-                    ):
+                    ) or fsym.is_boxed():
                         continue
                     field_deps.append(dep)
             elif ts.kind == TypeKind.Enum and ts.info.is_tagged:
@@ -3177,23 +3178,25 @@ def sort_type_symbols(self, tss):
                         continue
                     field_deps.append(dep)
                 for f in ts.fields:
-                    dep = cg_utils.mangle_symbol(f.typ.symbol())
+                    fsym = f.typ.symbol()
+                    dep = cg_utils.mangle_symbol(fsym)
                     if dep not in typ_names or dep in field_deps or isinstance(
                         f.typ, type.Option
-                    ):
+                    ) or fsym.is_boxed():
                         continue
                     field_deps.append(dep)
             elif ts.kind == TypeKind.Struct:
                 for base in ts.info.bases:
                     dep = cg_utils.mangle_symbol(base)
-                    if dep not in typ_names or dep in field_deps:
+                    if dep not in typ_names or dep in field_deps or base.is_boxed():
                         continue
                     field_deps.append(dep)
                 for f in ts.fields:
-                    dep = cg_utils.mangle_symbol(f.typ.symbol())
+                    fsym = f.typ.symbol()
+                    dep = cg_utils.mangle_symbol(fsym)
                     if dep not in typ_names or dep in field_deps or isinstance(
                         f.typ, type.Option
-                    ):
+                    ) or fsym.is_boxed():
                         continue
                     field_deps.append(dep)
             dg.add(ts.mangled_name, field_deps)

rivetc/src/codegen/c.py

@@ -30,7 +30,6 @@ def __init__(self, comp):
         self.comp = comp
         self.typedefs = utils.Builder()
         self.types = utils.Builder()
-        self.types2 = utils.Builder()
         self.protos = utils.Builder()
         self.globals = utils.Builder()
         self.out = utils.Builder()
@@ -53,7 +52,6 @@ def gen(self, out_rir):
                 out.write(c_headers.RIVET_BREAKPOINT)
             out.write(str(self.typedefs).strip() + "\n\n")
             out.write(str(self.types).strip() + "\n\n")
-            out.write(str(self.types2).strip() + "\n\n")
             out.write(str(self.protos).strip() + "\n\n")
             out.write(str(self.globals).strip() + "\n\n")
             out.write(str(self.out).strip())
@@ -102,18 +100,17 @@ def gen_types(self, types):
         for s in types:
             if isinstance(s, ir.Struct):
                 self.typedefs.writeln(f"typedef struct {s.name} {s.name};")
-                buf = self.types2 if s.is_tagged_enum else self.types
                 if not s.is_opaque:
-                    buf.writeln(f"struct {s.name} {{")
+                    self.types.writeln(f"struct {s.name} {{")
                     for i, f in enumerate(s.fields):
                         f_name = c_escape(f.name)
-                        buf.write("  ")
-                        buf.write(self.gen_type(f.typ, f_name))
+                        self.types.write("  ")
+                        self.types.write(self.gen_type(f.typ, f_name))
                         if not isinstance(f.typ, (ir.Array, ir.Function)):
-                            buf.write(f" {f_name}")
-                        buf.writeln(";")
-                    buf.writeln("};")
-                buf.writeln()
+                            self.types.write(f" {f_name}")
+                        self.types.writeln(";")
+                    self.types.writeln("};")
+                self.types.writeln()
             else:
                 self.typedefs.writeln(f"typedef union {s.name} {s.name};")
                 self.types.writeln(f"union {s.name} {{")

rivetc/src/codegen/ir.py

@@ -207,11 +207,10 @@ def __str__(self):
         return str(sb)
 
 class Struct:
-    def __init__(self, is_opaque, name, fields, is_tagged_enum=False):
+    def __init__(self, is_opaque, name, fields):
         self.is_opaque = is_opaque
         self.name = name
         self.fields = fields
-        self.is_tagged_enum = is_tagged_enum
 
     def __str__(self):
         sb = utils.Builder()