Commit 70a4794c57425d75505583e03919df983c4d8ccd | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-02-10 10:57:40-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-02-10 10:57:40-05:00
log	70a4794c57425d75505583e03919df983c4d8ccd
tree	86428ba6e9992eaa41b4e7491b90e424da909e0f
parent	014f66e6de4aaf81f32c796b12f981326a479397
signature	Commit is signed but in an unrecognized format.

fix compiler assertion when duplicating fields...

...in nested anonymous struct literals

closes #4391

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

src
- ir.cpp
test
- compile_errors.zig

src/ir.cpp+22-15

 @@ -771,23 +771,9 @@ static void ira_deref(IrAnalyze *ira) {
     destroy(ira, "IrAnalyze");
 }
-static ZigValue *const_ptr_pointee_unchecked(CodeGen *g, ZigValue *const_val) {
+static ZigValue *const_ptr_pointee_unchecked_no_isf(CodeGen *g, ZigValue *const_val) {
     assert(get_src_ptr_type(const_val->type) != nullptr);
     assert(const_val->special == ConstValSpecialStatic);
-    ZigValue *result;
-    InferredStructField *isf = const_val->type->data.pointer.inferred_struct_field;
-    if (isf != nullptr) {
-        TypeStructField *field = find_struct_type_field(isf->inferred_struct_type, isf->field_name);
-        assert(field != nullptr);
-        if (field->is_comptime) {
-            assert(field->init_val != nullptr);
-            return field->init_val;
-        }
-        assert(const_val->data.x_ptr.special == ConstPtrSpecialRef);
-        ZigValue *struct_val = const_val->data.x_ptr.data.ref.pointee;
-        return struct_val->data.x_struct.fields[field->src_index];
-    }
     switch (type_has_one_possible_value(g, const_val->type->data.pointer.child_type)) {
         case OnePossibleValueInvalid:
 @@ -798,6 +784,7 @@ static ZigValue *const_ptr_pointee_unchecked(CodeGen *g, ZigValue *const_val) {
             break;
     }
+    ZigValue *result;
     switch (const_val->data.x_ptr.special) {
         case ConstPtrSpecialInvalid:
             zig_unreachable();
 @@ -843,6 +830,26 @@ static ZigValue *const_ptr_pointee_unchecked(CodeGen *g, ZigValue *const_val) {
     return result;
 }
+static ZigValue *const_ptr_pointee_unchecked(CodeGen *g, ZigValue *const_val) {
+    assert(get_src_ptr_type(const_val->type) != nullptr);
+    assert(const_val->special == ConstValSpecialStatic);
+    InferredStructField *isf = const_val->type->data.pointer.inferred_struct_field;
+    if (isf != nullptr) {
+        TypeStructField *field = find_struct_type_field(isf->inferred_struct_type, isf->field_name);
+        assert(field != nullptr);
+        if (field->is_comptime) {
+            assert(field->init_val != nullptr);
+            return field->init_val;
+        }
+        ZigValue *struct_val = const_ptr_pointee_unchecked_no_isf(g, const_val);
+        assert(struct_val->type->id == ZigTypeIdStruct);
+        return struct_val->data.x_struct.fields[field->src_index];
+    }
+    return const_ptr_pointee_unchecked_no_isf(g, const_val);
+}
 static bool is_tuple(ZigType *type) {
     return type->id == ZigTypeIdStruct && type->data.structure.special == StructSpecialInferredTuple;
 }

test/compile_errors.zig+16

...	@@ -3,6 +3,22 @@ const builtin = @import("builtin");	...	@@ -3,6 +3,22 @@ const builtin = @import("builtin");
3	const Target = @import("std").Target;	3	const Target = @import("std").Target;
4		4
5	pub fn addCases(cases: *tests.CompileErrorContext) void {	5	pub fn addCases(cases: *tests.CompileErrorContext) void {
		6	cases.addTest("duplicate field in anonymous struct literal",
		7	\\export fn entry() void {
		8	\\ const anon = .{
		9	\\ .inner = .{
		10	\\ .a = .{
		11	\\ .something = "text",
		12	\\ },
		13	\\ .a = .{},
		14	\\ },
		15	\\ };
		16	\\}
		17	, &[_][]const u8{
		18	"tmp.zig:7:13: error: duplicate field",
		19	"tmp.zig:4:13: note: other field here",
		20	});
		21
6	cases.addTest("type mismatch in C prototype with varargs",	22	cases.addTest("type mismatch in C prototype with varargs",
7	\\const fn_ty = ?fn ([*c]u8, ...) callconv(.C) void;	23	\\const fn_ty = ?fn ([*c]u8, ...) callconv(.C) void;
8	\\extern fn fn_decl(fmt: [*:0]u8, ...) void;	24	\\extern fn fn_decl(fmt: [*:0]u8, ...) void;