Merge pull request #20299 from mlugg/the-great-decl-split

The Great Decl Split (preliminary work): refactor source locations and eliminate `Sema.Block.src_decl`.

1 files changed, 20 insertions, 9 deletions

diff --git a/src/type.zig b/src/type.zig
index 5dad904ca0..215320ad79 100644
--- a/src/type.zig
+++ b/src/type.zig
@@ -3317,15 +3317,6 @@ pub const Type = struct {
         }
     }
 
-    pub fn declSrcLoc(ty: Type, mod: *Module) Module.SrcLoc {
-        return declSrcLocOrNull(ty, mod).?;
-    }
-
-    pub fn declSrcLocOrNull(ty: Type, mod: *Module) ?Module.SrcLoc {
-        const decl = ty.getOwnerDeclOrNull(mod) orelse return null;
-        return mod.declPtr(decl).srcLoc(mod);
-    }
-
     pub fn getOwnerDecl(ty: Type, mod: *Module) InternPool.DeclIndex {
         return ty.getOwnerDeclOrNull(mod) orelse unreachable;
     }
@@ -3341,6 +3332,26 @@ pub const Type = struct {
         };
     }
 
+    pub fn srcLocOrNull(ty: Type, zcu: *Zcu) ?Module.LazySrcLoc {
+        const ip = &zcu.intern_pool;
+        return .{
+            .base_node_inst = switch (ip.indexToKey(ty.toIntern())) {
+                .struct_type, .union_type, .opaque_type, .enum_type => |info| switch (info) {
+                    .declared => |d| d.zir_index,
+                    .reified => |r| r.zir_index,
+                    .generated_tag => |gt| ip.loadUnionType(gt.union_type).zir_index, // must be declared since we can't generate tags when reifying
+                    .empty_struct => return null,
+                },
+                else => return null,
+            },
+            .offset = Module.LazySrcLoc.Offset.nodeOffset(0),
+        };
+    }
+
+    pub fn srcLoc(ty: Type, zcu: *Zcu) Module.LazySrcLoc {
+        return ty.srcLocOrNull(zcu).?;
+    }
+
     pub fn isGenericPoison(ty: Type) bool {
         return ty.toIntern() == .generic_poison_type;
     }