Commit 61ce72a38cedfcbd8450922cbf1cadc0c1682928 | zig

author	Tadeo Kondrak <me@tadeo.ca> 2020-09-26 08:01:09-06:00
committer	Tadeo Kondrak <me@tadeo.ca> 2020-10-01 18:09:15-06:00
log	61ce72a38cedfcbd8450922cbf1cadc0c1682928
tree	92a48c3dc6511b2d296bc0dc28cca811c3a9ce65
parent	0228887b943dd7e70f7c5cc56e3993769342abf2
signature	Commit is signed but in an unrecognized format.

Allow enums with explicit extern-allowed tag types in extern types

Closes https://github.com/ziglang/zig/issues/1467

2 files changed, 15 insertions(+), 4 deletions(-)

src
- stage1
  - all_types.hpp
  - analyze.cpp

src/stage1/all_types.hpp+1

...	@@ -1456,6 +1456,7 @@ struct ZigTypeEnum {	...	@@ -1456,6 +1456,7 @@ struct ZigTypeEnum {
1456	ContainerLayout layout;	1456	ContainerLayout layout;
1457	ResolveStatus resolve_status;	1457	ResolveStatus resolve_status;
1458		1458
		1459	bool has_explicit_tag_type;
1459	bool non_exhaustive;	1460	bool non_exhaustive;
1460	bool resolve_loop_flag;	1461	bool resolve_loop_flag;
1461	};	1462	};

src/stage1/analyze.cpp+14-4

 @@ -1802,10 +1802,18 @@ Error type_allowed_in_extern(CodeGen *g, ZigType *type_entry, bool *result) {
             }
             return type_allowed_in_extern(g, child_type, result);
         }
-        case ZigTypeIdEnum:
+        case ZigTypeIdEnum: {
-            *result = type_entry->data.enumeration.layout == ContainerLayoutExtern ||
+            if ((err = type_resolve(g, type_entry, ResolveStatusZeroBitsKnown)))
-                type_entry->data.enumeration.layout == ContainerLayoutPacked;
+                return err;
-            return ErrorNone;
+            ZigType *tag_int_type = type_entry->data.enumeration.tag_int_type;
+            if (type_entry->data.enumeration.has_explicit_tag_type) {
+                return type_allowed_in_extern(g, tag_int_type, result);
+            } else {
+                *result = type_entry->data.enumeration.layout == ContainerLayoutExtern ||
+                    type_entry->data.enumeration.layout == ContainerLayoutPacked;
+                return ErrorNone;
+            }
+        }
         case ZigTypeIdUnion:
             *result = type_entry->data.unionation.layout == ContainerLayoutExtern ||
                 type_entry->data.unionation.layout == ContainerLayoutPacked;
 @@ -2639,9 +2647,11 @@ static Error resolve_enum_zero_bits(CodeGen *g, ZigType *enum_type) {
     if (decl_node->type == NodeTypeContainerDecl) {
         if (decl_node->data.container_decl.init_arg_expr != nullptr) {
             wanted_tag_int_type = analyze_type_expr(g, scope, decl_node->data.container_decl.init_arg_expr);
+            enum_type->data.enumeration.has_explicit_tag_type = true;
         }
     } else {
         wanted_tag_int_type = enum_type->data.enumeration.tag_int_type;
+        enum_type->data.enumeration.has_explicit_tag_type = true;
     }
     if (wanted_tag_int_type != nullptr) {