Commit `67b201982b`

Andrew Kelley <andrew@ziglang.org>

2021-11-26 02:20:39

stage1: fix exporting enums

After extern enums were removed, stage1 was left in an incorrect state of checking for `extern enum` for exported enums. This commit fixes it to look for an explicit integer tag type instead, and adds test coverage for the compile error case as well as the success case. closes #9498

master

1 parent 7b78b4f

Changed files (3)

src

stage1

ir.cpp

test

behavior

enum_stage1.zig

compile_errors.zig

@@ -11380,9 +11380,11 @@ static Stage1AirInst *ir_analyze_instruction_export(IrAnalyze *ira, Stage1ZirIns
             }
             break;
         case ZigTypeIdEnum:
-            if (target->value->type->data.enumeration.layout != ContainerLayoutExtern) {
+            if ((err = type_resolve(ira->codegen, target->value->type, ResolveStatusZeroBitsKnown)))
+                return ira->codegen->invalid_inst_gen;
+            if (!target->value->type->data.enumeration.has_explicit_tag_type) {
                 ErrorMsg *msg = ir_add_error(ira, target,
-                    buf_sprintf("exported enum value must be declared extern"));
+                    buf_sprintf("exported enum value without explicit integer tag type"));
                 add_error_note(ira->codegen, msg, target->value->type->data.enumeration.decl_node, buf_sprintf("declared here"));
             } else {
                 want_var_export = true;
@@ -11425,9 +11427,11 @@ static Stage1AirInst *ir_analyze_instruction_export(IrAnalyze *ira, Stage1ZirIns
                     }
                     break;
                 case ZigTypeIdEnum:
-                    if (type_value->data.enumeration.layout != ContainerLayoutExtern) {
+                    if ((err = type_resolve(ira->codegen, type_value, ResolveStatusZeroBitsKnown)))
+                        return ira->codegen->invalid_inst_gen;
+                    if (!type_value->data.enumeration.has_explicit_tag_type) {
                         ErrorMsg *msg = ir_add_error(ira, target,
-                            buf_sprintf("exported enum must be declared extern"));
+                            buf_sprintf("exported enum without explicit integer tag type"));
                         add_error_note(ira->codegen, msg, type_value->data.enumeration.decl_node, buf_sprintf("declared here"));
                     }
                     break;

@@ -423,3 +423,17 @@ test "method call on an enum" {
     try S.doTheTest();
     comptime try S.doTheTest();
 }
+
+test "exporting enum type and value" {
+    const S = struct {
+        const E = enum(c_int) { one, two };
+        comptime {
+            @export(E, .{ .name = "E" });
+        }
+        const e: E = .two;
+        comptime {
+            @export(e, .{ .name = "e" });
+        }
+    };
+    try expect(S.e == .two);
+}

@@ -23,6 +23,20 @@ pub fn addCases(ctx: *TestContext) !void {
         });
     }
 
+    ctx.objErrStage1("exported enum without explicit integer tag type",
+        \\const E = enum { one, two };
+        \\comptime {
+        \\    @export(E, .{ .name = "E" });
+        \\}
+        \\const e: E = .two;
+        \\comptime {
+        \\    @export(e, .{ .name = "e" });
+        \\}
+    , &.{
+        "tmp.zig:3:13: error: exported enum without explicit integer tag type",
+        "tmp.zig:7:13: error: exported enum value without explicit integer tag type",
+    });
+
     ctx.objErrStage1("issue #9346: return outside of function scope",
         \\pub const empty = return 1;
     , &.{"tmp.zig:1:19: error: 'return' outside function scope"});

Commit 67b201982b

Commit `67b201982b`