From 67b201982bb1a0b4650b7ff222ef22875c32c810 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 25 Nov 2021 18:20:39 -0700 Subject: 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 --- src/stage1/ir.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/stage1/ir.cpp') diff --git a/src/stage1/ir.cpp b/src/stage1/ir.cpp index 9a3b938dbd..0684b7bce1 100644 --- a/src/stage1/ir.cpp +++ b/src/stage1/ir.cpp @@ -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; -- cgit v1.2.3