Commit 8e3c56b912b7eb6ee551b7e427adbaae0bdcd408 | zig

author	LemonBoy <thatlemon@gmail.com> 2019-09-01 19:47:58+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-09-05 13:07:04-04:00
log	8e3c56b912b7eb6ee551b7e427adbaae0bdcd408
tree	9ecd46b466947437e23e4d759713d9dab4161cd9
parent	0107b19124255179a48cd605f31ed57d5ade28e7
signature	Commit is signed but in an unrecognized format.

Always resolve the struct field types

Packed structs used to skip the zero-sized types and trip some
assertions that expected the type reference not to be null.

Fixes #3143

2 files changed, 27 insertions(+), 23 deletions(-)

src
- analyze.cpp
test
- stage1
  - behavior
    struct.zig

src/analyze.cpp+19-23

 @@ -2043,34 +2043,30 @@ static Error resolve_struct_type(CodeGen *g, ZigType *struct_type) {
     // Resolve types for fields
-    if (!packed) {
+    for (size_t i = 0; i < field_count; i += 1) {
-        for (size_t i = 0; i < field_count; i += 1) {
+        TypeStructField *field = &struct_type->data.structure.fields[i];
-            TypeStructField *field = &struct_type->data.structure.fields[i];
+        ZigType *field_type = resolve_struct_field_type(g, field);
-            ZigType *field_type = resolve_struct_field_type(g, field);
+        if (field_type == nullptr) {
-            if (field_type == nullptr) {
+            struct_type->data.structure.resolve_status = ResolveStatusInvalid;
-                struct_type->data.structure.resolve_status = ResolveStatusInvalid;
+            return err;
-                return err;
+        }
-            }
-            if ((err = type_resolve(g, field_type, ResolveStatusSizeKnown))) {
-                struct_type->data.structure.resolve_status = ResolveStatusInvalid;
-                return err;
-            }
-            if (struct_type->data.structure.layout == ContainerLayoutExtern &&
+        if ((err = type_resolve(g, field_type, ResolveStatusSizeKnown))) {
-                !type_allowed_in_extern(g, field_type))
+            struct_type->data.structure.resolve_status = ResolveStatusInvalid;
-            {
+            return err;
-                add_node_error(g, field->decl_node,
+        }
-                        buf_sprintf("extern structs cannot contain fields of type '%s'",
-                            buf_ptr(&field_type->name)));
-                struct_type->data.structure.resolve_status = ResolveStatusInvalid;
-                return ErrorSemanticAnalyzeFail;
-            }
+        if (struct_type->data.structure.layout == ContainerLayoutExtern &&
+            !type_allowed_in_extern(g, field_type))
+        {
+            add_node_error(g, field->decl_node,
+                    buf_sprintf("extern structs cannot contain fields of type '%s'",
+                        buf_ptr(&field_type->name)));
+            struct_type->data.structure.resolve_status = ResolveStatusInvalid;
+            return ErrorSemanticAnalyzeFail;
         }
     }
     return ErrorNone;
 }

test/stage1/behavior/struct.zig+8

...	@@ -632,3 +632,11 @@ test "for loop over pointers to struct, getting field from struct pointer" {	...	@@ -632,3 +632,11 @@ test "for loop over pointers to struct, getting field from struct pointer" {
632	};	632	};
633	S.doTheTest();	633	S.doTheTest();
634	}	634	}
		635
		636	test "zero-bit field in packed struct" {
		637	const S = packed struct {
		638	x: u10,
		639	y: void,
		640	};
		641	var x: S = undefined;
		642	}