zig

commit 07c5e906010e85d7e6560dc3ed398d7e4b284ec0 (tree)
parent efc2237e5a545fac94ecc9c9757d202bda322abd
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Mon, 19 Aug 2019 17:36:26 -0400

Merge branch 'mikdusan-issue.3010'

closes #3022
closes #3010

thanks @mikdusan

Diffstat:
M
src/ir.cpp
 | 
6
+++++-
M
test/stage1/behavior/bitcast.zig
 | 
6
++++++

2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -24564,7 +24564,11 @@ static IrInstruction *ir_analyze_instruction_bit_cast_src(IrAnalyze *ira, IrInst
     if (result_loc != nullptr && (type_is_invalid(result_loc->value.type) || instr_is_unreachable(result_loc)))
         return result_loc;
 
-    return instruction->result_loc_bit_cast->parent->gen_instruction;
+    if (instruction->result_loc_bit_cast->parent->gen_instruction != nullptr) {
+        return instruction->result_loc_bit_cast->parent->gen_instruction;
+    }
+
+    return result_loc;
 }
 
 static IrInstruction *ir_analyze_instruction_union_init_named_field(IrAnalyze *ira,
diff --git a/test/stage1/behavior/bitcast.zig b/test/stage1/behavior/bitcast.zig
@@ -125,3 +125,9 @@ test "implicit cast to error union by returning" {
     S.entry();
     comptime S.entry();
 }
+
+// issue #3010: compiler segfault
+test "bitcast literal [4]u8 param to u32" {
+    const ip = @bitCast(u32, [_]u8{ 255, 255, 255, 255 });
+    expect(ip == maxInt(u32));
+}