Commit 6d8550a7dfecc3f8fcf2e1ff869921ce48ca1683 | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-12-02 01:09:06-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-12-02 01:09:06-05:00
log	6d8550a7dfecc3f8fcf2e1ff869921ce48ca1683
tree	6b1917e2a9bf25c899044e12b050e2b6fe454b98
parent	fecd540826b14275784f10fe429ed147543377b6
signature	Commit is signed but in an unrecognized format.

fix crash assigning optional struct with anon literal

closes #3827

2 files changed, 40 insertions(+), 16 deletions(-)

src
- ir.cpp
test
- stage1
  - behavior
    optional.zig

src/ir.cpp+25-16

 @@ -16797,6 +16797,7 @@ static IrInstruction *ir_resolve_result(IrAnalyze *ira, IrInstruction *suspend_s
         ResultLoc *result_loc_pass1, ZigType *value_type, IrInstruction *value, bool force_runtime,
         bool non_null_comptime, bool allow_discard)
 {
+    Error err;
     if (!allow_discard && result_loc_pass1->id == ResultLocIdInstruction &&
         instr_is_comptime(result_loc_pass1->source_instruction) &&
         result_loc_pass1->source_instruction->value->type->id == ZigTypeIdPointer &&
 @@ -16818,24 +16819,32 @@ static IrInstruction *ir_resolve_result(IrAnalyze *ira, IrInstruction *suspend_s
     ir_assert(result_loc->value->type->id == ZigTypeIdPointer, suspend_source_instr);
     ZigType *actual_elem_type = result_loc->value->type->data.pointer.child_type;
     if (actual_elem_type->id == ZigTypeIdOptional && value_type->id != ZigTypeIdOptional &&
-            value_type->id != ZigTypeIdNull && type_has_bits(value_type))
+            value_type->id != ZigTypeIdNull)
-    {
-        result_loc_pass1->written = false;
-        return ir_analyze_unwrap_optional_payload(ira, suspend_source_instr, result_loc, false, true);
-    } else if (actual_elem_type->id == ZigTypeIdErrorUnion && value_type->id != ZigTypeIdErrorUnion &&
-            type_has_bits(value_type))
     {
-        if (value_type->id == ZigTypeIdErrorSet) {
+        bool has_bits;
-            return ir_analyze_unwrap_err_code(ira, suspend_source_instr, result_loc, true);
+        if ((err = type_has_bits2(ira->codegen, value_type, &has_bits)))
-        } else {
+            return ira->codegen->invalid_instruction;
-            IrInstruction *unwrapped_err_ptr = ir_analyze_unwrap_error_payload(ira, suspend_source_instr,
+        if (has_bits) {
-                    result_loc, false, true);
+            result_loc_pass1->written = false;
-            ZigType *actual_payload_type = actual_elem_type->data.error_union.payload_type;
+            return ir_analyze_unwrap_optional_payload(ira, suspend_source_instr, result_loc, false, true);
-            if (actual_payload_type->id == ZigTypeIdOptional && value_type->id != ZigTypeIdOptional &&
+        }
-                value_type->id != ZigTypeIdNull) {
+    } else if (actual_elem_type->id == ZigTypeIdErrorUnion && value_type->id != ZigTypeIdErrorUnion) {
-                return ir_analyze_unwrap_optional_payload(ira, suspend_source_instr, unwrapped_err_ptr, false, true);
+        bool has_bits;
+        if ((err = type_has_bits2(ira->codegen, value_type, &has_bits)))
+            return ira->codegen->invalid_instruction;
+        if (has_bits) {
+            if (value_type->id == ZigTypeIdErrorSet) {
+                return ir_analyze_unwrap_err_code(ira, suspend_source_instr, result_loc, true);
             } else {
-                return unwrapped_err_ptr;
+                IrInstruction *unwrapped_err_ptr = ir_analyze_unwrap_error_payload(ira, suspend_source_instr,
+                        result_loc, false, true);
+                ZigType *actual_payload_type = actual_elem_type->data.error_union.payload_type;
+                if (actual_payload_type->id == ZigTypeIdOptional && value_type->id != ZigTypeIdOptional &&
+                    value_type->id != ZigTypeIdNull) {
+                    return ir_analyze_unwrap_optional_payload(ira, suspend_source_instr, unwrapped_err_ptr, false, true);
+                } else {
+                    return unwrapped_err_ptr;
+                }
             }
         }
     }

test/stage1/behavior/optional.zig+15

...	@@ -130,3 +130,18 @@ test "assigning to an unwrapped optional field in an inline loop" {	...	@@ -130,3 +130,18 @@ test "assigning to an unwrapped optional field in an inline loop" {
130	maybe_pos_arg.? = 10;	130	maybe_pos_arg.? = 10;
131	}	131	}
132	}	132	}
		133
		134	test "coerce an anon struct literal to optional struct" {
		135	const S = struct {
		136	const Struct = struct {
		137	field: u32,
		138	};
		139	export fn doTheTest() void {
		140	var maybe_dims: ?Struct = null;
		141	maybe_dims = .{ .field = 1 };
		142	expect(maybe_dims.?.field == 1);
		143	}
		144	};
		145	S.doTheTest();
		146	comptime S.doTheTest();
		147	}