fix tests broken by previous commit

andrewrk · andrewrk · commit efebb6d34130 · 2018-03-14T03:37:54.000-04:00
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -15222,7 +15222,7 @@ static TypeTableEntry *ir_analyze_instruction_offset_of(IrAnalyze *ira,
         return ira->codegen->builtin_types.entry_invalid;
     }
 
-    if (field->type_entry->zero_bits) {
+    if (!type_has_bits(field->type_entry)) {
         ir_add_error(ira, field_name_value,
                      buf_sprintf("zero-bit field '%s' in struct '%s' has no offset",
                                  buf_ptr(field_name), buf_ptr(&container_type->name)));
diff --git a/test/compile_errors.zig b/test/compile_errors.zig
@@ -3150,5 +3150,5 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
         \\    const fieldOffset = @offsetOf(Empty, "val");
         \\}
     ,
-        ".tmp_source.zig:5:42: error: zero-bit field 'val' has no offset in struct 'Empty'");
+        ".tmp_source.zig:5:42: error: zero-bit field 'val' in struct 'Empty' has no offset");
 }

Original file line number	Diff line number	Diff line change
`@@ -15222,7 +15222,7 @@ static TypeTableEntry ir_analyze_instruction_offset_of(IrAnalyze ira,`
`15222`	`15222`	`return ira->codegen->builtin_types.entry_invalid;`
`15223`	`15223`	`}`
`15224`	`15224`
`15225`		`- if (field->type_entry->zero_bits) {`
	`15225`	`+ if (!type_has_bits(field->type_entry)) {`
`15226`	`15226`	`ir_add_error(ira, field_name_value,`
`15227`	`15227`	`buf_sprintf("zero-bit field '%s' in struct '%s' has no offset",`
`15228`	`15228`	`buf_ptr(field_name), buf_ptr(&container_type->name)));`
Original file line number	Diff line number	Diff line change
`@@ -3150,5 +3150,5 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {`
`3150`	`3150`	`\\ const fieldOffset = @offsetOf(Empty, "val");`
`3151`	`3151`	`\\}`
`3152`	`3152`	`,`
`3153`		`- ".tmp_source.zig:5:42: error: zero-bit field 'val' has no offset in struct 'Empty'");`
	`3153`	`+ ".tmp_source.zig:5:42: error: zero-bit field 'val' in struct 'Empty' has no offset");`
`3154`	`3154`	`}`