Commit 5d0d5893fd39047e4fdbb6623e4d69babf0b2ed4 | zig

author	Jacob Young <jacobly@ziglang.org> 2023-05-25 23:47:44-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-06-10 20:47:55-07:00
log	5d0d5893fd39047e4fdbb6623e4d69babf0b2ed4
tree	1ee6e3c66906d7b5485c2e35dcccf1009799d365
parent	70cc68e9994f7dca53904075e15b2b6f87342539

Sema: fix some issues with the inferred alloc tag change

1 files changed, 20 insertions(+), 14 deletions(-)

src
- Sema.zig

src/Sema.zig+20-14

 @@ -1999,15 +1999,17 @@ fn resolveMaybeUndefValAllowVariablesMaybeRuntime(
         return opv;
     }
     const air_datas = sema.air_instructions.items(.data);
-    switch (air_tags[i]) {
+    const val = switch (air_tags[i]) {
-        .interned => {
+        .inferred_alloc, .inferred_alloc_comptime => val: {
-            const val = air_datas[i].interned.toValue();
+            const ty_pl = sema.air_instructions.items(.data)[i].ty_pl;
-            if (val.isRuntimeValue(sema.mod)) make_runtime.* = true;
+            break :val sema.air_values.items[ty_pl.payload];
-            if (val.isPtrToThreadLocal(sema.mod)) make_runtime.* = true;
-            return val;
         },
+        .interned => air_datas[i].interned.toValue(),
         else => return null,
-    }
+    };
+    if (val.isRuntimeValue(sema.mod)) make_runtime.* = true;
+    if (val.isPtrToThreadLocal(sema.mod)) make_runtime.* = true;
+    return val;
 }
 fn failWithNeededComptime(sema: *Sema, block: *Block, src: LazySrcLoc, reason: []const u8) CompileError {
 @@ -3762,13 +3764,17 @@ fn zirResolveInferredAlloc(sema: *Sema, block: *Block, inst: Zir.Inst.Index) Com
             sema.air_instructions.items(.data)[ptr_inst].ty_pl.ty = final_ptr_ty_inst;
             try sema.maybeQueueFuncBodyAnalysis(decl_index);
-            sema.air_values.items[value_index] = (try sema.mod.intern(.{ .ptr = .{
+            // Change it to an interned.
-                .ty = final_ptr_ty.toIntern(),
+            sema.air_instructions.set(ptr_inst, .{
-                .addr = if (var_is_mut) .{ .mut_decl = .{
+                .tag = .interned,
-                    .decl = decl_index,
+                .data = .{ .interned = try sema.mod.intern(.{ .ptr = .{
-                    .runtime_index = block.runtime_index,
+                    .ty = final_ptr_ty.toIntern(),
-                } } else .{ .decl = decl_index },
+                    .addr = if (var_is_mut) .{ .mut_decl = .{
-            } })).toValue();
+                        .decl = decl_index,
+                        .runtime_index = block.runtime_index,
+                    } } else .{ .decl = decl_index },
+                } }) },
+            });
         },
         .inferred_alloc => {
             assert(sema.unresolved_inferred_allocs.remove(ptr_inst));