mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 04:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

AstGen: add missing coercion for const locals

Browse Source 
A const local which had its init expression write to the result pointer,
but then gets elided to directly initialize, was missing the coercion to
the type annotation.
This commit is contained in:
Andrew Kelley 2022-03-15 16:41:10 -07:00
parent d4a0d5f959
commit 2c434cddd6
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/std/special/compiler_rt.zig
View File

@ -303,10 +303,8 @@ comptime {
const __floatunsisf = @import("compiler_rt/floatunsisf.zig").__floatunsisf;
@export(__floatunsisf, .{ .name = "__floatunsisf", .linkage = linkage });
if (builtin.zig_backend == .stage1) { // TODO it's crashing on a switch expression
const __floatundisf = @import("compiler_rt/floatundisf.zig").__floatundisf;
@export(__floatundisf, .{ .name = "__floatundisf", .linkage = linkage });
}
const __floatundisf = @import("compiler_rt/floatundisf.zig").__floatundisf;
@export(__floatundisf, .{ .name = "__floatundisf", .linkage = linkage });
const __floatunsidf = @import("compiler_rt/floatunsidf.zig").__floatunsidf;
@export(__floatunsidf, .{ .name = "__floatunsidf", .linkage = linkage });
const __floatundidf = @import("compiler_rt/floatundidf.zig").__floatundidf;

11
src/AstGen.zig
View File

@ -2762,11 +2762,18 @@ fn varDecl(
}
gz.instructions.items.len = dst;
// In case the result location did not do the coercion
// for us so we must do it here.
const coerced_init = if (opt_type_inst != .none)
try gz.addBin(.as, opt_type_inst, init_inst)
else
init_inst;
if (!gz.force_comptime) {
_ = try gz.add(.{ .tag = .dbg_var_val, .data = .{
.str_op = .{
.str = ident_name,
.operand = init_inst,
.operand = coerced_init,
},
} });
}
@ -2776,7 +2783,7 @@ fn varDecl(
.parent = scope,
.gen_zir = gz,
.name = ident_name,
.inst = init_inst,
.inst = coerced_init,
.token_src = name_token,
.id_cat = .@"local constant",
};

11
test/behavior/eval.zig
View File

@ -766,3 +766,14 @@ test "two comptime calls with array default initialized to undefined" {
S.CrossTarget.parse();
}
}
test "const type-annotated local initialized with function call has correct type" {
const S = struct {
fn foo() comptime_int {
return 1234;
}
};
const x: u64 = S.foo();
try expect(@TypeOf(x) == u64);
try expect(x == 1234);
}