authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2020-05-12 15:20:03+03:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-05-12 15:20:03+03:00
log29b3be4f2f30f756ef0317f79c349f5565b04d19
tree1cf04ccfb8ce0b0fb2e2b68686abe452c0077fda
parent7456389ef3c29e37d5d9bc7f8365db3217b3f60e
parent0847b47bf83c699d27c903e51b20f863d47c5790
signature Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #5319 from Vexu/float-fix

Fix intToFloat on comptime_floats

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

src/ir.cpp+7-5
...@@ -12760,9 +12760,7 @@ static bool eval_const_expr_implicit_cast(IrAnalyze *ira, IrInst *source_instr,...@@ -12760,9 +12760,7 @@ static bool eval_const_expr_implicit_cast(IrAnalyze *ira, IrInst *source_instr,
12760 const_val->type = new_type;12760 const_val->type = new_type;
12761 break;12761 break;
12762 case CastOpIntToFloat:12762 case CastOpIntToFloat:
12763 {12763 if (new_type->id == ZigTypeIdFloat) {
12764 assert(new_type->id == ZigTypeIdFloat);
12765
12766 BigFloat bigfloat;12764 BigFloat bigfloat;
12767 bigfloat_init_bigint(&bigfloat, &other_val->data.x_bigint);12765 bigfloat_init_bigint(&bigfloat, &other_val->data.x_bigint);
12768 switch (new_type->data.floating.bit_count) {12766 switch (new_type->data.floating.bit_count) {
...@@ -12783,9 +12781,13 @@ static bool eval_const_expr_implicit_cast(IrAnalyze *ira, IrInst *source_instr,...@@ -12783,9 +12781,13 @@ static bool eval_const_expr_implicit_cast(IrAnalyze *ira, IrInst *source_instr,
12783 default:12781 default:
12784 zig_unreachable();12782 zig_unreachable();
12785 }12783 }
12786 const_val->special = ConstValSpecialStatic;12784 } else if (new_type->id == ZigTypeIdComptimeFloat) {
12787 break;12785 bigfloat_init_bigint(&const_val->data.x_bigfloat, &other_val->data.x_bigint);
12786 } else {
12787 zig_unreachable();
12788 }12788 }
12789 const_val->special = ConstValSpecialStatic;
12790 break;
12789 case CastOpFloatToInt:12791 case CastOpFloatToInt:
12790 float_init_bigint(&const_val->data.x_bigint, other_val);12792 float_init_bigint(&const_val->data.x_bigint, other_val);
12791 if (new_type->id == ZigTypeIdInt) {12793 if (new_type->id == ZigTypeIdInt) {
test/stage1/behavior/cast.zig+9
...@@ -827,3 +827,12 @@ test "peer type resolve array pointer and unknown pointer" {...@@ -827,3 +827,12 @@ test "peer type resolve array pointer and unknown pointer" {
827 comptime expect(@TypeOf(&const_array, const_ptr) == [*]const u8);827 comptime expect(@TypeOf(&const_array, const_ptr) == [*]const u8);
828 comptime expect(@TypeOf(const_ptr, &const_array) == [*]const u8);828 comptime expect(@TypeOf(const_ptr, &const_array) == [*]const u8);
829}829}
830
831test "comptime float casts" {
832 const a = @intToFloat(comptime_float, 1);
833 expect(a == 1);
834 expect(@TypeOf(a) == comptime_float);
835 const b = @floatToInt(comptime_int, 2);
836 expect(b == 2);
837 expect(@TypeOf(b) == comptime_int);
838}