authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-08-19 17:36:26-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-08-19 17:36:35-04:00
log07c5e906010e85d7e6560dc3ed398d7e4b284ec0
tree81cdb2ae9662ac51d905eea0ccd40948ebc99c2a
parentefc2237e5a545fac94ecc9c9757d202bda322abd
parent6bc520ab957e25f9ae6d0f4d8a8ad4b96e145ac3
signaturelock-open Commit is signed but in an unrecognized format.

Merge branch 'mikdusan-issue.3010'

closes #3022 closes #3010 thanks @mikdusan

2 files changed, 11 insertions(+), 1 deletions(-)

src/ir.cpp+5-1
...@@ -24564,7 +24564,11 @@ static IrInstruction *ir_analyze_instruction_bit_cast_src(IrAnalyze *ira, IrInst...@@ -24564,7 +24564,11 @@ static IrInstruction *ir_analyze_instruction_bit_cast_src(IrAnalyze *ira, IrInst
24564 if (result_loc != nullptr && (type_is_invalid(result_loc->value.type) || instr_is_unreachable(result_loc)))24564 if (result_loc != nullptr && (type_is_invalid(result_loc->value.type) || instr_is_unreachable(result_loc)))
24565 return result_loc;24565 return result_loc;
2456624566
24567 return instruction->result_loc_bit_cast->parent->gen_instruction;24567 if (instruction->result_loc_bit_cast->parent->gen_instruction != nullptr) {
24568 return instruction->result_loc_bit_cast->parent->gen_instruction;
24569 }
24570
24571 return result_loc;
24568}24572}
2456924573
24570static IrInstruction *ir_analyze_instruction_union_init_named_field(IrAnalyze *ira,24574static IrInstruction *ir_analyze_instruction_union_init_named_field(IrAnalyze *ira,
test/stage1/behavior/bitcast.zig+6
...@@ -125,3 +125,9 @@ test "implicit cast to error union by returning" {...@@ -125,3 +125,9 @@ test "implicit cast to error union by returning" {
125 S.entry();125 S.entry();
126 comptime S.entry();126 comptime S.entry();
127}127}
128
129// issue #3010: compiler segfault
130test "bitcast literal [4]u8 param to u32" {
131 const ip = @bitCast(u32, [_]u8{ 255, 255, 255, 255 });
132 expect(ip == maxInt(u32));
133}