InternPool: use separate key for slices

This change eliminates some problematic recursive logic in InternPool,
and provides a safer API.

1 files changed, 6 insertions, 12 deletions

diff --git a/src/codegen/spirv.zig b/src/codegen/spirv.zig
index fd7d2ed8d3..6c058308df 100644
--- a/src/codegen/spirv.zig
+++ b/src/codegen/spirv.zig
@@ -855,18 +855,12 @@ const DeclGen = struct {
                 const int_ty = ty.intTagType(mod);
                 return try self.constant(int_ty, int_val, repr);
             },
-            .ptr => |ptr| {
-                const ptr_ty = switch (ptr.len) {
-                    .none => ty,
-                    else => ty.slicePtrFieldType(mod),
-                };
-                const ptr_id = try self.constantPtr(ptr_ty, val);
-                if (ptr.len == .none) {
-                    return ptr_id;
-                }
-
-                const len_id = try self.constant(Type.usize, Value.fromInterned(ptr.len), .indirect);
-                return try self.constructStruct(
+            .ptr => return self.constantPtr(ty, val),
+            .slice => |slice| {
+                const ptr_ty = ty.slicePtrFieldType(mod);
+                const ptr_id = try self.constantPtr(ptr_ty, Value.fromInterned(slice.ptr));
+                const len_id = try self.constant(Type.usize, Value.fromInterned(slice.len), .indirect);
+                return self.constructStruct(
                     ty,
                     &.{ ptr_ty, Type.usize },
                     &.{ ptr_id, len_id },