authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-10-24 16:41:57-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-10-25 19:57:02-07:00
log03b473d21becb85d61ddd4b672323256d7747f19
tree52fdd8df23ef7bf93feda9c23f94a75249d71b22
parentf841b265c5523147f69127b968806454b64e1944

Sema: rework addConstantMaybeRef

and add anonDeclRef and migrate some anon decls to it

1 files changed, 23 insertions(+), 35 deletions(-)

src/Sema.zig+23-35
......@@ -5466,19 +5466,24 @@ fn addStrLitNoAlias(sema: *Sema, bytes: []const u8) CompileError!Air.Inst.Ref {
54665466 .ty = array_ty.toIntern(),
54675467 .storage = .{ .bytes = bytes },
54685468 } });
5469 const ptr_ty = try sema.ptrType(.{
5470 .child = array_ty.toIntern(),
5469 return anonDeclRef(sema, val);
5470}
5471
5472fn anonDeclRef(sema: *Sema, val: InternPool.Index) CompileError!Air.Inst.Ref {
5473 const mod = sema.mod;
5474 const ptr_ty = (try sema.ptrType(.{
5475 .child = mod.intern_pool.typeOf(val),
54715476 .flags = .{
54725477 .alignment = .none,
54735478 .is_const = true,
54745479 .address_space = .generic,
54755480 },
5476 });
5481 })).toIntern();
54775482 return Air.internedToRef(try mod.intern(.{ .ptr = .{
5478 .ty = ptr_ty.toIntern(),
5483 .ty = ptr_ty,
54795484 .addr = .{ .anon_decl = .{
54805485 .val = val,
5481 .orig_ty = ptr_ty.toIntern(),
5486 .orig_ty = ptr_ty,
54825487 } },
54835488 } }));
54845489}
......@@ -10740,7 +10745,7 @@ const SwitchProngAnalysis = struct {
1074010745 return block.addStructFieldVal(spa.operand, field_index, field_ty);
1074110746 }
1074210747 } else if (capture_byref) {
10743 return sema.addConstantMaybeRef(block, operand_ty, item_val, true);
10748 return anonDeclRef(sema, item_val.toIntern());
1074410749 } else {
1074510750 return inline_case_capture;
1074610751 }
......@@ -13765,10 +13770,10 @@ fn zirArrayCat(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai
1376513770 const coerced_elem_val = try sema.resolveConstValue(block, .unneeded, coerced_elem_val_inst, undefined);
1376613771 element_vals[elem_i] = try coerced_elem_val.intern(resolved_elem_ty, mod);
1376713772 }
13768 return sema.addConstantMaybeRef(block, result_ty, (try mod.intern(.{ .aggregate = .{
13773 return sema.addConstantMaybeRef(try mod.intern(.{ .aggregate = .{
1376913774 .ty = result_ty.toIntern(),
1377013775 .storage = .{ .elems = element_vals },
13771 } })).toValue(), ptr_addrspace != null);
13776 } }), ptr_addrspace != null);
1377213777 } else break :rs rhs_src;
1377313778 } else lhs_src;
1377413779
......@@ -14034,7 +14039,7 @@ fn zirArrayMul(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai
1403414039 .storage = .{ .elems = element_vals },
1403514040 } });
1403614041 };
14037 return sema.addConstantMaybeRef(block, result_ty, val.toValue(), ptr_addrspace != null);
14042 return sema.addConstantMaybeRef(val, ptr_addrspace != null);
1403814043 }
1403914044
1404014045 try sema.requireRuntimeBlock(block, src, lhs_src);
......@@ -19022,10 +19027,7 @@ fn zirStructInitEmptyResult(sema: *Sema, block: *Block, inst: Zir.Inst.Index, is
1902219027
1902319028 if (is_byref) {
1902419029 const init_val = (try sema.resolveValue(init_ref)).?;
19025 var anon_decl = try block.startAnonDecl();
19026 defer anon_decl.deinit();
19027 const decl = try anon_decl.finish(init_ty, init_val, .none);
19028 return sema.analyzeDeclRef(decl);
19030 return anonDeclRef(sema, init_val.toIntern());
1902919031 } else {
1903019032 return init_ref;
1903119033 }
......@@ -19248,7 +19250,7 @@ fn zirStructInit(
1924819250 } })).toValue();
1924919251 const final_val_inst = try sema.coerce(block, result_ty, Air.internedToRef(struct_val.toIntern()), src);
1925019252 const final_val = (try sema.resolveValue(final_val_inst)).?;
19251 return sema.addConstantMaybeRef(block, resolved_ty, final_val, is_ref);
19253 return sema.addConstantMaybeRef(final_val.toIntern(), is_ref);
1925219254 }
1925319255
1925419256 if (try sema.typeRequiresComptime(resolved_ty)) {
......@@ -19408,7 +19410,7 @@ fn finishStructInit(
1940819410 } });
1940919411 const final_val_inst = try sema.coerce(block, result_ty, Air.internedToRef(struct_val), init_src);
1941019412 const final_val = (try sema.resolveValue(final_val_inst)).?;
19411 return sema.addConstantMaybeRef(block, result_ty, final_val, is_ref);
19413 return sema.addConstantMaybeRef(final_val.toIntern(), is_ref);
1941219414 };
1941319415
1941419416 if (try sema.typeRequiresComptime(struct_ty)) {
......@@ -19561,7 +19563,7 @@ fn structInitAnon(
1956119563 .ty = tuple_ty,
1956219564 .storage = .{ .elems = values },
1956319565 } });
19564 return sema.addConstantMaybeRef(block, tuple_ty.toType(), tuple_val.toValue(), is_ref);
19566 return sema.addConstantMaybeRef(tuple_val, is_ref);
1956519567 };
1956619568
1956719569 sema.requireRuntimeBlock(block, .unneeded, null) catch |err| switch (err) {
......@@ -19727,7 +19729,8 @@ fn zirArrayInit(
1972719729 .storage = .{ .elems = elem_vals },
1972819730 } });
1972919731 const result_ref = try sema.coerce(block, result_ty, Air.internedToRef(arr_val), src);
19730 return sema.addConstantMaybeRef(block, result_ty, (try sema.resolveValue(result_ref)).?, is_ref);
19732 const result_val = (try sema.resolveValue(result_ref)).?;
19733 return sema.addConstantMaybeRef(result_val.toIntern(), is_ref);
1973119734 };
1973219735
1973319736 sema.requireRuntimeBlock(block, .unneeded, null) catch |err| switch (err) {
......@@ -19846,7 +19849,7 @@ fn arrayInitAnon(
1984619849 .ty = tuple_ty,
1984719850 .storage = .{ .elems = values },
1984819851 } });
19849 return sema.addConstantMaybeRef(block, tuple_ty.toType(), tuple_val.toValue(), is_ref);
19852 return sema.addConstantMaybeRef(tuple_val, is_ref);
1985019853 };
1985119854
1985219855 try sema.requireRuntimeBlock(block, src, runtime_src);
......@@ -19881,23 +19884,8 @@ fn arrayInitAnon(
1988119884 return block.addAggregateInit(tuple_ty.toType(), element_refs);
1988219885}
1988319886
19884fn addConstantMaybeRef(
19885 sema: *Sema,
19886 block: *Block,
19887 ty: Type,
19888 val: Value,
19889 is_ref: bool,
19890) !Air.Inst.Ref {
19891 if (!is_ref) return Air.internedToRef(val.toIntern());
19892
19893 var anon_decl = try block.startAnonDecl();
19894 defer anon_decl.deinit();
19895 const decl = try anon_decl.finish(
19896 ty,
19897 val,
19898 .none, // default alignment
19899 );
19900 return sema.analyzeDeclRef(decl);
19887fn addConstantMaybeRef(sema: *Sema, val: InternPool.Index, is_ref: bool) !Air.Inst.Ref {
19888 return if (is_ref) anonDeclRef(sema, val) else Air.internedToRef(val);
1990119889}
1990219890
1990319891fn zirFieldTypeRef(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {