Commit 2c434cddd6624cfd5c71f081b9445936d25c7703 | zig

author	Andrew Kelley <andrew@ziglang.org> 2022-03-15 16:41:10-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2022-03-15 16:41:10-07:00
log	2c434cddd6624cfd5c71f081b9445936d25c7703
tree	b7512d9b316275efeff0c93fb034b47ae045d6d5
parent	d4a0d5f959b88ffc23edc4593bc75b6168acaea9

AstGen: add missing coercion for const locals

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.

3 files changed, 22 insertions(+), 6 deletions(-)

lib
- std
  - special
    compiler_rt.zig
src
- AstGen.zig
test
- behavior
  - eval.zig

lib/std/special/compiler_rt.zig+2-4

 @@ -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;
-        const __floatundisf = @import("compiler_rt/floatundisf.zig").__floatundisf;
+    @export(__floatundisf, .{ .name = "__floatundisf", .linkage = linkage });
-        @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;

src/AstGen.zig+9-2

 @@ -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",
                 };

test/behavior/eval.zig+11

...	@@ -766,3 +766,14 @@ test "two comptime calls with array default initialized to undefined" {	...	@@ -766,3 +766,14 @@ test "two comptime calls with array default initialized to undefined" {
766	S.CrossTarget.parse();	766	S.CrossTarget.parse();
767	}	767	}
768	}	768	}
		769
		770	test "const type-annotated local initialized with function call has correct type" {
		771	const S = struct {
		772	fn foo() comptime_int {
		773	return 1234;
		774	}
		775	};
		776	const x: u64 = S.foo();
		777	try expect(@TypeOf(x) == u64);
		778	try expect(x == 1234);
		779	}