authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-03-14 21:38:27-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-03-14 21:38:27-04:00
loga76558db26ea175504830ae4aa840a1aa82b16d0
tree77557c27d4ab823654a5403ce8d69ea6d0e49408
parent7bc0145b802002c38a409dd9fe0b297c8af82391

fix behavior with reinterpreting constant memory

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

src/ir.cpp+6-4
...@@ -8538,11 +8538,13 @@ static TypeTableEntry *ir_analyze_dereference(IrAnalyze *ira, IrInstructionUnOp...@@ -8538,11 +8538,13 @@ static TypeTableEntry *ir_analyze_dereference(IrAnalyze *ira, IrInstructionUnOp
8538 // this dereference is always an rvalue because in the IR gen we identify lvalue and emit8538 // this dereference is always an rvalue because in the IR gen we identify lvalue and emit
8539 // one of the ptr instructions8539 // one of the ptr instructions
85408540
8541 if (value->value.special != ConstValSpecialRuntime) {8541 if (instr_is_comptime(value)) {
8542 ConstExprValue *out_val = ir_build_const_from(ira, &un_op_instruction->base);
8543 ConstExprValue *pointee = const_ptr_pointee(&value->value);8542 ConstExprValue *pointee = const_ptr_pointee(&value->value);
8544 *out_val = *pointee;8543 if (pointee->type == child_type) {
8545 return child_type;8544 ConstExprValue *out_val = ir_build_const_from(ira, &un_op_instruction->base);
8545 *out_val = *pointee;
8546 return child_type;
8547 }
8546 }8548 }
85478549
8548 ir_build_load_ptr_from(&ira->new_irb, &un_op_instruction->base, value);8550 ir_build_load_ptr_from(&ira->new_irb, &un_op_instruction->base, value);
test/cases/cast.zig+10
...@@ -15,3 +15,13 @@ fn numLitIntToPtrCast() {...@@ -15,3 +15,13 @@ fn numLitIntToPtrCast() {
15 const vga_mem = (&u16)(0xB8000);15 const vga_mem = (&u16)(0xB8000);
16 assert(usize(vga_mem) == 0xB8000);16 assert(usize(vga_mem) == 0xB8000);
17}17}
18
19fn pointerReinterpretConstFloatToInt() {
20 @setFnTest(this);
21
22 const float: f64 = 5.99999999999994648725e-01;
23 const float_ptr = &float;
24 const int_ptr = (&i32)(float_ptr);
25 const int_val = *int_ptr;
26 assert(int_val == 858993411);
27}