diff options
| author | Timon Kruiper <timonkruiper@gmail.com> | 2021-03-23 16:48:05 +0100 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-03-23 11:49:12 -0700 |
| commit | 99cf9f8bf17755cb910e13c744dee03a8a72c91b (patch) | |
| tree | e13431b02e27ce8906138399fc91998ec046f011 | |
| parent | 982df37135a5ce2e5e93067d716f096ec614f3ef (diff) | |
| download | zig-99cf9f8bf17755cb910e13c744dee03a8a72c91b.tar.gz zig-99cf9f8bf17755cb910e13c744dee03a8a72c91b.zip | |
astgen: fix an issue where the alloc wasnt elided
| -rw-r--r-- | src/astgen.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/astgen.zig b/src/astgen.zig index b2cfc04f95..3a2225d72c 100644 --- a/src/astgen.zig +++ b/src/astgen.zig @@ -1306,11 +1306,11 @@ fn varDecl( if (var_decl.ast.type_node != 0) { const type_inst = try typeExpr(mod, &init_scope.base, var_decl.ast.type_node); opt_type_inst = type_inst; - init_scope.rl_ptr = try init_scope.addUnNode(.alloc, type_inst, node); + init_scope.rl_ptr = (try init_scope.addUnNode(.alloc, type_inst, node)) - init_scope.zir_code.ref_start_index; } else { const alloc = try init_scope.addUnNode(.alloc_inferred, undefined, node); resolve_inferred_alloc = alloc; - init_scope.rl_ptr = alloc; + init_scope.rl_ptr = alloc - init_scope.zir_code.ref_start_index; } const init_result_loc: ResultLoc = .{ .block_ptr = &init_scope }; const init_inst = try expr(mod, &init_scope.base, init_result_loc, var_decl.ast.init_node); @@ -3201,7 +3201,7 @@ fn asRlPtr( }; defer as_scope.instructions.deinit(mod.gpa); - as_scope.rl_ptr = try as_scope.addBin(.coerce_result_ptr, dest_type, result_ptr); + as_scope.rl_ptr = (try as_scope.addBin(.coerce_result_ptr, dest_type, result_ptr)) - as_scope.zir_code.ref_start_index; const result = try expr(mod, &as_scope.base, .{ .block_ptr = &as_scope }, operand_node); const parent_zir = &parent_gz.instructions; if (as_scope.rvalue_rl_count == 1) { |