diff options
| author | mlugg <mlugg@mlugg.co.uk> | 2024-02-01 16:58:52 +0000 |
|---|---|---|
| committer | Matthew Lugg <mlugg@mlugg.co.uk> | 2024-02-02 11:02:03 +0000 |
| commit | 9eda6ccefce370c76209ea50dd57fe65bfe25536 (patch) | |
| tree | d5b4af496b8a6d1811788557d85e340ce26ef2bc /src/codegen/llvm.zig | |
| parent | 5a3ae38f3b79a69cb6f4ad28934a51165cae2ef1 (diff) | |
| download | zig-9eda6ccefce370c76209ea50dd57fe65bfe25536.tar.gz zig-9eda6ccefce370c76209ea50dd57fe65bfe25536.zip | |
InternPool: use separate key for slices
This change eliminates some problematic recursive logic in InternPool,
and provides a safer API.
Diffstat (limited to 'src/codegen/llvm.zig')
| -rw-r--r-- | src/codegen/llvm.zig | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index a425511e51..1e63361048 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -3644,6 +3644,7 @@ pub const Object = struct { .empty_enum_value, .float, .ptr, + .slice, .opt, .aggregate, .un, @@ -3872,30 +3873,22 @@ pub const Object = struct { 128 => try o.builder.fp128Const(val.toFloat(f128, mod)), else => unreachable, }, - .ptr => |ptr| { - const ptr_ty = switch (ptr.len) { - .none => ty, - else => ty.slicePtrFieldType(mod), - }; - const ptr_val = switch (ptr.addr) { - .decl => |decl| try o.lowerDeclRefValue(ptr_ty, decl), - .mut_decl => |mut_decl| try o.lowerDeclRefValue(ptr_ty, mut_decl.decl), - .anon_decl => |anon_decl| try o.lowerAnonDeclRef(ptr_ty, anon_decl), - .int => |int| try o.lowerIntAsPtr(int), - .eu_payload, - .opt_payload, - .elem, - .field, - => try o.lowerParentPtr(val), - .comptime_field => unreachable, - }; - switch (ptr.len) { - .none => return ptr_val, - else => return o.builder.structConst(try o.lowerType(ty), &.{ - ptr_val, try o.lowerValue(ptr.len), - }), - } + .ptr => |ptr| return switch (ptr.addr) { + .decl => |decl| try o.lowerDeclRefValue(ty, decl), + .mut_decl => |mut_decl| try o.lowerDeclRefValue(ty, mut_decl.decl), + .anon_decl => |anon_decl| try o.lowerAnonDeclRef(ty, anon_decl), + .int => |int| try o.lowerIntAsPtr(int), + .eu_payload, + .opt_payload, + .elem, + .field, + => try o.lowerParentPtr(val), + .comptime_field => unreachable, }, + .slice => |slice| return o.builder.structConst(try o.lowerType(ty), &.{ + try o.lowerValue(slice.ptr), + try o.lowerValue(slice.len), + }), .opt => |opt| { comptime assert(optional_layout_version == 3); const payload_ty = ty.optionalChild(mod); |