Commit 275652f620541919087bc92da0d2f9e97c66d3c0 | zig

author	Andrew Kelley <andrew@ziglang.org> 2023-05-08 16:52:59-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-06-10 20:42:30-07:00
log	275652f620541919087bc92da0d2f9e97c66d3c0
tree	0b19398252ef29e6b0a6c6758ac90f564a235f13
parent	e94a81c951905a6b5bcf2a6028589ac1e33d1edd

stage2: move opaque types to InternPool

21 files changed, 935 insertions(+), 808 deletions(-)

src
- Compilation.zig
- InternPool.zig
- Module.zig
- Sema.zig
- arch
  - wasm
    CodeGen.zig
    Emit.zig
  - x86_64
    CodeGen.zig
- codegen
  - c.zig
  - c
    type.zig
  - llvm.zig
  - spirv.zig
  - spirv
    Module.zig
- crash_report.zig
- link.zig
- link
- type.zig

src/Compilation.zig+11-13

src/InternPool.zig+54-19

 @@ -17,7 +17,8 @@ const BigIntMutable = std.math.big.int.Mutable;
 const Limb = std.math.big.Limb;
 const InternPool = @This();
-const DeclIndex = enum(u32) { _ };
+const DeclIndex = @import("Module.zig").Decl.Index;
+const NamespaceIndex = @import("Module.zig").Namespace.Index;
 const KeyAdapter = struct {
     intern_pool: *const InternPool,
 @@ -48,7 +49,7 @@ pub const Key = union(enum) {
     extern_func: struct {
         ty: Index,
         /// The Decl that corresponds to the function itself.
-        owner_decl: DeclIndex,
+        decl: DeclIndex,
         /// Library name if specified.
         /// For example `extern "c" fn write(...) usize` would have 'c' as library name.
         /// Index into the string table bytes.
 @@ -62,6 +63,7 @@ pub const Key = union(enum) {
         tag: BigIntConst,
     },
     struct_type: StructType,
+    opaque_type: OpaqueType,
     union_type: struct {
         fields_len: u32,
 @@ -116,6 +118,13 @@ pub const Key = union(enum) {
         // TODO move Module.Struct data to InternPool
     };
+    pub const OpaqueType = struct {
+        /// The Decl that corresponds to the opaque itself.
+        decl: DeclIndex,
+        /// Represents the declarations inside this opaque.
+        namespace: NamespaceIndex,
+    };
     pub const Int = struct {
         ty: Index,
         storage: Storage,
 @@ -221,6 +230,7 @@ pub const Key = union(enum) {
                 _ = union_type;
                 @panic("TODO");
             },
+            .opaque_type => |opaque_type| std.hash.autoHash(hasher, opaque_type.decl),
         }
     }
 @@ -338,6 +348,11 @@ pub const Key = union(enum) {
                 _ = b_info;
                 @panic("TODO");
             },
+            .opaque_type => |a_info| {
+                const b_info = b.opaque_type;
+                return a_info.decl == b_info.decl;
+            },
         }
     }
 @@ -352,6 +367,7 @@ pub const Key = union(enum) {
             .simple_type,
             .struct_type,
             .union_type,
+            .opaque_type,
             => return .type_type,
             inline .ptr,
 @@ -770,10 +786,13 @@ pub const Tag = enum(u8) {
     /// are auto-numbered, and there are no declarations.
     /// data is payload index to `EnumSimple`.
     type_enum_simple,
     /// A type that can be represented with only an enum tag.
     /// data is SimpleType enum value.
     simple_type,
+    /// An opaque type.
+    /// data is index of Key.OpaqueType in extra.
+    type_opaque,
     /// A value that can be represented with only an enum tag.
     /// data is SimpleValue enum value.
     simple_value,
 @@ -986,7 +1005,7 @@ pub const ErrorUnion = struct {
 /// 0. field name: null-terminated string index for each fields_len; declaration order
 pub const EnumSimple = struct {
     /// The Decl that corresponds to the enum itself.
-    owner_decl: DeclIndex,
+    decl: DeclIndex,
     /// An integer type which is used for the numerical value of the enum. This
     /// is inferred by Zig to be the smallest power of two unsigned int that
     /// fits the number of fields. It is stored here to avoid unnecessary
 @@ -1146,6 +1165,9 @@ pub fn indexToKey(ip: InternPool, index: Index) Key {
         .type_error_union => @panic("TODO"),
         .type_enum_simple => @panic("TODO"),
+        .type_opaque => .{ .opaque_type = ip.extraData(Key.OpaqueType, data) },
         .simple_internal => switch (@intToEnum(SimpleInternal, data)) {
             .type_empty_struct => .{ .struct_type = .{
                 .fields_len = 0,
 @@ -1335,6 +1357,29 @@ pub fn get(ip: *InternPool, gpa: Allocator, key: Key) Allocator.Error!Index {
                 .data = @enumToInt(simple_value),
             });
         },
+        .struct_type => |struct_type| {
+            if (struct_type.fields_len != 0) {
+                @panic("TODO"); // handle structs other than empty_struct
+            }
+            ip.items.appendAssumeCapacity(.{
+                .tag = .simple_internal,
+                .data = @enumToInt(SimpleInternal.type_empty_struct),
+            });
+        },
+        .union_type => |union_type| {
+            _ = union_type;
+            @panic("TODO");
+        },
+        .opaque_type => |opaque_type| {
+            ip.items.appendAssumeCapacity(.{
+                .tag = .type_opaque,
+                .data = try ip.addExtra(gpa, opaque_type),
+            });
+        },
         .extern_func => @panic("TODO"),
         .ptr => |ptr| switch (ptr.addr) {
 @@ -1504,21 +1549,6 @@ pub fn get(ip: *InternPool, gpa: Allocator, key: Key) Allocator.Error!Index {
             const tag: Tag = if (enum_tag.tag.positive) .enum_tag_positive else .enum_tag_negative;
             try addInt(ip, gpa, enum_tag.ty, tag, enum_tag.tag.limbs);
         },
-        .struct_type => |struct_type| {
-            if (struct_type.fields_len != 0) {
-                @panic("TODO"); // handle structs other than empty_struct
-            }
-            ip.items.appendAssumeCapacity(.{
-                .tag = .simple_internal,
-                .data = @enumToInt(SimpleInternal.type_empty_struct),
-            });
-        },
-        .union_type => |union_type| {
-            _ = union_type;
-            @panic("TODO");
-        },
     }
     return @intToEnum(Index, ip.items.len - 1);
 }
 @@ -1548,6 +1578,8 @@ fn addExtraAssumeCapacity(ip: *InternPool, extra: anytype) u32 {
         ip.extra.appendAssumeCapacity(switch (field.type) {
             u32 => @field(extra, field.name),
             Index => @enumToInt(@field(extra, field.name)),
+            DeclIndex => @enumToInt(@field(extra, field.name)),
+            NamespaceIndex => @enumToInt(@field(extra, field.name)),
             i32 => @bitCast(u32, @field(extra, field.name)),
             Pointer.Flags => @bitCast(u32, @field(extra, field.name)),
             Pointer.PackedOffset => @bitCast(u32, @field(extra, field.name)),
 @@ -1603,6 +1635,8 @@ fn extraData(ip: InternPool, comptime T: type, index: usize) T {
         @field(result, field.name) = switch (field.type) {
             u32 => int32,
             Index => @intToEnum(Index, int32),
+            DeclIndex => @intToEnum(DeclIndex, int32),
+            NamespaceIndex => @intToEnum(NamespaceIndex, int32),
             i32 => @bitCast(i32, int32),
             Pointer.Flags => @bitCast(Pointer.Flags, int32),
             Pointer.PackedOffset => @bitCast(Pointer.PackedOffset, int32),
 @@ -1824,6 +1858,7 @@ fn dumpFallible(ip: InternPool, arena: Allocator) anyerror!void {
             .type_optional => 0,
             .type_error_union => @sizeOf(ErrorUnion),
             .type_enum_simple => @sizeOf(EnumSimple),
+            .type_opaque => @sizeOf(Key.OpaqueType),
             .simple_type => 0,
             .simple_value => 0,
             .simple_internal => 0,

src/Module.zig+239-156

 @@ -185,6 +185,11 @@ allocated_decls: std.SegmentedList(Decl, 0) = .{},
 /// When a Decl object is freed from `allocated_decls`, it is pushed into this stack.
 decls_free_list: ArrayListUnmanaged(Decl.Index) = .{},
+/// Same pattern as with `allocated_decls`.
+allocated_namespaces: std.SegmentedList(Namespace, 0) = .{},
+/// Same pattern as with `decls_free_list`.
+namespaces_free_list: ArrayListUnmanaged(Namespace.Index) = .{},
 global_assembly: std.AutoHashMapUnmanaged(Decl.Index, []u8) = .{},
 reference_table: std.AutoHashMapUnmanaged(Decl.Index, struct {
 @@ -363,7 +368,7 @@ pub const Export = struct {
     pub fn getSrcLoc(exp: Export, mod: *Module) SrcLoc {
         const src_decl = mod.declPtr(exp.src_decl);
         return .{
-            .file_scope = src_decl.getFileScope(),
+            .file_scope = src_decl.getFileScope(mod),
             .parent_decl_node = src_decl.src_node,
             .lazy = exp.src,
         };
 @@ -494,7 +499,7 @@ pub const Decl = struct {
     /// Reference to externally owned memory.
     /// In the case of the Decl corresponding to a file, this is
     /// the namespace of the struct, since there is no parent.
-    src_namespace: *Namespace,
+    src_namespace: Namespace.Index,
     /// The scope which lexically contains this decl.  A decl must depend
     /// on its lexical parent, in order to ensure that this pointer is valid.
 @@ -691,8 +696,8 @@ pub const Decl = struct {
     /// This name is relative to the containing namespace of the decl.
     /// The memory is owned by the containing File ZIR.
-    pub fn getName(decl: Decl) ?[:0]const u8 {
+    pub fn getName(decl: Decl, mod: *Module) ?[:0]const u8 {
-        const zir = decl.getFileScope().zir;
+        const zir = decl.getFileScope(mod).zir;
         return decl.getNameZir(zir);
     }
 @@ -703,8 +708,8 @@ pub const Decl = struct {
         return zir.nullTerminatedString(name_index);
     }
-    pub fn contentsHash(decl: Decl) std.zig.SrcHash {
+    pub fn contentsHash(decl: Decl, mod: *Module) std.zig.SrcHash {
-        const zir = decl.getFileScope().zir;
+        const zir = decl.getFileScope(mod).zir;
         return decl.contentsHashZir(zir);
     }
 @@ -715,31 +720,31 @@ pub const Decl = struct {
         return contents_hash;
     }
-    pub fn zirBlockIndex(decl: *const Decl) Zir.Inst.Index {
+    pub fn zirBlockIndex(decl: *const Decl, mod: *Module) Zir.Inst.Index {
         assert(decl.zir_decl_index != 0);
-        const zir = decl.getFileScope().zir;
+        const zir = decl.getFileScope(mod).zir;
         return zir.extra[decl.zir_decl_index + 6];
     }
-    pub fn zirAlignRef(decl: Decl) Zir.Inst.Ref {
+    pub fn zirAlignRef(decl: Decl, mod: *Module) Zir.Inst.Ref {
         if (!decl.has_align) return .none;
         assert(decl.zir_decl_index != 0);
-        const zir = decl.getFileScope().zir;
+        const zir = decl.getFileScope(mod).zir;
         return @intToEnum(Zir.Inst.Ref, zir.extra[decl.zir_decl_index + 8]);
     }
-    pub fn zirLinksectionRef(decl: Decl) Zir.Inst.Ref {
+    pub fn zirLinksectionRef(decl: Decl, mod: *Module) Zir.Inst.Ref {
         if (!decl.has_linksection_or_addrspace) return .none;
         assert(decl.zir_decl_index != 0);
-        const zir = decl.getFileScope().zir;
+        const zir = decl.getFileScope(mod).zir;
         const extra_index = decl.zir_decl_index + 8 + @boolToInt(decl.has_align);
         return @intToEnum(Zir.Inst.Ref, zir.extra[extra_index]);
     }
-    pub fn zirAddrspaceRef(decl: Decl) Zir.Inst.Ref {
+    pub fn zirAddrspaceRef(decl: Decl, mod: *Module) Zir.Inst.Ref {
         if (!decl.has_linksection_or_addrspace) return .none;
         assert(decl.zir_decl_index != 0);
-        const zir = decl.getFileScope().zir;
+        const zir = decl.getFileScope(mod).zir;
         const extra_index = decl.zir_decl_index + 8 + @boolToInt(decl.has_align) + 1;
         return @intToEnum(Zir.Inst.Ref, zir.extra[extra_index]);
     }
 @@ -764,25 +769,25 @@ pub const Decl = struct {
         return LazySrcLoc.nodeOffset(decl.nodeIndexToRelative(node_index));
     }
-    pub fn srcLoc(decl: Decl) SrcLoc {
+    pub fn srcLoc(decl: Decl, mod: *Module) SrcLoc {
-        return decl.nodeOffsetSrcLoc(0);
+        return decl.nodeOffsetSrcLoc(0, mod);
     }
-    pub fn nodeOffsetSrcLoc(decl: Decl, node_offset: i32) SrcLoc {
+    pub fn nodeOffsetSrcLoc(decl: Decl, node_offset: i32, mod: *Module) SrcLoc {
         return .{
-            .file_scope = decl.getFileScope(),
+            .file_scope = decl.getFileScope(mod),
             .parent_decl_node = decl.src_node,
             .lazy = LazySrcLoc.nodeOffset(node_offset),
         };
     }
-    pub fn srcToken(decl: Decl) Ast.TokenIndex {
+    pub fn srcToken(decl: Decl, mod: *Module) Ast.TokenIndex {
-        const tree = &decl.getFileScope().tree;
+        const tree = &decl.getFileScope(mod).tree;
         return tree.firstToken(decl.src_node);
     }
-    pub fn srcByteOffset(decl: Decl) u32 {
+    pub fn srcByteOffset(decl: Decl, mod: *Module) u32 {
-        const tree = &decl.getFileScope().tree;
+        const tree = &decl.getFileScope(mod).tree;
         return tree.tokens.items(.start)[decl.srcToken()];
     }
 @@ -791,12 +796,12 @@ pub const Decl = struct {
         if (decl.name_fully_qualified) {
             return writer.writeAll(unqualified_name);
         }
-        return decl.src_namespace.renderFullyQualifiedName(mod, unqualified_name, writer);
+        return mod.namespacePtr(decl.src_namespace).renderFullyQualifiedName(mod, unqualified_name, writer);
     }
     pub fn renderFullyQualifiedDebugName(decl: Decl, mod: *Module, writer: anytype) !void {
         const unqualified_name = mem.sliceTo(decl.name, 0);
-        return decl.src_namespace.renderFullyQualifiedDebugName(mod, unqualified_name, writer);
+        return mod.namespacePtr(decl.src_namespace).renderFullyQualifiedDebugName(mod, unqualified_name, writer);
     }
     pub fn getFullyQualifiedName(decl: Decl, mod: *Module) ![:0]u8 {
 @@ -877,32 +882,39 @@ pub const Decl = struct {
     /// Gets the namespace that this Decl creates by being a struct, union,
     /// enum, or opaque.
     /// Only returns it if the Decl is the owner.
-    pub fn getInnerNamespace(decl: *Decl) ?*Namespace {
+    pub fn getInnerNamespaceIndex(decl: *Decl, mod: *Module) Namespace.OptionalIndex {
-        if (!decl.owns_tv) return null;
+        if (!decl.owns_tv) return .none;
-        const ty = (decl.val.castTag(.ty) orelse return null).data;
+        if (decl.val.ip_index == .none) {
-        switch (ty.tag()) {
+            const ty = (decl.val.castTag(.ty) orelse return .none).data;
-            .@"struct" => {
+            switch (ty.tag()) {
-                const struct_obj = ty.castTag(.@"struct").?.data;
+                .@"struct" => {
-                return &struct_obj.namespace;
+                    const struct_obj = ty.castTag(.@"struct").?.data;
-            },
+                    return struct_obj.namespace.toOptional();
-            .enum_full, .enum_nonexhaustive => {
+                },
-                const enum_obj = ty.cast(Type.Payload.EnumFull).?.data;
+                .enum_full, .enum_nonexhaustive => {
-                return &enum_obj.namespace;
+                    const enum_obj = ty.cast(Type.Payload.EnumFull).?.data;
-            },
+                    return enum_obj.namespace.toOptional();
-            .empty_struct => {
+                },
-                return ty.castTag(.empty_struct).?.data;
+                .empty_struct => {
-            },
+                    @panic("TODO");
-            .@"opaque" => {
+                },
-                const opaque_obj = ty.cast(Type.Payload.Opaque).?.data;
+                .@"union", .union_safety_tagged, .union_tagged => {
-                return &opaque_obj.namespace;
+                    const union_obj = ty.cast(Type.Payload.Union).?.data;
-            },
+                    return union_obj.namespace.toOptional();
-            .@"union", .union_safety_tagged, .union_tagged => {
+                },
-                const union_obj = ty.cast(Type.Payload.Union).?.data;
-                return &union_obj.namespace;
-            },
-            else => return null,
+                else => return .none,
+            }
         }
+        return switch (mod.intern_pool.indexToKey(decl.val.ip_index)) {
+            .opaque_type => |opaque_type| opaque_type.namespace.toOptional(),
+            else => .none,
+        };
+    }
+    /// Same as `getInnerNamespaceIndex` but additionally obtains the pointer.
+    pub fn getInnerNamespace(decl: *Decl, mod: *Module) ?*Namespace {
+        return if (getInnerNamespaceIndex(decl, mod).unwrap()) |i| mod.namespacePtr(i) else null;
     }
     pub fn dump(decl: *Decl) void {
 @@ -920,8 +932,8 @@ pub const Decl = struct {
         std.debug.print("\n", .{});
     }
-    pub fn getFileScope(decl: Decl) *File {
+    pub fn getFileScope(decl: Decl, mod: *Module) *File {
-        return decl.src_namespace.file_scope;
+        return mod.namespacePtr(decl.src_namespace).file_scope;
     }
     pub fn removeDependant(decl: *Decl, other: Decl.Index) void {
 @@ -974,7 +986,7 @@ pub const ErrorSet = struct {
     pub fn srcLoc(self: ErrorSet, mod: *Module) SrcLoc {
         const owner_decl = mod.declPtr(self.owner_decl);
         return .{
-            .file_scope = owner_decl.getFileScope(),
+            .file_scope = owner_decl.getFileScope(mod),
             .parent_decl_node = owner_decl.src_node,
             .lazy = LazySrcLoc.nodeOffset(0),
         };
 @@ -1000,7 +1012,7 @@ pub const Struct = struct {
     /// Set of field names in declaration order.
     fields: Fields,
     /// Represents the declarations inside this struct.
-    namespace: Namespace,
+    namespace: Namespace.Index,
     /// The Decl that corresponds to the struct itself.
     owner_decl: Decl.Index,
     /// Index of the struct_decl ZIR instruction.
 @@ -1101,7 +1113,7 @@ pub const Struct = struct {
     pub fn srcLoc(s: Struct, mod: *Module) SrcLoc {
         const owner_decl = mod.declPtr(s.owner_decl);
         return .{
-            .file_scope = owner_decl.getFileScope(),
+            .file_scope = owner_decl.getFileScope(mod),
             .parent_decl_node = owner_decl.src_node,
             .lazy = LazySrcLoc.nodeOffset(0),
         };
 @@ -1110,7 +1122,7 @@ pub const Struct = struct {
     pub fn fieldSrcLoc(s: Struct, mod: *Module, query: FieldSrcQuery) SrcLoc {
         @setCold(true);
         const owner_decl = mod.declPtr(s.owner_decl);
-        const file = owner_decl.getFileScope();
+        const file = owner_decl.getFileScope(mod);
         const tree = file.getTree(mod.gpa) catch |err| {
             // In this case we emit a warning + a less precise source location.
             log.warn("unable to load {s}: {s}", .{
 @@ -1224,7 +1236,7 @@ pub const EnumSimple = struct {
     pub fn srcLoc(self: EnumSimple, mod: *Module) SrcLoc {
         const owner_decl = mod.declPtr(self.owner_decl);
         return .{
-            .file_scope = owner_decl.getFileScope(),
+            .file_scope = owner_decl.getFileScope(mod),
             .parent_decl_node = owner_decl.src_node,
             .lazy = LazySrcLoc.nodeOffset(0),
         };
 @@ -1253,7 +1265,7 @@ pub const EnumNumbered = struct {
     pub fn srcLoc(self: EnumNumbered, mod: *Module) SrcLoc {
         const owner_decl = mod.declPtr(self.owner_decl);
         return .{
-            .file_scope = owner_decl.getFileScope(),
+            .file_scope = owner_decl.getFileScope(mod),
             .parent_decl_node = owner_decl.src_node,
             .lazy = LazySrcLoc.nodeOffset(0),
         };
 @@ -1275,7 +1287,7 @@ pub const EnumFull = struct {
     /// If this hash map is empty, it means the enum tags are auto-numbered.
     values: ValueMap,
     /// Represents the declarations inside this enum.
-    namespace: Namespace,
+    namespace: Namespace.Index,
     /// true if zig inferred this tag type, false if user specified it
     tag_ty_inferred: bool,
 @@ -1285,7 +1297,7 @@ pub const EnumFull = struct {
     pub fn srcLoc(self: EnumFull, mod: *Module) SrcLoc {
         const owner_decl = mod.declPtr(self.owner_decl);
         return .{
-            .file_scope = owner_decl.getFileScope(),
+            .file_scope = owner_decl.getFileScope(mod),
             .parent_decl_node = owner_decl.src_node,
             .lazy = LazySrcLoc.nodeOffset(0),
         };
 @@ -1294,7 +1306,7 @@ pub const EnumFull = struct {
     pub fn fieldSrcLoc(e: EnumFull, mod: *Module, query: FieldSrcQuery) SrcLoc {
         @setCold(true);
         const owner_decl = mod.declPtr(e.owner_decl);
-        const file = owner_decl.getFileScope();
+        const file = owner_decl.getFileScope(mod);
         const tree = file.getTree(mod.gpa) catch |err| {
             // In this case we emit a warning + a less precise source location.
             log.warn("unable to load {s}: {s}", .{
 @@ -1323,7 +1335,7 @@ pub const Union = struct {
     /// Set of field names in declaration order.
     fields: Fields,
     /// Represents the declarations inside this union.
-    namespace: Namespace,
+    namespace: Namespace.Index,
     /// The Decl that corresponds to the union itself.
     owner_decl: Decl.Index,
     /// Index of the union_decl ZIR instruction.
 @@ -1371,7 +1383,7 @@ pub const Union = struct {
     pub fn srcLoc(self: Union, mod: *Module) SrcLoc {
         const owner_decl = mod.declPtr(self.owner_decl);
         return .{
-            .file_scope = owner_decl.getFileScope(),
+            .file_scope = owner_decl.getFileScope(mod),
             .parent_decl_node = owner_decl.src_node,
             .lazy = LazySrcLoc.nodeOffset(0),
         };
 @@ -1380,7 +1392,7 @@ pub const Union = struct {
     pub fn fieldSrcLoc(u: Union, mod: *Module, query: FieldSrcQuery) SrcLoc {
         @setCold(true);
         const owner_decl = mod.declPtr(u.owner_decl);
-        const file = owner_decl.getFileScope();
+        const file = owner_decl.getFileScope(mod);
         const tree = file.getTree(mod.gpa) catch |err| {
             // In this case we emit a warning + a less precise source location.
             log.warn("unable to load {s}: {s}", .{
 @@ -1563,26 +1575,6 @@ pub const Union = struct {
     }
 };
-pub const Opaque = struct {
-    /// The Decl that corresponds to the opaque itself.
-    owner_decl: Decl.Index,
-    /// Represents the declarations inside this opaque.
-    namespace: Namespace,
-    pub fn srcLoc(self: Opaque, mod: *Module) SrcLoc {
-        const owner_decl = mod.declPtr(self.owner_decl);
-        return .{
-            .file_scope = owner_decl.getFileScope(),
-            .parent_decl_node = owner_decl.src_node,
-            .lazy = LazySrcLoc.nodeOffset(0),
-        };
-    }
-    pub fn getFullyQualifiedName(s: *Opaque, mod: *Module) ![:0]u8 {
-        return mod.declPtr(s.owner_decl).getFullyQualifiedName(mod);
-    }
-};
 /// Some extern function struct memory is owned by the Decl's TypedValue.Managed
 /// arena allocator.
 pub const ExternFn = struct {
 @@ -1759,7 +1751,7 @@ pub const Fn = struct {
     }
     pub fn isAnytypeParam(func: Fn, mod: *Module, index: u32) bool {
-        const file = mod.declPtr(func.owner_decl).getFileScope();
+        const file = mod.declPtr(func.owner_decl).getFileScope(mod);
         const tags = file.zir.instructions.items(.tag);
 @@ -1774,7 +1766,7 @@ pub const Fn = struct {
     }
     pub fn getParamName(func: Fn, mod: *Module, index: u32) [:0]const u8 {
-        const file = mod.declPtr(func.owner_decl).getFileScope();
+        const file = mod.declPtr(func.owner_decl).getFileScope(mod);
         const tags = file.zir.instructions.items(.tag);
         const data = file.zir.instructions.items(.data);
 @@ -1797,7 +1789,7 @@ pub const Fn = struct {
     pub fn hasInferredErrorSet(func: Fn, mod: *Module) bool {
         const owner_decl = mod.declPtr(func.owner_decl);
-        const zir = owner_decl.getFileScope().zir;
+        const zir = owner_decl.getFileScope(mod).zir;
         const zir_tags = zir.instructions.items(.tag);
         switch (zir_tags[func.zir_body_inst]) {
             .func => return false,
 @@ -1851,7 +1843,7 @@ pub const DeclAdapter = struct {
 /// The container that structs, enums, unions, and opaques have.
 pub const Namespace = struct {
-    parent: ?*Namespace,
+    parent: OptionalIndex,
     file_scope: *File,
     /// Will be a struct, enum, union, or opaque.
     ty: Type,
 @@ -1869,6 +1861,28 @@ pub const Namespace = struct {
     /// Value is whether the usingnamespace decl is marked `pub`.
     usingnamespace_set: std.AutoHashMapUnmanaged(Decl.Index, bool) = .{},
+    pub const Index = enum(u32) {
+        _,
+        pub fn toOptional(i: Index) OptionalIndex {
+            return @intToEnum(OptionalIndex, @enumToInt(i));
+        }
+    };
+    pub const OptionalIndex = enum(u32) {
+        none = std.math.maxInt(u32),
+        _,
+        pub fn init(oi: ?Index) OptionalIndex {
+            return @intToEnum(OptionalIndex, @enumToInt(oi orelse return .none));
+        }
+        pub fn unwrap(oi: OptionalIndex) ?Index {
+            if (oi == .none) return null;
+            return @intToEnum(Index, @enumToInt(oi));
+        }
+    };
     const DeclContext = struct {
         module: *Module,
 @@ -1955,10 +1969,10 @@ pub const Namespace = struct {
         name: []const u8,
         writer: anytype,
     ) @TypeOf(writer).Error!void {
-        if (ns.parent) |parent| {
+        if (ns.parent.unwrap()) |parent| {
-            const decl_index = ns.getDeclIndex();
+            const decl_index = ns.getDeclIndex(mod);
             const decl = mod.declPtr(decl_index);
-            try parent.renderFullyQualifiedName(mod, mem.sliceTo(decl.name, 0), writer);
+            try mod.namespacePtr(parent).renderFullyQualifiedName(mod, mem.sliceTo(decl.name, 0), writer);
         } else {
             try ns.file_scope.renderFullyQualifiedName(writer);
         }
 @@ -1976,10 +1990,10 @@ pub const Namespace = struct {
         writer: anytype,
     ) @TypeOf(writer).Error!void {
         var separator_char: u8 = '.';
-        if (ns.parent) |parent| {
+        if (ns.parent.unwrap()) |parent| {
-            const decl_index = ns.getDeclIndex();
+            const decl_index = ns.getDeclIndex(mod);
             const decl = mod.declPtr(decl_index);
-            try parent.renderFullyQualifiedDebugName(mod, mem.sliceTo(decl.name, 0), writer);
+            try mod.namespacePtr(parent).renderFullyQualifiedDebugName(mod, mem.sliceTo(decl.name, 0), writer);
         } else {
             try ns.file_scope.renderFullyQualifiedDebugName(writer);
             separator_char = ':';
 @@ -1990,8 +2004,8 @@ pub const Namespace = struct {
         }
     }
-    pub fn getDeclIndex(ns: Namespace) Decl.Index {
+    pub fn getDeclIndex(ns: Namespace, mod: *Module) Decl.Index {
-        return ns.ty.getOwnerDecl();
+        return ns.ty.getOwnerDecl(mod);
     }
 };
 @@ -3320,7 +3334,7 @@ pub const LazySrcLoc = union(enum) {
     }
     /// Upgrade to a `SrcLoc` based on the `Decl` provided.
-    pub fn toSrcLoc(lazy: LazySrcLoc, decl: *Decl) SrcLoc {
+    pub fn toSrcLoc(lazy: LazySrcLoc, decl: *Decl, mod: *Module) SrcLoc {
         return switch (lazy) {
             .unneeded,
             .entire_file,
 @@ -3328,7 +3342,7 @@ pub const LazySrcLoc = union(enum) {
             .token_abs,
             .node_abs,
             => .{
-                .file_scope = decl.getFileScope(),
+                .file_scope = decl.getFileScope(mod),
                 .parent_decl_node = 0,
                 .lazy = lazy,
             },
 @@ -3394,7 +3408,7 @@ pub const LazySrcLoc = union(enum) {
             .for_input,
             .for_capture_from_input,
             => .{
-                .file_scope = decl.getFileScope(),
+                .file_scope = decl.getFileScope(mod),
                 .parent_decl_node = decl.src_node,
                 .lazy = lazy,
             },
 @@ -3555,6 +3569,9 @@ pub fn deinit(mod: *Module) void {
     mod.global_assembly.deinit(gpa);
     mod.reference_table.deinit(gpa);
+    mod.namespaces_free_list.deinit(gpa);
+    mod.allocated_namespaces.deinit(gpa);
     mod.string_literal_table.deinit(gpa);
     mod.string_literal_bytes.deinit(gpa);
 @@ -3575,8 +3592,9 @@ pub fn destroyDecl(mod: *Module, decl_index: Decl.Index) void {
             gpa.free(kv.value);
         }
         if (decl.has_tv) {
-            if (decl.getInnerNamespace()) |namespace| {
+            if (decl.getInnerNamespaceIndex(mod).unwrap()) |i| {
-                namespace.destroyDecls(mod);
+                mod.namespacePtr(i).destroyDecls(mod);
+                mod.destroyNamespace(i);
             }
         }
         decl.clearValues(mod);
 @@ -3596,16 +3614,21 @@ pub fn destroyDecl(mod: *Module, decl_index: Decl.Index) void {
     }
 }
-pub fn declPtr(mod: *Module, decl_index: Decl.Index) *Decl {
+pub fn declPtr(mod: *Module, index: Decl.Index) *Decl {
-    return mod.allocated_decls.at(@enumToInt(decl_index));
+    return mod.allocated_decls.at(@enumToInt(index));
+}
+pub fn namespacePtr(mod: *Module, index: Namespace.Index) *Namespace {
+    return mod.allocated_namespaces.at(@enumToInt(index));
 }
 /// Returns true if and only if the Decl is the top level struct associated with a File.
 pub fn declIsRoot(mod: *Module, decl_index: Decl.Index) bool {
     const decl = mod.declPtr(decl_index);
-    if (decl.src_namespace.parent != null)
+    const namespace = mod.namespacePtr(decl.src_namespace);
+    if (namespace.parent != .none)
         return false;
-    return decl_index == decl.src_namespace.getDeclIndex();
+    return decl_index == namespace.getDeclIndex(mod);
 }
 fn freeExportList(gpa: Allocator, export_list: *ArrayListUnmanaged(*Export)) void {
 @@ -4076,7 +4099,7 @@ fn updateZirRefs(mod: *Module, file: *File, old_zir: Zir) !void {
             };
         }
-        if (decl.getInnerNamespace()) |namespace| {
+        if (decl.getInnerNamespace(mod)) |namespace| {
             for (namespace.decls.keys()) |sub_decl| {
                 try decl_stack.append(gpa, sub_decl);
             }
 @@ -4306,7 +4329,7 @@ pub fn ensureDeclAnalyzed(mod: *Module, decl_index: Decl.Index) SemaError!void {
                 try mod.failed_decls.ensureUnusedCapacity(mod.gpa, 1);
                 mod.failed_decls.putAssumeCapacityNoClobber(decl_index, try ErrorMsg.create(
                     mod.gpa,
-                    decl.srcLoc(),
+                    decl.srcLoc(mod),
                     "unable to analyze: {s}",
                     .{@errorName(e)},
                 ));
 @@ -4437,7 +4460,7 @@ pub fn ensureFuncBodyAnalyzed(mod: *Module, func: *Fn) SemaError!void {
                             decl_index,
                             try Module.ErrorMsg.create(
                                 gpa,
-                                decl.srcLoc(),
+                                decl.srcLoc(mod),
                                 "invalid liveness: {s}",
                                 .{@errorName(err)},
                             ),
 @@ -4460,7 +4483,7 @@ pub fn ensureFuncBodyAnalyzed(mod: *Module, func: *Fn) SemaError!void {
                     try mod.failed_decls.ensureUnusedCapacity(gpa, 1);
                     mod.failed_decls.putAssumeCapacityNoClobber(decl_index, try Module.ErrorMsg.create(
                         gpa,
-                        decl.srcLoc(),
+                        decl.srcLoc(mod),
                         "unable to codegen: {s}",
                         .{@errorName(err)},
                     ));
 @@ -4586,13 +4609,13 @@ pub fn semaFile(mod: *Module, file: *File) SemaError!void {
         .status = .none,
         .known_non_opv = undefined,
         .is_tuple = undefined, // set below
-        .namespace = .{
+        .namespace = try mod.createNamespace(.{
-            .parent = null,
+            .parent = .none,
             .ty = struct_ty,
             .file_scope = file,
-        },
+        }),
     };
-    const new_decl_index = try mod.allocateNewDecl(&struct_obj.namespace, 0, null);
+    const new_decl_index = try mod.allocateNewDecl(struct_obj.namespace, 0, null);
     const new_decl = mod.declPtr(new_decl_index);
     file.root_decl = new_decl_index.toOptional();
     struct_obj.owner_decl = new_decl_index;
 @@ -4688,12 +4711,12 @@ fn semaDecl(mod: *Module, decl_index: Decl.Index) !bool {
     const decl = mod.declPtr(decl_index);
-    if (decl.getFileScope().status != .success_zir) {
+    if (decl.getFileScope(mod).status != .success_zir) {
         return error.AnalysisFail;
     }
     const gpa = mod.gpa;
-    const zir = decl.getFileScope().zir;
+    const zir = decl.getFileScope(mod).zir;
     const zir_datas = zir.instructions.items(.data);
     decl.analysis = .in_progress;
 @@ -4767,7 +4790,7 @@ fn semaDecl(mod: *Module, decl_index: Decl.Index) !bool {
         block_scope.params.deinit(gpa);
     }
-    const zir_block_index = decl.zirBlockIndex();
+    const zir_block_index = decl.zirBlockIndex(mod);
     const inst_data = zir_datas[zir_block_index].pl_node;
     const extra = zir.extraData(Zir.Inst.Block, inst_data.payload_index);
     const body = zir.extra[extra.end..][0..extra.data.body_len];
 @@ -4792,7 +4815,7 @@ fn semaDecl(mod: *Module, decl_index: Decl.Index) !bool {
             });
         }
         const ty = try decl_tv.val.toType().copy(decl_arena_allocator);
-        if (ty.getNamespace() == null) {
+        if (ty.getNamespace(mod) == null) {
             return sema.fail(&block_scope, ty_src, "type {} has no namespace", .{ty.fmt(mod)});
         }
 @@ -4895,12 +4918,12 @@ fn semaDecl(mod: *Module, decl_index: Decl.Index) !bool {
     decl.ty = try decl_tv.ty.copy(decl_arena_allocator);
     decl.val = try decl_tv.val.copy(decl_arena_allocator);
     decl.@"align" = blk: {
-        const align_ref = decl.zirAlignRef();
+        const align_ref = decl.zirAlignRef(mod);
         if (align_ref == .none) break :blk 0;
         break :blk try sema.resolveAlign(&block_scope, align_src, align_ref);
     };
     decl.@"linksection" = blk: {
-        const linksection_ref = decl.zirLinksectionRef();
+        const linksection_ref = decl.zirLinksectionRef(mod);
         if (linksection_ref == .none) break :blk null;
         const bytes = try sema.resolveConstString(&block_scope, section_src, linksection_ref, "linksection must be comptime-known");
         if (mem.indexOfScalar(u8, bytes, 0) != null) {
 @@ -4921,7 +4944,7 @@ fn semaDecl(mod: *Module, decl_index: Decl.Index) !bool {
         };
         const target = sema.mod.getTarget();
-        break :blk switch (decl.zirAddrspaceRef()) {
+        break :blk switch (decl.zirAddrspaceRef(mod)) {
             .none => switch (addrspace_ctx) {
                 .function => target_util.defaultAddressSpace(target, .function),
                 .variable => target_util.defaultAddressSpace(target, .global_mutable),
 @@ -5273,7 +5296,7 @@ pub fn detectEmbedFileUpdate(mod: *Module, embed_file: *EmbedFile) !void {
 pub fn scanNamespace(
     mod: *Module,
-    namespace: *Namespace,
+    namespace_index: Namespace.Index,
     extra_start: usize,
     decls_len: u32,
     parent_decl: *Decl,
 @@ -5282,6 +5305,7 @@ pub fn scanNamespace(
     defer tracy.end();
     const gpa = mod.gpa;
+    const namespace = mod.namespacePtr(namespace_index);
     const zir = namespace.file_scope.zir;
     try mod.comp.work_queue.ensureUnusedCapacity(decls_len);
 @@ -5294,7 +5318,7 @@ pub fn scanNamespace(
     var decl_i: u32 = 0;
     var scan_decl_iter: ScanDeclIter = .{
         .module = mod,
-        .namespace = namespace,
+        .namespace_index = namespace_index,
         .parent_decl = parent_decl,
     };
     while (decl_i < decls_len) : (decl_i += 1) {
 @@ -5317,7 +5341,7 @@ pub fn scanNamespace(
 const ScanDeclIter = struct {
     module: *Module,
-    namespace: *Namespace,
+    namespace_index: Namespace.Index,
     parent_decl: *Decl,
     usingnamespace_index: usize = 0,
     comptime_index: usize = 0,
 @@ -5329,7 +5353,8 @@ fn scanDecl(iter: *ScanDeclIter, decl_sub_index: usize, flags: u4) Allocator.Err
     defer tracy.end();
     const mod = iter.module;
-    const namespace = iter.namespace;
+    const namespace_index = iter.namespace_index;
+    const namespace = mod.namespacePtr(namespace_index);
     const gpa = mod.gpa;
     const zir = namespace.file_scope.zir;
 @@ -5404,7 +5429,7 @@ fn scanDecl(iter: *ScanDeclIter, decl_sub_index: usize, flags: u4) Allocator.Err
     );
     const comp = mod.comp;
     if (!gop.found_existing) {
-        const new_decl_index = try mod.allocateNewDecl(namespace, decl_node, iter.parent_decl.src_scope);
+        const new_decl_index = try mod.allocateNewDecl(namespace_index, decl_node, iter.parent_decl.src_scope);
         const new_decl = mod.declPtr(new_decl_index);
         new_decl.kind = kind;
         new_decl.name = decl_name;
 @@ -5456,7 +5481,7 @@ fn scanDecl(iter: *ScanDeclIter, decl_sub_index: usize, flags: u4) Allocator.Err
     const decl = mod.declPtr(decl_index);
     if (kind == .@"test") {
         const src_loc = SrcLoc{
-            .file_scope = decl.getFileScope(),
+            .file_scope = decl.getFileScope(mod),
             .parent_decl_node = decl.src_node,
             .lazy = .{ .token_offset = 1 },
         };
 @@ -5564,7 +5589,7 @@ pub fn clearDecl(
         if (decl.ty.isFnOrHasRuntimeBits(mod)) {
             mod.comp.bin_file.freeDecl(decl_index);
         }
-        if (decl.getInnerNamespace()) |namespace| {
+        if (decl.getInnerNamespace(mod)) |namespace| {
             try namespace.deleteAllDecls(mod, outdated_decls);
         }
     }
 @@ -5584,7 +5609,7 @@ pub fn deleteUnusedDecl(mod: *Module, decl_index: Decl.Index) void {
     log.debug("deleteUnusedDecl {d} ({s})", .{ decl_index, decl.name });
     assert(!mod.declIsRoot(decl_index));
-    assert(decl.src_namespace.anon_decls.swapRemove(decl_index));
+    assert(mod.namespacePtr(decl.src_namespace).anon_decls.swapRemove(decl_index));
     const dependants = decl.dependants.keys();
     for (dependants) |dep| {
 @@ -5612,7 +5637,7 @@ pub fn abortAnonDecl(mod: *Module, decl_index: Decl.Index) void {
     log.debug("abortAnonDecl {*} ({s})", .{ decl, decl.name });
     assert(!mod.declIsRoot(decl_index));
-    assert(decl.src_namespace.anon_decls.swapRemove(decl_index));
+    assert(mod.namespacePtr(decl.src_namespace).anon_decls.swapRemove(decl_index));
     // An aborted decl must not have dependants -- they must have
     // been aborted first and removed from this list.
 @@ -5689,7 +5714,7 @@ pub fn analyzeFnBody(mod: *Module, func: *Fn, arena: Allocator) SemaError!Air {
         .gpa = gpa,
         .arena = arena,
         .perm_arena = decl_arena_allocator,
-        .code = decl.getFileScope().zir,
+        .code = decl.getFileScope(mod).zir,
         .owner_decl = decl,
         .owner_decl_index = decl_index,
         .func = func,
 @@ -5920,9 +5945,34 @@ fn markOutdatedDecl(mod: *Module, decl_index: Decl.Index) !void {
     decl.analysis = .outdated;
 }
+pub const CreateNamespaceOptions = struct {
+    parent: Namespace.OptionalIndex,
+    file_scope: *File,
+    ty: Type,
+};
+pub fn createNamespace(mod: *Module, options: CreateNamespaceOptions) !Namespace.Index {
+    if (mod.namespaces_free_list.popOrNull()) |index| return index;
+    const ptr = try mod.allocated_namespaces.addOne(mod.gpa);
+    ptr.* = .{
+        .parent = options.parent,
+        .file_scope = options.file_scope,
+        .ty = options.ty,
+    };
+    return @intToEnum(Namespace.Index, mod.allocated_namespaces.len - 1);
+}
+pub fn destroyNamespace(mod: *Module, index: Namespace.Index) void {
+    mod.namespacePtr(index).* = undefined;
+    mod.namespaces_free_list.append(mod.gpa, index) catch {
+        // In order to keep `destroyNamespace` a non-fallible function, we ignore memory
+        // allocation failures here, instead leaking the Namespace until garbage collection.
+    };
+}
 pub fn allocateNewDecl(
     mod: *Module,
-    namespace: *Namespace,
+    namespace: Namespace.Index,
     src_node: Ast.Node.Index,
     src_scope: ?*CaptureScope,
 ) !Decl.Index {
 @@ -6004,7 +6054,7 @@ pub fn createAnonymousDecl(mod: *Module, block: *Sema.Block, typed_value: TypedV
 pub fn createAnonymousDeclFromDecl(
     mod: *Module,
     src_decl: *Decl,
-    namespace: *Namespace,
+    namespace: Namespace.Index,
     src_scope: ?*CaptureScope,
     tv: TypedValue,
 ) !Decl.Index {
 @@ -6022,7 +6072,7 @@ pub fn initNewAnonDecl(
     mod: *Module,
     new_decl_index: Decl.Index,
     src_line: u32,
-    namespace: *Namespace,
+    namespace: Namespace.Index,
     typed_value: TypedValue,
     name: [:0]u8,
 ) !void {
 @@ -6040,7 +6090,7 @@ pub fn initNewAnonDecl(
     new_decl.analysis = .complete;
     new_decl.generation = mod.generation;
-    try namespace.anon_decls.putNoClobber(mod.gpa, new_decl_index, {});
+    try mod.namespacePtr(namespace).anon_decls.putNoClobber(mod.gpa, new_decl_index, {});
     // The Decl starts off with alive=false and the codegen backend will set alive=true
     // if the Decl is referenced by an instruction or another constant. Otherwise,
 @@ -6110,16 +6160,17 @@ pub const SwitchProngSrc = union(enum) {
     /// the LazySrcLoc in order to emit a compile error.
     pub fn resolve(
         prong_src: SwitchProngSrc,
-        gpa: Allocator,
+        mod: *Module,
         decl: *Decl,
         switch_node_offset: i32,
         range_expand: RangeExpand,
     ) LazySrcLoc {
         @setCold(true);
-        const tree = decl.getFileScope().getTree(gpa) catch |err| {
+        const gpa = mod.gpa;
+        const tree = decl.getFileScope(mod).getTree(gpa) catch |err| {
             // In this case we emit a warning + a less precise source location.
             log.warn("unable to load {s}: {s}", .{
-                decl.getFileScope().sub_file_path, @errorName(err),
+                decl.getFileScope(mod).sub_file_path, @errorName(err),
             });
             return LazySrcLoc.nodeOffset(0);
         };
 @@ -6203,11 +6254,12 @@ pub const PeerTypeCandidateSrc = union(enum) {
     pub fn resolve(
         self: PeerTypeCandidateSrc,
-        gpa: Allocator,
+        mod: *Module,
         decl: *Decl,
         candidate_i: usize,
     ) ?LazySrcLoc {
         @setCold(true);
+        const gpa = mod.gpa;
         switch (self) {
             .none => {
 @@ -6229,10 +6281,10 @@ pub const PeerTypeCandidateSrc = union(enum) {
                     else => {},
                 }
-                const tree = decl.getFileScope().getTree(gpa) catch |err| {
+                const tree = decl.getFileScope(mod).getTree(gpa) catch |err| {
                     // In this case we emit a warning + a less precise source location.
                     log.warn("unable to load {s}: {s}", .{
-                        decl.getFileScope().sub_file_path, @errorName(err),
+                        decl.getFileScope(mod).sub_file_path, @errorName(err),
                     });
                     return LazySrcLoc.nodeOffset(0);
                 };
 @@ -6291,15 +6343,16 @@ fn queryFieldSrc(
 pub fn paramSrc(
     func_node_offset: i32,
-    gpa: Allocator,
+    mod: *Module,
     decl: *Decl,
     param_i: usize,
 ) LazySrcLoc {
     @setCold(true);
-    const tree = decl.getFileScope().getTree(gpa) catch |err| {
+    const gpa = mod.gpa;
+    const tree = decl.getFileScope(mod).getTree(gpa) catch |err| {
         // In this case we emit a warning + a less precise source location.
         log.warn("unable to load {s}: {s}", .{
-            decl.getFileScope().sub_file_path, @errorName(err),
+            decl.getFileScope(mod).sub_file_path, @errorName(err),
         });
         return LazySrcLoc.nodeOffset(0);
     };
 @@ -6321,19 +6374,20 @@ pub fn paramSrc(
 }
 pub fn argSrc(
+    mod: *Module,
     call_node_offset: i32,
-    gpa: Allocator,
     decl: *Decl,
     start_arg_i: usize,
     bound_arg_src: ?LazySrcLoc,
 ) LazySrcLoc {
+    @setCold(true);
+    const gpa = mod.gpa;
     if (start_arg_i == 0 and bound_arg_src != null) return bound_arg_src.?;
     const arg_i = start_arg_i - @boolToInt(bound_arg_src != null);
-    @setCold(true);
+    const tree = decl.getFileScope(mod).getTree(gpa) catch |err| {
-    const tree = decl.getFileScope().getTree(gpa) catch |err| {
         // In this case we emit a warning + a less precise source location.
         log.warn("unable to load {s}: {s}", .{
-            decl.getFileScope().sub_file_path, @errorName(err),
+            decl.getFileScope(mod).sub_file_path, @errorName(err),
         });
         return LazySrcLoc.nodeOffset(0);
     };
 @@ -6347,7 +6401,7 @@ pub fn argSrc(
             const node_datas = tree.nodes.items(.data);
             const call_args_node = tree.extra_data[node_datas[node].rhs - 1];
             const call_args_offset = decl.nodeIndexToRelative(call_args_node);
-            return initSrc(call_args_offset, gpa, decl, arg_i);
+            return mod.initSrc(call_args_offset, decl, arg_i);
         },
         else => unreachable,
     };
 @@ -6355,16 +6409,17 @@ pub fn argSrc(
 }
 pub fn initSrc(
+    mod: *Module,
     init_node_offset: i32,
-    gpa: Allocator,
     decl: *Decl,
     init_index: usize,
 ) LazySrcLoc {
     @setCold(true);
-    const tree = decl.getFileScope().getTree(gpa) catch |err| {
+    const gpa = mod.gpa;
+    const tree = decl.getFileScope(mod).getTree(gpa) catch |err| {
         // In this case we emit a warning + a less precise source location.
         log.warn("unable to load {s}: {s}", .{
-            decl.getFileScope().sub_file_path, @errorName(err),
+            decl.getFileScope(mod).sub_file_path, @errorName(err),
         });
         return LazySrcLoc.nodeOffset(0);
     };
 @@ -6400,12 +6455,13 @@ pub fn initSrc(
     }
 }
-pub fn optionsSrc(gpa: Allocator, decl: *Decl, base_src: LazySrcLoc, wanted: []const u8) LazySrcLoc {
+pub fn optionsSrc(mod: *Module, decl: *Decl, base_src: LazySrcLoc, wanted: []const u8) LazySrcLoc {
     @setCold(true);
-    const tree = decl.getFileScope().getTree(gpa) catch |err| {
+    const gpa = mod.gpa;
+    const tree = decl.getFileScope(mod).getTree(gpa) catch |err| {
         // In this case we emit a warning + a less precise source location.
         log.warn("unable to load {s}: {s}", .{
-            decl.getFileScope().sub_file_path, @errorName(err),
+            decl.getFileScope(mod).sub_file_path, @errorName(err),
         });
         return LazySrcLoc.nodeOffset(0);
     };
 @@ -6471,7 +6527,10 @@ pub fn processOutdatedAndDeletedDecls(mod: *Module) !void {
             // Remove from the namespace it resides in, preserving declaration order.
             assert(decl.zir_decl_index != 0);
-            _ = decl.src_namespace.decls.orderedRemoveAdapted(@as([]const u8, mem.sliceTo(decl.name, 0)), DeclAdapter{ .mod = mod });
+            _ = mod.namespacePtr(decl.src_namespace).decls.orderedRemoveAdapted(
+                @as([]const u8, mem.sliceTo(decl.name, 0)),
+                DeclAdapter{ .mod = mod },
+            );
             try mod.clearDecl(decl_index, &outdated_decls);
             mod.destroyDecl(decl_index);
 @@ -6541,8 +6600,11 @@ pub fn populateTestFunctions(
     const builtin_pkg = mod.main_pkg.table.get("builtin").?;
     const builtin_file = (mod.importPkg(builtin_pkg) catch unreachable).file;
     const root_decl = mod.declPtr(builtin_file.root_decl.unwrap().?);
-    const builtin_namespace = root_decl.src_namespace;
+    const builtin_namespace = mod.namespacePtr(root_decl.src_namespace);
-    const decl_index = builtin_namespace.decls.getKeyAdapted(@as([]const u8, "test_functions"), DeclAdapter{ .mod = mod }).?;
+    const decl_index = builtin_namespace.decls.getKeyAdapted(
+        @as([]const u8, "test_functions"),
+        DeclAdapter{ .mod = mod },
+    ).?;
     {
         // We have to call `ensureDeclAnalyzed` here in case `builtin.test_functions`
         // was not referenced by start code.
 @@ -6673,7 +6735,7 @@ pub fn linkerUpdateDecl(mod: *Module, decl_index: Decl.Index) !void {
             try mod.failed_decls.ensureUnusedCapacity(gpa, 1);
             mod.failed_decls.putAssumeCapacityNoClobber(decl_index, try ErrorMsg.create(
                 gpa,
-                decl.srcLoc(),
+                decl.srcLoc(mod),
                 "unable to codegen: {s}",
                 .{@errorName(err)},
             ));
 @@ -7138,3 +7200,24 @@ pub fn atomicPtrAlignment(
     return 0;
 }
+pub fn opaqueSrcLoc(mod: *Module, opaque_type: InternPool.Key.OpaqueType) SrcLoc {
+    const owner_decl = mod.declPtr(opaque_type.decl);
+    return .{
+        .file_scope = owner_decl.getFileScope(mod),
+        .parent_decl_node = owner_decl.src_node,
+        .lazy = LazySrcLoc.nodeOffset(0),
+    };
+}
+pub fn opaqueFullyQualifiedName(mod: *Module, opaque_type: InternPool.Key.OpaqueType) ![:0]u8 {
+    return mod.declPtr(opaque_type.decl).getFullyQualifiedName(mod);
+}
+pub fn declFileScope(mod: *Module, decl_index: Decl.Index) *File {
+    return mod.declPtr(decl_index).getFileScope(mod);
+}
+pub fn namespaceDeclIndex(mod: *Module, namespace_index: Namespace.Index) Decl.Index {
+    return mod.namespacePtr(namespace_index).getDeclIndex(mod);
+}

src/Sema.zig+325-312

...	@@ -227,7 +227,7 @@ pub const Block = struct {	...	@@ -227,7 +227,7 @@ pub const Block = struct {
227	sema: *Sema,	227	sema: *Sema,
228	/// The namespace to use for lookups from this source block	228	/// The namespace to use for lookups from this source block
229	/// When analyzing fields, this is different from src_decl.src_namespace.	229	/// When analyzing fields, this is different from src_decl.src_namespace.
230	namespace: *Namespace,	230	namespace: Namespace.Index,
231	/// The AIR instructions generated for this block.	231	/// The AIR instructions generated for this block.
232	instructions: std.ArrayListUnmanaged(Air.Inst.Index),	232	instructions: std.ArrayListUnmanaged(Air.Inst.Index),
233	// `param` instructions are collected here to be used by the `func` instruction.	233	// `param` instructions are collected here to be used by the `func` instruction.
...	@@ -286,6 +286,7 @@ pub const Block = struct {	...	@@ -286,6 +286,7 @@ pub const Block = struct {
286		286
287	fn explain(cr: ComptimeReason, sema: Sema, msg: ?Module.ErrorMsg) !void {	287	fn explain(cr: ComptimeReason, sema: Sema, msg: ?Module.ErrorMsg) !void {
288	const parent = msg orelse return;	288	const parent = msg orelse return;
		289	const mod = sema.mod;
289	const prefix = "expression is evaluated at comptime because ";	290	const prefix = "expression is evaluated at comptime because ";
290	switch (cr) {	291	switch (cr) {
291	.c_import => \|ci\| {	292	.c_import => \|ci\| {
...	@@ -293,12 +294,12 @@ pub const Block = struct {	...	@@ -293,12 +294,12 @@ pub const Block = struct {
293	},	294	},
294	.comptime_ret_ty => \|rt\| {	295	.comptime_ret_ty => \|rt\| {
295	const src_loc = if (try sema.funcDeclSrc(rt.func)) \|fn_decl\| blk: {	296	const src_loc = if (try sema.funcDeclSrc(rt.func)) \|fn_decl\| blk: {
296	var src_loc = fn_decl.srcLoc();	297	var src_loc = fn_decl.srcLoc(mod);
297	src_loc.lazy = .{ .node_offset_fn_type_ret_ty = 0 };	298	src_loc.lazy = .{ .node_offset_fn_type_ret_ty = 0 };
298	break :blk src_loc;	299	break :blk src_loc;
299	} else blk: {	300	} else blk: {
300	const src_decl = sema.mod.declPtr(rt.block.src_decl);	301	const src_decl = sema.mod.declPtr(rt.block.src_decl);
301	break :blk rt.func_src.toSrcLoc(src_decl);	302	break :blk rt.func_src.toSrcLoc(src_decl, mod);
302	};	303	};
303	if (rt.return_ty.isGenericPoison()) {	304	if (rt.return_ty.isGenericPoison()) {
304	return sema.mod.errNoteNonLazy(src_loc, parent, prefix ++ "the generic function was instantiated with a comptime-only return type", .{});	305	return sema.mod.errNoteNonLazy(src_loc, parent, prefix ++ "the generic function was instantiated with a comptime-only return type", .{});
...	@@ -399,8 +400,8 @@ pub const Block = struct {	...	@@ -399,8 +400,8 @@ pub const Block = struct {
399	};	400	};
400	}	401	}
401		402
402	pub fn getFileScope(block: Block) Module.File {	403	pub fn getFileScope(block: Block, mod: Module) *Module.File {
403	return block.namespace.file_scope;	404	return mod.namespacePtr(block.namespace).file_scope;
404	}	405	}
405		406
406	fn addTy(	407	fn addTy(
...	@@ -876,6 +877,7 @@ fn analyzeBodyInner(	...	@@ -876,6 +877,7 @@ fn analyzeBodyInner(
876	wip_captures.deinit();	877	wip_captures.deinit();
877	};	878	};
878		879
		880	const mod = sema.mod;
879	const map = &sema.inst_map;	881	const map = &sema.inst_map;
880	const tags = sema.code.instructions.items(.tag);	882	const tags = sema.code.instructions.items(.tag);
881	const datas = sema.code.instructions.items(.data);	883	const datas = sema.code.instructions.items(.data);
...	@@ -896,7 +898,7 @@ fn analyzeBodyInner(	...	@@ -896,7 +898,7 @@ fn analyzeBodyInner(
896	crash_info.setBodyIndex(i);	898	crash_info.setBodyIndex(i);
897	const inst = body[i];	899	const inst = body[i];
898	std.log.scoped(.sema_zir).debug("sema ZIR {s} %{d}", .{	900	std.log.scoped(.sema_zir).debug("sema ZIR {s} %{d}", .{
899	sema.mod.declPtr(block.src_decl).src_namespace.file_scope.sub_file_path, inst,	901	mod.namespacePtr(mod.declPtr(block.src_decl).src_namespace).file_scope.sub_file_path, inst,
900	});	902	});
901	const air_inst: Air.Inst.Ref = switch (tags[inst]) {	903	const air_inst: Air.Inst.Ref = switch (tags[inst]) {
902	// zig fmt: off	904	// zig fmt: off
...	@@ -1574,7 +1576,6 @@ fn analyzeBodyInner(	...	@@ -1574,7 +1576,6 @@ fn analyzeBodyInner(
1574	},	1576	},
1575	.condbr => blk: {	1577	.condbr => blk: {
1576	if (!block.is_comptime) break sema.zirCondbr(block, inst);	1578	if (!block.is_comptime) break sema.zirCondbr(block, inst);
1577	const mod = sema.mod;
1578	// Same as condbr_inline. TODO https://github.com/ziglang/zig/issues/8220	1579	// Same as condbr_inline. TODO https://github.com/ziglang/zig/issues/8220
1579	const inst_data = datas[inst].pl_node;	1580	const inst_data = datas[inst].pl_node;
1580	const cond_src: LazySrcLoc = .{ .node_offset_if_cond = inst_data.src_node };	1581	const cond_src: LazySrcLoc = .{ .node_offset_if_cond = inst_data.src_node };
...	@@ -1597,7 +1598,6 @@ fn analyzeBodyInner(	...	@@ -1597,7 +1598,6 @@ fn analyzeBodyInner(
1597	}	1598	}
1598	},	1599	},
1599	.condbr_inline => blk: {	1600	.condbr_inline => blk: {
1600	const mod = sema.mod;
1601	const inst_data = datas[inst].pl_node;	1601	const inst_data = datas[inst].pl_node;
1602	const cond_src: LazySrcLoc = .{ .node_offset_if_cond = inst_data.src_node };	1602	const cond_src: LazySrcLoc = .{ .node_offset_if_cond = inst_data.src_node };
1603	const extra = sema.code.extraData(Zir.Inst.CondBr, inst_data.payload_index);	1603	const extra = sema.code.extraData(Zir.Inst.CondBr, inst_data.payload_index);
...	@@ -1622,7 +1622,6 @@ fn analyzeBodyInner(	...	@@ -1622,7 +1622,6 @@ fn analyzeBodyInner(
1622	},	1622	},
1623	.@"try" => blk: {	1623	.@"try" => blk: {
1624	if (!block.is_comptime) break :blk try sema.zirTry(block, inst);	1624	if (!block.is_comptime) break :blk try sema.zirTry(block, inst);
1625	const mod = sema.mod;
1626	const inst_data = sema.code.instructions.items(.data)[inst].pl_node;	1625	const inst_data = sema.code.instructions.items(.data)[inst].pl_node;
1627	const src = inst_data.src();	1626	const src = inst_data.src();
1628	const operand_src: LazySrcLoc = .{ .node_offset_bin_lhs = inst_data.src_node };	1627	const operand_src: LazySrcLoc = .{ .node_offset_bin_lhs = inst_data.src_node };
...	@@ -1632,7 +1631,7 @@ fn analyzeBodyInner(	...	@@ -1632,7 +1631,7 @@ fn analyzeBodyInner(
1632	const err_union_ty = sema.typeOf(err_union);	1631	const err_union_ty = sema.typeOf(err_union);
1633	if (err_union_ty.zigTypeTag(mod) != .ErrorUnion) {	1632	if (err_union_ty.zigTypeTag(mod) != .ErrorUnion) {
1634	return sema.fail(block, operand_src, "expected error union type, found '{}'", .{	1633	return sema.fail(block, operand_src, "expected error union type, found '{}'", .{
1635	err_union_ty.fmt(sema.mod),	1634	err_union_ty.fmt(mod),
1636	});	1635	});
1637	}	1636	}
1638	const is_non_err = try sema.analyzeIsNonErrComptimeOnly(block, operand_src, err_union);	1637	const is_non_err = try sema.analyzeIsNonErrComptimeOnly(block, operand_src, err_union);
...	@@ -1654,7 +1653,6 @@ fn analyzeBodyInner(	...	@@ -1654,7 +1653,6 @@ fn analyzeBodyInner(
1654	},	1653	},
1655	.try_ptr => blk: {	1654	.try_ptr => blk: {
1656	if (!block.is_comptime) break :blk try sema.zirTryPtr(block, inst);	1655	if (!block.is_comptime) break :blk try sema.zirTryPtr(block, inst);
1657	const mod = sema.mod;
1658	const inst_data = sema.code.instructions.items(.data)[inst].pl_node;	1656	const inst_data = sema.code.instructions.items(.data)[inst].pl_node;
1659	const src = inst_data.src();	1657	const src = inst_data.src();
1660	const operand_src: LazySrcLoc = .{ .node_offset_bin_lhs = inst_data.src_node };	1658	const operand_src: LazySrcLoc = .{ .node_offset_bin_lhs = inst_data.src_node };
...	@@ -1713,7 +1711,7 @@ fn analyzeBodyInner(	...	@@ -1713,7 +1711,7 @@ fn analyzeBodyInner(
1713	const noreturn_inst = block.instructions.popOrNull();	1711	const noreturn_inst = block.instructions.popOrNull();
1714	while (dbg_block_begins > 0) {	1712	while (dbg_block_begins > 0) {
1715	dbg_block_begins -= 1;	1713	dbg_block_begins -= 1;
1716	if (block.is_comptime or sema.mod.comp.bin_file.options.strip) continue;	1714	if (block.is_comptime or mod.comp.bin_file.options.strip) continue;
1717		1715
1718	_ = try block.addInst(.{	1716	_ = try block.addInst(.{
1719	.tag = .dbg_block_end,	1717	.tag = .dbg_block_end,
...	@@ -2172,7 +2170,7 @@ fn errNote(	...	@@ -2172,7 +2170,7 @@ fn errNote(
2172	) error{OutOfMemory}!void {	2170	) error{OutOfMemory}!void {
2173	const mod = sema.mod;	2171	const mod = sema.mod;
2174	const src_decl = mod.declPtr(block.src_decl);	2172	const src_decl = mod.declPtr(block.src_decl);
2175	return mod.errNoteNonLazy(src.toSrcLoc(src_decl), parent, format, args);	2173	return mod.errNoteNonLazy(src.toSrcLoc(src_decl, mod), parent, format, args);
2176	}	2174	}
2177		2175
2178	fn addFieldErrNote(	2176	fn addFieldErrNote(
...	@@ -2185,19 +2183,19 @@ fn addFieldErrNote(	...	@@ -2185,19 +2183,19 @@ fn addFieldErrNote(
2185	) !void {	2183	) !void {
2186	@setCold(true);	2184	@setCold(true);
2187	const mod = sema.mod;	2185	const mod = sema.mod;
2188	const decl_index = container_ty.getOwnerDecl();	2186	const decl_index = container_ty.getOwnerDecl(mod);
2189	const decl = mod.declPtr(decl_index);	2187	const decl = mod.declPtr(decl_index);
2190		2188
2191	const field_src = blk: {	2189	const field_src = blk: {
2192	const tree = decl.getFileScope().getTree(sema.gpa) catch \|err\| {	2190	const tree = decl.getFileScope(mod).getTree(sema.gpa) catch \|err\| {
2193	log.err("unable to load AST to report compile error: {s}", .{@errorName(err)});	2191	log.err("unable to load AST to report compile error: {s}", .{@errorName(err)});
2194	break :blk decl.srcLoc();	2192	break :blk decl.srcLoc(mod);
2195	};	2193	};
2196		2194
2197	const container_node = decl.relativeToNodeIndex(0);	2195	const container_node = decl.relativeToNodeIndex(0);
2198	const node_tags = tree.nodes.items(.tag);	2196	const node_tags = tree.nodes.items(.tag);
2199	var buf: [2]std.zig.Ast.Node.Index = undefined;	2197	var buf: [2]std.zig.Ast.Node.Index = undefined;
2200	const container_decl = tree.fullContainerDecl(&buf, container_node) orelse break :blk decl.srcLoc();	2198	const container_decl = tree.fullContainerDecl(&buf, container_node) orelse break :blk decl.srcLoc(mod);
2201		2199
2202	var it_index: usize = 0;	2200	var it_index: usize = 0;
2203	for (container_decl.ast.members) \|member_node\| {	2201	for (container_decl.ast.members) \|member_node\| {
...	@@ -2207,7 +2205,7 @@ fn addFieldErrNote(	...	@@ -2207,7 +2205,7 @@ fn addFieldErrNote(
2207	.container_field,	2205	.container_field,
2208	=> {	2206	=> {
2209	if (it_index == field_index) {	2207	if (it_index == field_index) {
2210	break :blk decl.nodeOffsetSrcLoc(decl.nodeIndexToRelative(member_node));	2208	break :blk decl.nodeOffsetSrcLoc(decl.nodeIndexToRelative(member_node), mod);
2211	}	2209	}
2212	it_index += 1;	2210	it_index += 1;
2213	},	2211	},
...	@@ -2228,7 +2226,7 @@ fn errMsg(	...	@@ -2228,7 +2226,7 @@ fn errMsg(
2228	) error{OutOfMemory}!*Module.ErrorMsg {	2226	) error{OutOfMemory}!*Module.ErrorMsg {
2229	const mod = sema.mod;	2227	const mod = sema.mod;
2230	const src_decl = mod.declPtr(block.src_decl);	2228	const src_decl = mod.declPtr(block.src_decl);
2231	return Module.ErrorMsg.create(sema.gpa, src.toSrcLoc(src_decl), format, args);	2229	return Module.ErrorMsg.create(sema.gpa, src.toSrcLoc(src_decl, mod), format, args);
2232	}	2230	}
2233		2231
2234	pub fn fail(	2232	pub fn fail(
...	@@ -2287,7 +2285,7 @@ fn failWithOwnedErrorMsg(sema: Sema, err_msg: Module.ErrorMsg) CompileError {	...	@@ -2287,7 +2285,7 @@ fn failWithOwnedErrorMsg(sema: Sema, err_msg: Module.ErrorMsg) CompileError {
2287	if (gop.found_existing) break;	2285	if (gop.found_existing) break;
2288	if (cur_reference_trace < max_references) {	2286	if (cur_reference_trace < max_references) {
2289	const decl = sema.mod.declPtr(ref.referencer);	2287	const decl = sema.mod.declPtr(ref.referencer);
2290	try reference_stack.append(.{ .decl = decl.name, .src_loc = ref.src.toSrcLoc(decl) });	2288	try reference_stack.append(.{ .decl = decl.name, .src_loc = ref.src.toSrcLoc(decl, mod) });
2291	}	2289	}
2292	referenced_by = ref.referencer;	2290	referenced_by = ref.referencer;
2293	}	2291	}
...	@@ -2664,7 +2662,7 @@ pub fn analyzeStructDecl(	...	@@ -2664,7 +2662,7 @@ pub fn analyzeStructDecl(
2664	}	2662	}
2665	}	2663	}
2666		2664
2667	_ = try sema.mod.scanNamespace(&struct_obj.namespace, extra_index, decls_len, new_decl);	2665	_ = try sema.mod.scanNamespace(struct_obj.namespace, extra_index, decls_len, new_decl);
2668	}	2666	}
2669		2667
2670	fn zirStructDecl(	2668	fn zirStructDecl(
...	@@ -2702,15 +2700,12 @@ fn zirStructDecl(	...	@@ -2702,15 +2700,12 @@ fn zirStructDecl(
2702	.status = .none,	2700	.status = .none,
2703	.known_non_opv = undefined,	2701	.known_non_opv = undefined,
2704	.is_tuple = small.is_tuple,	2702	.is_tuple = small.is_tuple,
2705	.namespace = .{	2703	.namespace = try mod.createNamespace(.{
2706	.parent = block.namespace,	2704	.parent = block.namespace.toOptional(),
2707	.ty = struct_ty,	2705	.ty = struct_ty,
2708	.file_scope = block.getFileScope(),	2706	.file_scope = block.getFileScope(mod),
2709	},	2707	}),
2710	};	2708	};
2711	std.log.scoped(.module).debug("create struct {} owned by {} ({s})", .{
2712	&struct_obj.namespace, new_decl, new_decl.name,
2713	});
2714	try sema.analyzeStructDecl(new_decl, inst, struct_obj);	2709	try sema.analyzeStructDecl(new_decl, inst, struct_obj);
2715	try new_decl.finalizeNewArena(&new_decl_arena);	2710	try new_decl.finalizeNewArena(&new_decl_arena);
2716	return sema.analyzeDeclVal(block, src, new_decl_index);	2711	return sema.analyzeDeclVal(block, src, new_decl_index);
...	@@ -2887,15 +2882,12 @@ fn zirEnumDecl(	...	@@ -2887,15 +2882,12 @@ fn zirEnumDecl(
2887	.tag_ty_inferred = true,	2882	.tag_ty_inferred = true,
2888	.fields = .{},	2883	.fields = .{},
2889	.values = .{},	2884	.values = .{},
2890	.namespace = .{	2885	.namespace = try mod.createNamespace(.{
2891	.parent = block.namespace,	2886	.parent = block.namespace.toOptional(),
2892	.ty = enum_ty,	2887	.ty = enum_ty,
2893	.file_scope = block.getFileScope(),	2888	.file_scope = block.getFileScope(mod),
2894	},	2889	}),
2895	};	2890	};
2896	std.log.scoped(.module).debug("create enum {} owned by {} ({s})", .{
2897	&enum_obj.namespace, new_decl, new_decl.name,
2898	});
2899		2891
2900	try new_decl.finalizeNewArena(&new_decl_arena);	2892	try new_decl.finalizeNewArena(&new_decl_arena);
2901	const decl_val = try sema.analyzeDeclVal(block, src, new_decl_index);	2893	const decl_val = try sema.analyzeDeclVal(block, src, new_decl_index);
...	@@ -2905,7 +2897,7 @@ fn zirEnumDecl(	...	@@ -2905,7 +2897,7 @@ fn zirEnumDecl(
2905	const decl_arena_allocator = new_decl.value_arena.?.acquire(gpa, &decl_arena);	2897	const decl_arena_allocator = new_decl.value_arena.?.acquire(gpa, &decl_arena);
2906	defer new_decl.value_arena.?.release(&decl_arena);	2898	defer new_decl.value_arena.?.release(&decl_arena);
2907		2899
2908	extra_index = try mod.scanNamespace(&enum_obj.namespace, extra_index, decls_len, new_decl);	2900	extra_index = try mod.scanNamespace(enum_obj.namespace, extra_index, decls_len, new_decl);
2909		2901
2910	const body = sema.code.extra[extra_index..][0..body_len];	2902	const body = sema.code.extra[extra_index..][0..body_len];
2911	extra_index += body.len;	2903	extra_index += body.len;
...	@@ -2944,7 +2936,7 @@ fn zirEnumDecl(	...	@@ -2944,7 +2936,7 @@ fn zirEnumDecl(
2944	.parent = null,	2936	.parent = null,
2945	.sema = sema,	2937	.sema = sema,
2946	.src_decl = new_decl_index,	2938	.src_decl = new_decl_index,
2947	.namespace = &enum_obj.namespace,	2939	.namespace = enum_obj.namespace,
2948	.wip_capture_scope = wip_captures.scope,	2940	.wip_capture_scope = wip_captures.scope,
2949	.instructions = .{},	2941	.instructions = .{},
2950	.inlining = null,	2942	.inlining = null,
...	@@ -3164,17 +3156,14 @@ fn zirUnionDecl(	...	@@ -3164,17 +3156,14 @@ fn zirUnionDecl(
3164	.zir_index = inst,	3156	.zir_index = inst,
3165	.layout = small.layout,	3157	.layout = small.layout,
3166	.status = .none,	3158	.status = .none,
3167	.namespace = .{	3159	.namespace = try mod.createNamespace(.{
3168	.parent = block.namespace,	3160	.parent = block.namespace.toOptional(),
3169	.ty = union_ty,	3161	.ty = union_ty,
3170	.file_scope = block.getFileScope(),	3162	.file_scope = block.getFileScope(mod),
3171	},	3163	}),
3172	};	3164	};
3173	std.log.scoped(.module).debug("create union {} owned by {} ({s})", .{
3174	&union_obj.namespace, new_decl, new_decl.name,
3175	});
3176		3165
3177	_ = try mod.scanNamespace(&union_obj.namespace, extra_index, decls_len, new_decl);	3166	_ = try mod.scanNamespace(union_obj.namespace, extra_index, decls_len, new_decl);
3178		3167
3179	try new_decl.finalizeNewArena(&new_decl_arena);	3168	try new_decl.finalizeNewArena(&new_decl_arena);
3180	return sema.analyzeDeclVal(block, src, new_decl_index);	3169	return sema.analyzeDeclVal(block, src, new_decl_index);
...	@@ -3208,37 +3197,37 @@ fn zirOpaqueDecl(	...	@@ -3208,37 +3197,37 @@ fn zirOpaqueDecl(
3208		3197
3209	var new_decl_arena = std.heap.ArenaAllocator.init(gpa);	3198	var new_decl_arena = std.heap.ArenaAllocator.init(gpa);
3210	errdefer new_decl_arena.deinit();	3199	errdefer new_decl_arena.deinit();
3211	const new_decl_arena_allocator = new_decl_arena.allocator();
3212		3200
3213	const opaque_obj = try new_decl_arena_allocator.create(Module.Opaque);	3201	// Because these three things each reference each other, `undefined`
3214	const opaque_ty_payload = try new_decl_arena_allocator.create(Type.Payload.Opaque);	3202	// placeholders are used in two places before being set after the opaque
3215	opaque_ty_payload.* = .{	3203	// type gains an InternPool index.
3216	.base = .{ .tag = .@"opaque" },	3204
3217	.data = opaque_obj,
3218	};
3219	const opaque_ty = Type.initPayload(&opaque_ty_payload.base);
3220	const opaque_val = try Value.Tag.ty.create(new_decl_arena_allocator, opaque_ty);
3221	const new_decl_index = try sema.createAnonymousDeclTypeNamed(block, src, .{	3205	const new_decl_index = try sema.createAnonymousDeclTypeNamed(block, src, .{
3222	.ty = Type.type,	3206	.ty = Type.type,
3223	.val = opaque_val,	3207	.val = undefined,
3224	}, small.name_strategy, "opaque", inst);	3208	}, small.name_strategy, "opaque", inst);
3225	const new_decl = mod.declPtr(new_decl_index);	3209	const new_decl = mod.declPtr(new_decl_index);
3226	new_decl.owns_tv = true;	3210	new_decl.owns_tv = true;
3227	errdefer mod.abortAnonDecl(new_decl_index);	3211	errdefer mod.abortAnonDecl(new_decl_index);
3228		3212
3229	opaque_obj.* = .{	3213	const new_namespace_index = try mod.createNamespace(.{
3230	.owner_decl = new_decl_index,	3214	.parent = block.namespace.toOptional(),
3231	.namespace = .{	3215	.ty = undefined,
3232	.parent = block.namespace,	3216	.file_scope = block.getFileScope(mod),
3233	.ty = opaque_ty,
3234	.file_scope = block.getFileScope(),
3235	},
3236	};
3237	std.log.scoped(.module).debug("create opaque {} owned by {} ({s})", .{
3238	&opaque_obj.namespace, new_decl, new_decl.name,
3239	});	3217	});
		3218	const new_namespace = mod.namespacePtr(new_namespace_index);
		3219	errdefer @panic("TODO error handling");
		3220
		3221	const opaque_ty = try mod.intern_pool.get(gpa, .{ .opaque_type = .{
		3222	.decl = new_decl_index,
		3223	.namespace = new_namespace_index,
		3224	} });
		3225	errdefer @panic("TODO error handling");
		3226
		3227	new_decl.val = opaque_ty.toValue();
		3228	new_namespace.ty = opaque_ty.toType();
3240		3229
3241	extra_index = try mod.scanNamespace(&opaque_obj.namespace, extra_index, decls_len, new_decl);	3230	extra_index = try mod.scanNamespace(new_namespace_index, extra_index, decls_len, new_decl);
3242		3231
3243	try new_decl.finalizeNewArena(&new_decl_arena);	3232	try new_decl.finalizeNewArena(&new_decl_arena);
3244	return sema.analyzeDeclVal(block, src, new_decl_index);	3233	return sema.analyzeDeclVal(block, src, new_decl_index);
...	@@ -4848,7 +4837,7 @@ fn zirValidateDeref(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileErr	...	@@ -4848,7 +4837,7 @@ fn zirValidateDeref(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileErr
4848	errdefer msg.destroy(sema.gpa);	4837	errdefer msg.destroy(sema.gpa);
4849		4838
4850	const src_decl = sema.mod.declPtr(block.src_decl);	4839	const src_decl = sema.mod.declPtr(block.src_decl);
4851	try sema.explainWhyTypeIsComptime(msg, src.toSrcLoc(src_decl), elem_ty);	4840	try sema.explainWhyTypeIsComptime(msg, src.toSrcLoc(src_decl, mod), elem_ty);
4852	break :msg msg;	4841	break :msg msg;
4853	};	4842	};
4854	return sema.failWithOwnedErrorMsg(msg);	4843	return sema.failWithOwnedErrorMsg(msg);
...	@@ -4870,7 +4859,7 @@ fn failWithBadMemberAccess(	...	@@ -4870,7 +4859,7 @@ fn failWithBadMemberAccess(
4870	.Enum => "enum",	4859	.Enum => "enum",
4871	else => unreachable,	4860	else => unreachable,
4872	};	4861	};
4873	if (agg_ty.getOwnerDeclOrNull()) \|some\| if (sema.mod.declIsRoot(some)) {	4862	if (agg_ty.getOwnerDeclOrNull(mod)) \|some\| if (sema.mod.declIsRoot(some)) {
4874	return sema.fail(block, field_src, "root struct of file '{}' has no member named '{s}'", .{	4863	return sema.fail(block, field_src, "root struct of file '{}' has no member named '{s}'", .{
4875	agg_ty.fmt(sema.mod), field_name,	4864	agg_ty.fmt(sema.mod), field_name,
4876	});	4865	});
...	@@ -5632,7 +5621,7 @@ fn analyzeBlockBody(	...	@@ -5632,7 +5621,7 @@ fn analyzeBlockBody(
5632	try sema.errNote(child_block, runtime_src, msg, "runtime control flow here", .{});	5621	try sema.errNote(child_block, runtime_src, msg, "runtime control flow here", .{});
5633		5622
5634	const child_src_decl = mod.declPtr(child_block.src_decl);	5623	const child_src_decl = mod.declPtr(child_block.src_decl);
5635	try sema.explainWhyTypeIsComptime(msg, type_src.toSrcLoc(child_src_decl), resolved_ty);	5624	try sema.explainWhyTypeIsComptime(msg, type_src.toSrcLoc(child_src_decl, mod), resolved_ty);
5636		5625
5637	break :msg msg;	5626	break :msg msg;
5638	};	5627	};
...	@@ -5703,6 +5692,7 @@ fn zirExport(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!void	...	@@ -5703,6 +5692,7 @@ fn zirExport(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!void
5703	const tracy = trace(@src());	5692	const tracy = trace(@src());
5704	defer tracy.end();	5693	defer tracy.end();
5705		5694
		5695	const mod = sema.mod;
5706	const inst_data = sema.code.instructions.items(.data)[inst].pl_node;	5696	const inst_data = sema.code.instructions.items(.data)[inst].pl_node;
5707	const extra = sema.code.extraData(Zir.Inst.Export, inst_data.payload_index).data;	5697	const extra = sema.code.extraData(Zir.Inst.Export, inst_data.payload_index).data;
5708	const src = inst_data.src();	5698	const src = inst_data.src();
...	@@ -5711,7 +5701,7 @@ fn zirExport(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!void	...	@@ -5711,7 +5701,7 @@ fn zirExport(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!void
5711	const decl_name = sema.code.nullTerminatedString(extra.decl_name);	5701	const decl_name = sema.code.nullTerminatedString(extra.decl_name);
5712	const decl_index = if (extra.namespace != .none) index_blk: {	5702	const decl_index = if (extra.namespace != .none) index_blk: {
5713	const container_ty = try sema.resolveType(block, operand_src, extra.namespace);	5703	const container_ty = try sema.resolveType(block, operand_src, extra.namespace);
5714	const container_namespace = container_ty.getNamespace().?;	5704	const container_namespace = container_ty.getNamespaceIndex(mod).unwrap().?;
5715		5705
5716	const maybe_index = try sema.lookupInNamespace(block, operand_src, container_namespace, decl_name, false);	5706	const maybe_index = try sema.lookupInNamespace(block, operand_src, container_namespace, decl_name, false);
5717	break :index_blk maybe_index orelse	5707	break :index_blk maybe_index orelse
...	@@ -5725,8 +5715,8 @@ fn zirExport(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!void	...	@@ -5725,8 +5715,8 @@ fn zirExport(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!void
5725	else => \|e\| return e,	5715	else => \|e\| return e,
5726	};	5716	};
5727	{	5717	{
5728	try sema.mod.ensureDeclAnalyzed(decl_index);	5718	try mod.ensureDeclAnalyzed(decl_index);
5729	const exported_decl = sema.mod.declPtr(decl_index);	5719	const exported_decl = mod.declPtr(decl_index);
5730	if (exported_decl.val.castTag(.function)) \|some\| {	5720	if (exported_decl.val.castTag(.function)) \|some\| {
5731	return sema.analyzeExport(block, src, options, some.data.owner_decl);	5721	return sema.analyzeExport(block, src, options, some.data.owner_decl);
5732	}	5722	}
...	@@ -5789,7 +5779,7 @@ pub fn analyzeExport(	...	@@ -5789,7 +5779,7 @@ pub fn analyzeExport(
5789	errdefer msg.destroy(sema.gpa);	5779	errdefer msg.destroy(sema.gpa);
5790		5780
5791	const src_decl = sema.mod.declPtr(block.src_decl);	5781	const src_decl = sema.mod.declPtr(block.src_decl);
5792	try sema.explainWhyTypeIsNotExtern(msg, src.toSrcLoc(src_decl), exported_decl.ty, .other);	5782	try sema.explainWhyTypeIsNotExtern(msg, src.toSrcLoc(src_decl, mod), exported_decl.ty, .other);
5793		5783
5794	try sema.addDeclaredHereNote(msg, exported_decl.ty);	5784	try sema.addDeclaredHereNote(msg, exported_decl.ty);
5795	break :msg msg;	5785	break :msg msg;
...	@@ -6075,12 +6065,13 @@ fn zirDeclVal(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air	...	@@ -6075,12 +6065,13 @@ fn zirDeclVal(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air
6075	}	6065	}
6076		6066
6077	fn lookupIdentifier(sema: Sema, block: Block, src: LazySrcLoc, name: []const u8) !Decl.Index {	6067	fn lookupIdentifier(sema: Sema, block: Block, src: LazySrcLoc, name: []const u8) !Decl.Index {
		6068	const mod = sema.mod;
6078	var namespace = block.namespace;	6069	var namespace = block.namespace;
6079	while (true) {	6070	while (true) {
6080	if (try sema.lookupInNamespace(block, src, namespace, name, false)) \|decl_index\| {	6071	if (try sema.lookupInNamespace(block, src, namespace, name, false)) \|decl_index\| {
6081	return decl_index;	6072	return decl_index;
6082	}	6073	}
6083	namespace = namespace.parent orelse break;	6074	namespace = mod.namespacePtr(namespace).parent.unwrap() orelse break;
6084	}	6075	}
6085	unreachable; // AstGen detects use of undeclared identifier errors.	6076	unreachable; // AstGen detects use of undeclared identifier errors.
6086	}	6077	}
...	@@ -6091,13 +6082,14 @@ fn lookupInNamespace(	...	@@ -6091,13 +6082,14 @@ fn lookupInNamespace(
6091	sema: *Sema,	6082	sema: *Sema,
6092	block: *Block,	6083	block: *Block,
6093	src: LazySrcLoc,	6084	src: LazySrcLoc,
6094	namespace: *Namespace,	6085	namespace_index: Namespace.Index,
6095	ident_name: []const u8,	6086	ident_name: []const u8,
6096	observe_usingnamespace: bool,	6087	observe_usingnamespace: bool,
6097	) CompileError!?Decl.Index {	6088	) CompileError!?Decl.Index {
6098	const mod = sema.mod;	6089	const mod = sema.mod;
6099		6090
6100	const namespace_decl_index = namespace.getDeclIndex();	6091	const namespace = mod.namespacePtr(namespace_index);
		6092	const namespace_decl_index = namespace.getDeclIndex(mod);
6101	const namespace_decl = sema.mod.declPtr(namespace_decl_index);	6093	const namespace_decl = sema.mod.declPtr(namespace_decl_index);
6102	if (namespace_decl.analysis == .file_failure) {	6094	if (namespace_decl.analysis == .file_failure) {
6103	try mod.declareDeclDependency(sema.owner_decl_index, namespace_decl_index);	6095	try mod.declareDeclDependency(sema.owner_decl_index, namespace_decl_index);
...	@@ -6105,7 +6097,7 @@ fn lookupInNamespace(	...	@@ -6105,7 +6097,7 @@ fn lookupInNamespace(
6105	}	6097	}
6106		6098
6107	if (observe_usingnamespace and namespace.usingnamespace_set.count() != 0) {	6099	if (observe_usingnamespace and namespace.usingnamespace_set.count() != 0) {
6108	const src_file = block.namespace.file_scope;	6100	const src_file = mod.namespacePtr(block.namespace).file_scope;
6109		6101
6110	const gpa = sema.gpa;	6102	const gpa = sema.gpa;
6111	var checked_namespaces: std.AutoArrayHashMapUnmanaged(*Namespace, bool) = .{};	6103	var checked_namespaces: std.AutoArrayHashMapUnmanaged(*Namespace, bool) = .{};
...	@@ -6124,7 +6116,7 @@ fn lookupInNamespace(	...	@@ -6124,7 +6116,7 @@ fn lookupInNamespace(
6124	// Skip decls which are not marked pub, which are in a different	6116	// Skip decls which are not marked pub, which are in a different
6125	// file than the `a.b`/`@hasDecl` syntax.	6117	// file than the `a.b`/`@hasDecl` syntax.
6126	const decl = mod.declPtr(decl_index);	6118	const decl = mod.declPtr(decl_index);
6127	if (decl.is_pub or (src_file == decl.getFileScope() and checked_namespaces.values()[check_i])) {	6119	if (decl.is_pub or (src_file == decl.getFileScope(mod) and checked_namespaces.values()[check_i])) {
6128	try candidates.append(gpa, decl_index);	6120	try candidates.append(gpa, decl_index);
6129	}	6121	}
6130	}	6122	}
...	@@ -6135,15 +6127,15 @@ fn lookupInNamespace(	...	@@ -6135,15 +6127,15 @@ fn lookupInNamespace(
6135	if (sub_usingnamespace_decl_index == sema.owner_decl_index) continue;	6127	if (sub_usingnamespace_decl_index == sema.owner_decl_index) continue;
6136	const sub_usingnamespace_decl = mod.declPtr(sub_usingnamespace_decl_index);	6128	const sub_usingnamespace_decl = mod.declPtr(sub_usingnamespace_decl_index);
6137	const sub_is_pub = entry.value_ptr.*;	6129	const sub_is_pub = entry.value_ptr.*;
6138	if (!sub_is_pub and src_file != sub_usingnamespace_decl.getFileScope()) {	6130	if (!sub_is_pub and src_file != sub_usingnamespace_decl.getFileScope(mod)) {
6139	// Skip usingnamespace decls which are not marked pub, which are in	6131	// Skip usingnamespace decls which are not marked pub, which are in
6140	// a different file than the `a.b`/`@hasDecl` syntax.	6132	// a different file than the `a.b`/`@hasDecl` syntax.
6141	continue;	6133	continue;
6142	}	6134	}
6143	try sema.ensureDeclAnalyzed(sub_usingnamespace_decl_index);	6135	try sema.ensureDeclAnalyzed(sub_usingnamespace_decl_index);
6144	const ns_ty = sub_usingnamespace_decl.val.castTag(.ty).?.data;	6136	const ns_ty = sub_usingnamespace_decl.val.castTag(.ty).?.data;
6145	const sub_ns = ns_ty.getNamespace().?;	6137	const sub_ns = ns_ty.getNamespace(mod).?;
6146	try checked_namespaces.put(gpa, sub_ns, src_file == sub_usingnamespace_decl.getFileScope());	6138	try checked_namespaces.put(gpa, sub_ns, src_file == sub_usingnamespace_decl.getFileScope(mod));
6147	}	6139	}
6148	}	6140	}
6149		6141
...	@@ -6171,7 +6163,7 @@ fn lookupInNamespace(	...	@@ -6171,7 +6163,7 @@ fn lookupInNamespace(
6171	errdefer msg.destroy(gpa);	6163	errdefer msg.destroy(gpa);
6172	for (candidates.items) \|candidate_index\| {	6164	for (candidates.items) \|candidate_index\| {
6173	const candidate = mod.declPtr(candidate_index);	6165	const candidate = mod.declPtr(candidate_index);
6174	const src_loc = candidate.srcLoc();	6166	const src_loc = candidate.srcLoc(mod);
6175	try mod.errNoteNonLazy(src_loc, msg, "declared here", .{});	6167	try mod.errNoteNonLazy(src_loc, msg, "declared here", .{});
6176	}	6168	}
6177	break :msg msg;	6169	break :msg msg;
...	@@ -6532,7 +6524,7 @@ fn checkCallArgumentCount(	...	@@ -6532,7 +6524,7 @@ fn checkCallArgumentCount(
6532	);	6524	);
6533	errdefer msg.destroy(sema.gpa);	6525	errdefer msg.destroy(sema.gpa);
6534		6526
6535	if (maybe_decl) \|fn_decl\| try sema.mod.errNoteNonLazy(fn_decl.srcLoc(), msg, "function declared here", .{});	6527	if (maybe_decl) \|fn_decl\| try sema.mod.errNoteNonLazy(fn_decl.srcLoc(mod), msg, "function declared here", .{});
6536	break :msg msg;	6528	break :msg msg;
6537	};	6529	};
6538	return sema.failWithOwnedErrorMsg(msg);	6530	return sema.failWithOwnedErrorMsg(msg);
...	@@ -6669,7 +6661,7 @@ fn analyzeCall(	...	@@ -6669,7 +6661,7 @@ fn analyzeCall(
6669	);	6661	);
6670	errdefer msg.destroy(sema.gpa);	6662	errdefer msg.destroy(sema.gpa);
6671		6663
6672	if (maybe_decl) \|fn_decl\| try sema.mod.errNoteNonLazy(fn_decl.srcLoc(), msg, "function declared here", .{});	6664	if (maybe_decl) \|fn_decl\| try sema.mod.errNoteNonLazy(fn_decl.srcLoc(mod), msg, "function declared here", .{});
6673	break :msg msg;	6665	break :msg msg;
6674	};	6666	};
6675	return sema.failWithOwnedErrorMsg(msg);	6667	return sema.failWithOwnedErrorMsg(msg);
...	@@ -6811,7 +6803,7 @@ fn analyzeCall(	...	@@ -6811,7 +6803,7 @@ fn analyzeCall(
6811	// than create a child one.	6803	// than create a child one.
6812	const parent_zir = sema.code;	6804	const parent_zir = sema.code;
6813	const fn_owner_decl = mod.declPtr(module_fn.owner_decl);	6805	const fn_owner_decl = mod.declPtr(module_fn.owner_decl);
6814	sema.code = fn_owner_decl.getFileScope().zir;	6806	sema.code = fn_owner_decl.getFileScope(mod).zir;
6815	defer sema.code = parent_zir;	6807	defer sema.code = parent_zir;
6816		6808
6817	try mod.declareDeclDependencyType(sema.owner_decl_index, module_fn.owner_decl, .function_body);	6809	try mod.declareDeclDependencyType(sema.owner_decl_index, module_fn.owner_decl, .function_body);
...	@@ -6911,7 +6903,7 @@ fn analyzeCall(	...	@@ -6911,7 +6903,7 @@ fn analyzeCall(
6911	try sema.analyzeInlineCallArg(	6903	try sema.analyzeInlineCallArg(
6912	block,	6904	block,
6913	&child_block,	6905	&child_block,
6914	Module.argSrc(call_src.node_offset.x, sema.gpa, decl, arg_i, bound_arg_src),	6906	mod.argSrc(call_src.node_offset.x, decl, arg_i, bound_arg_src),
6915	inst,	6907	inst,
6916	new_fn_info,	6908	new_fn_info,
6917	&arg_i,	6909	&arg_i,
...	@@ -7098,7 +7090,7 @@ fn analyzeCall(	...	@@ -7098,7 +7090,7 @@ fn analyzeCall(
7098	const decl = sema.mod.declPtr(block.src_decl);	7090	const decl = sema.mod.declPtr(block.src_decl);
7099	_ = try sema.analyzeCallArg(	7091	_ = try sema.analyzeCallArg(
7100	block,	7092	block,
7101	Module.argSrc(call_src.node_offset.x, sema.gpa, decl, i, bound_arg_src),	7093	mod.argSrc(call_src.node_offset.x, decl, i, bound_arg_src),
7102	param_ty,	7094	param_ty,
7103	uncasted_arg,	7095	uncasted_arg,
7104	opts,	7096	opts,
...	@@ -7114,7 +7106,7 @@ fn analyzeCall(	...	@@ -7114,7 +7106,7 @@ fn analyzeCall(
7114	_ = try sema.coerceVarArgParam(	7106	_ = try sema.coerceVarArgParam(
7115	block,	7107	block,
7116	uncasted_arg,	7108	uncasted_arg,
7117	Module.argSrc(call_src.node_offset.x, sema.gpa, decl, i, bound_arg_src),	7109	mod.argSrc(call_src.node_offset.x, decl, i, bound_arg_src),
7118	);	7110	);
7119	unreachable;	7111	unreachable;
7120	},	7112	},
...	@@ -7406,7 +7398,8 @@ fn instantiateGenericCall(	...	@@ -7406,7 +7398,8 @@ fn instantiateGenericCall(
7406	// can match against `uncasted_args` rather than doing the work below to create a	7398	// can match against `uncasted_args` rather than doing the work below to create a
7407	// generic Scope only to junk it if it matches an existing instantiation.	7399	// generic Scope only to junk it if it matches an existing instantiation.
7408	const fn_owner_decl = mod.declPtr(module_fn.owner_decl);	7400	const fn_owner_decl = mod.declPtr(module_fn.owner_decl);
7409	const namespace = fn_owner_decl.src_namespace;	7401	const namespace_index = fn_owner_decl.src_namespace;
		7402	const namespace = mod.namespacePtr(namespace_index);
7410	const fn_zir = namespace.file_scope.zir;	7403	const fn_zir = namespace.file_scope.zir;
7411	const fn_info = fn_zir.getFnInfo(module_fn.zir_body_inst);	7404	const fn_info = fn_zir.getFnInfo(module_fn.zir_body_inst);
7412	const zir_tags = fn_zir.instructions.items(.tag);	7405	const zir_tags = fn_zir.instructions.items(.tag);
...	@@ -7456,7 +7449,7 @@ fn instantiateGenericCall(	...	@@ -7456,7 +7449,7 @@ fn instantiateGenericCall(
7456	const arg_val = sema.analyzeGenericCallArgVal(block, .unneeded, uncasted_args[i]) catch \|err\| switch (err) {	7449	const arg_val = sema.analyzeGenericCallArgVal(block, .unneeded, uncasted_args[i]) catch \|err\| switch (err) {
7457	error.NeededSourceLocation => {	7450	error.NeededSourceLocation => {
7458	const decl = sema.mod.declPtr(block.src_decl);	7451	const decl = sema.mod.declPtr(block.src_decl);
7459	const arg_src = Module.argSrc(call_src.node_offset.x, sema.gpa, decl, i, bound_arg_src);	7452	const arg_src = mod.argSrc(call_src.node_offset.x, decl, i, bound_arg_src);
7460	_ = try sema.analyzeGenericCallArgVal(block, arg_src, uncasted_args[i]);	7453	_ = try sema.analyzeGenericCallArgVal(block, arg_src, uncasted_args[i]);
7461	unreachable;	7454	unreachable;
7462	},	7455	},
...	@@ -7519,9 +7512,9 @@ fn instantiateGenericCall(	...	@@ -7519,9 +7512,9 @@ fn instantiateGenericCall(
7519	try namespace.anon_decls.ensureUnusedCapacity(gpa, 1);	7512	try namespace.anon_decls.ensureUnusedCapacity(gpa, 1);
7520		7513
7521	// Create a Decl for the new function.	7514	// Create a Decl for the new function.
7522	const src_decl_index = namespace.getDeclIndex();	7515	const src_decl_index = namespace.getDeclIndex(mod);
7523	const src_decl = mod.declPtr(src_decl_index);	7516	const src_decl = mod.declPtr(src_decl_index);
7524	const new_decl_index = try mod.allocateNewDecl(namespace, fn_owner_decl.src_node, src_decl.src_scope);	7517	const new_decl_index = try mod.allocateNewDecl(namespace_index, fn_owner_decl.src_node, src_decl.src_scope);
7525	const new_decl = mod.declPtr(new_decl_index);	7518	const new_decl = mod.declPtr(new_decl_index);
7526	// TODO better names for generic function instantiations	7519	// TODO better names for generic function instantiations
7527	const decl_name = try std.fmt.allocPrintZ(gpa, "{s}__anon_{d}", .{	7520	const decl_name = try std.fmt.allocPrintZ(gpa, "{s}__anon_{d}", .{
...	@@ -7559,7 +7552,7 @@ fn instantiateGenericCall(	...	@@ -7559,7 +7552,7 @@ fn instantiateGenericCall(
7559	uncasted_args,	7552	uncasted_args,
7560	module_fn,	7553	module_fn,
7561	new_module_func,	7554	new_module_func,
7562	namespace,	7555	namespace_index,
7563	func_ty_info,	7556	func_ty_info,
7564	call_src,	7557	call_src,
7565	bound_arg_src,	7558	bound_arg_src,
...	@@ -7631,7 +7624,7 @@ fn instantiateGenericCall(	...	@@ -7631,7 +7624,7 @@ fn instantiateGenericCall(
7631	const decl = sema.mod.declPtr(block.src_decl);	7624	const decl = sema.mod.declPtr(block.src_decl);
7632	_ = try sema.analyzeGenericCallArg(	7625	_ = try sema.analyzeGenericCallArg(
7633	block,	7626	block,
7634	Module.argSrc(call_src.node_offset.x, sema.gpa, decl, total_i, bound_arg_src),	7627	mod.argSrc(call_src.node_offset.x, decl, total_i, bound_arg_src),
7635	uncasted_args[total_i],	7628	uncasted_args[total_i],
7636	comptime_args[total_i],	7629	comptime_args[total_i],
7637	runtime_args,	7630	runtime_args,
...	@@ -7692,7 +7685,7 @@ fn resolveGenericInstantiationType(	...	@@ -7692,7 +7685,7 @@ fn resolveGenericInstantiationType(
7692	uncasted_args: []const Air.Inst.Ref,	7685	uncasted_args: []const Air.Inst.Ref,
7693	module_fn: *Module.Fn,	7686	module_fn: *Module.Fn,
7694	new_module_func: *Module.Fn,	7687	new_module_func: *Module.Fn,
7695	namespace: *Namespace,	7688	namespace: Namespace.Index,
7696	func_ty_info: Type.Payload.Function.Data,	7689	func_ty_info: Type.Payload.Function.Data,
7697	call_src: LazySrcLoc,	7690	call_src: LazySrcLoc,
7698	bound_arg_src: ?LazySrcLoc,	7691	bound_arg_src: ?LazySrcLoc,
...	@@ -7779,7 +7772,7 @@ fn resolveGenericInstantiationType(	...	@@ -7779,7 +7772,7 @@ fn resolveGenericInstantiationType(
7779	const arg_val = sema.resolveConstValue(block, .unneeded, arg, "") catch \|err\| switch (err) {	7772	const arg_val = sema.resolveConstValue(block, .unneeded, arg, "") catch \|err\| switch (err) {
7780	error.NeededSourceLocation => {	7773	error.NeededSourceLocation => {
7781	const decl = sema.mod.declPtr(block.src_decl);	7774	const decl = sema.mod.declPtr(block.src_decl);
7782	const arg_src = Module.argSrc(call_src.node_offset.x, sema.gpa, decl, arg_i, bound_arg_src);	7775	const arg_src = mod.argSrc(call_src.node_offset.x, decl, arg_i, bound_arg_src);
7783	_ = try sema.resolveConstValue(block, arg_src, arg, "argument to parameter with comptime-only type must be comptime-known");	7776	_ = try sema.resolveConstValue(block, arg_src, arg, "argument to parameter with comptime-only type must be comptime-known");
7784	unreachable;	7777	unreachable;
7785	},	7778	},
...	@@ -8987,7 +8980,7 @@ fn funcCommon(	...	@@ -8987,7 +8980,7 @@ fn funcCommon(
8987	const decl = sema.mod.declPtr(block.src_decl);	8980	const decl = sema.mod.declPtr(block.src_decl);
8988	try sema.analyzeParameter(	8981	try sema.analyzeParameter(
8989	block,	8982	block,
8990	Module.paramSrc(src_node_offset, sema.gpa, decl, i),	8983	Module.paramSrc(src_node_offset, mod, decl, i),
8991	param,	8984	param,
8992	comptime_params,	8985	comptime_params,
8993	i,	8986	i,
...	@@ -9050,7 +9043,7 @@ fn funcCommon(	...	@@ -9050,7 +9043,7 @@ fn funcCommon(
9050	errdefer msg.destroy(sema.gpa);	9043	errdefer msg.destroy(sema.gpa);
9051		9044
9052	const src_decl = sema.mod.declPtr(block.src_decl);	9045	const src_decl = sema.mod.declPtr(block.src_decl);
9053	try sema.explainWhyTypeIsNotExtern(msg, ret_ty_src.toSrcLoc(src_decl), return_type, .ret_ty);	9046	try sema.explainWhyTypeIsNotExtern(msg, ret_ty_src.toSrcLoc(src_decl, mod), return_type, .ret_ty);
9054		9047
9055	try sema.addDeclaredHereNote(msg, return_type);	9048	try sema.addDeclaredHereNote(msg, return_type);
9056	break :msg msg;	9049	break :msg msg;
...	@@ -9070,7 +9063,7 @@ fn funcCommon(	...	@@ -9070,7 +9063,7 @@ fn funcCommon(
9070	"function with comptime-only return type '{}' requires all parameters to be comptime",	9063	"function with comptime-only return type '{}' requires all parameters to be comptime",
9071	.{return_type.fmt(sema.mod)},	9064	.{return_type.fmt(sema.mod)},
9072	);	9065	);
9073	try sema.explainWhyTypeIsComptime(msg, ret_ty_src.toSrcLoc(sema.owner_decl), return_type);	9066	try sema.explainWhyTypeIsComptime(msg, ret_ty_src.toSrcLoc(sema.owner_decl, mod), return_type);
9074		9067
9075	const tags = sema.code.instructions.items(.tag);	9068	const tags = sema.code.instructions.items(.tag);
9076	const data = sema.code.instructions.items(.data);	9069	const data = sema.code.instructions.items(.data);
...	@@ -9278,7 +9271,7 @@ fn analyzeParameter(	...	@@ -9278,7 +9271,7 @@ fn analyzeParameter(
9278	errdefer msg.destroy(sema.gpa);	9271	errdefer msg.destroy(sema.gpa);
9279		9272
9280	const src_decl = mod.declPtr(block.src_decl);	9273	const src_decl = mod.declPtr(block.src_decl);
9281	try sema.explainWhyTypeIsNotExtern(msg, param_src.toSrcLoc(src_decl), param.ty, .param_ty);	9274	try sema.explainWhyTypeIsNotExtern(msg, param_src.toSrcLoc(src_decl, mod), param.ty, .param_ty);
9282		9275
9283	try sema.addDeclaredHereNote(msg, param.ty);	9276	try sema.addDeclaredHereNote(msg, param.ty);
9284	break :msg msg;	9277	break :msg msg;
...	@@ -9293,7 +9286,7 @@ fn analyzeParameter(	...	@@ -9293,7 +9286,7 @@ fn analyzeParameter(
9293	errdefer msg.destroy(sema.gpa);	9286	errdefer msg.destroy(sema.gpa);
9294		9287
9295	const src_decl = mod.declPtr(block.src_decl);	9288	const src_decl = mod.declPtr(block.src_decl);
9296	try sema.explainWhyTypeIsComptime(msg, param_src.toSrcLoc(src_decl), param.ty);	9289	try sema.explainWhyTypeIsComptime(msg, param_src.toSrcLoc(src_decl, mod), param.ty);
9297		9290
9298	try sema.addDeclaredHereNote(msg, param.ty);	9291	try sema.addDeclaredHereNote(msg, param.ty);
9299	break :msg msg;	9292	break :msg msg;
...	@@ -10233,15 +10226,15 @@ fn zirSwitchCapture(	...	@@ -10233,15 +10226,15 @@ fn zirSwitchCapture(
10233	if (!field.ty.eql(first_field.ty, sema.mod)) {	10226	if (!field.ty.eql(first_field.ty, sema.mod)) {
10234	const msg = msg: {	10227	const msg = msg: {
10235	const raw_capture_src = Module.SwitchProngSrc{ .multi_capture = capture_info.prong_index };	10228	const raw_capture_src = Module.SwitchProngSrc{ .multi_capture = capture_info.prong_index };
10236	const capture_src = raw_capture_src.resolve(sema.gpa, sema.mod.declPtr(block.src_decl), switch_info.src_node, .first);	10229	const capture_src = raw_capture_src.resolve(mod, sema.mod.declPtr(block.src_decl), switch_info.src_node, .first);
10237		10230
10238	const msg = try sema.errMsg(block, capture_src, "capture group with incompatible types", .{});	10231	const msg = try sema.errMsg(block, capture_src, "capture group with incompatible types", .{});
10239	errdefer msg.destroy(sema.gpa);	10232	errdefer msg.destroy(sema.gpa);
10240		10233
10241	const raw_first_item_src = Module.SwitchProngSrc{ .multi = .{ .prong = capture_info.prong_index, .item = 0 } };	10234	const raw_first_item_src = Module.SwitchProngSrc{ .multi = .{ .prong = capture_info.prong_index, .item = 0 } };
10242	const first_item_src = raw_first_item_src.resolve(sema.gpa, sema.mod.declPtr(block.src_decl), switch_info.src_node, .first);	10235	const first_item_src = raw_first_item_src.resolve(mod, sema.mod.declPtr(block.src_decl), switch_info.src_node, .first);
10243	const raw_item_src = Module.SwitchProngSrc{ .multi = .{ .prong = capture_info.prong_index, .item = 1 + @intCast(u32, i) } };	10236	const raw_item_src = Module.SwitchProngSrc{ .multi = .{ .prong = capture_info.prong_index, .item = 1 + @intCast(u32, i) } };
10244	const item_src = raw_item_src.resolve(sema.gpa, sema.mod.declPtr(block.src_decl), switch_info.src_node, .first);	10237	const item_src = raw_item_src.resolve(mod, sema.mod.declPtr(block.src_decl), switch_info.src_node, .first);
10245	try sema.errNote(block, first_item_src, msg, "type '{}' here", .{first_field.ty.fmt(sema.mod)});	10238	try sema.errNote(block, first_item_src, msg, "type '{}' here", .{first_field.ty.fmt(sema.mod)});
10246	try sema.errNote(block, item_src, msg, "type '{}' here", .{field.ty.fmt(sema.mod)});	10239	try sema.errNote(block, item_src, msg, "type '{}' here", .{field.ty.fmt(sema.mod)});
10247	break :msg msg;	10240	break :msg msg;
...	@@ -11265,7 +11258,7 @@ fn zirSwitchBlock(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError	...	@@ -11265,7 +11258,7 @@ fn zirSwitchBlock(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError
11265	error.NeededSourceLocation => {	11258	error.NeededSourceLocation => {
11266	const case_src = Module.SwitchProngSrc{ .range = .{ .prong = multi_i, .item = range_i } };	11259	const case_src = Module.SwitchProngSrc{ .range = .{ .prong = multi_i, .item = range_i } };
11267	const decl = mod.declPtr(case_block.src_decl);	11260	const decl = mod.declPtr(case_block.src_decl);
11268	try sema.emitBackwardBranch(block, case_src.resolve(sema.gpa, decl, src_node_offset, .none));	11261	try sema.emitBackwardBranch(block, case_src.resolve(mod, decl, src_node_offset, .none));
11269	unreachable;	11262	unreachable;
11270	},	11263	},
11271	else => return err,	11264	else => return err,
...	@@ -11301,7 +11294,7 @@ fn zirSwitchBlock(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError	...	@@ -11301,7 +11294,7 @@ fn zirSwitchBlock(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError
11301	error.NeededSourceLocation => {	11294	error.NeededSourceLocation => {
11302	const case_src = Module.SwitchProngSrc{ .multi = .{ .prong = multi_i, .item = @intCast(u32, item_i) } };	11295	const case_src = Module.SwitchProngSrc{ .multi = .{ .prong = multi_i, .item = @intCast(u32, item_i) } };
11303	const decl = mod.declPtr(case_block.src_decl);	11296	const decl = mod.declPtr(case_block.src_decl);
11304	try sema.emitBackwardBranch(block, case_src.resolve(sema.gpa, decl, src_node_offset, .none));	11297	try sema.emitBackwardBranch(block, case_src.resolve(mod, decl, src_node_offset, .none));
11305	unreachable;	11298	unreachable;
11306	},	11299	},
11307	else => return err,	11300	else => return err,
...	@@ -11724,6 +11717,7 @@ fn resolveSwitchItemVal(	...	@@ -11724,6 +11717,7 @@ fn resolveSwitchItemVal(
11724	switch_prong_src: Module.SwitchProngSrc,	11717	switch_prong_src: Module.SwitchProngSrc,
11725	range_expand: Module.SwitchProngSrc.RangeExpand,	11718	range_expand: Module.SwitchProngSrc.RangeExpand,
11726	) CompileError!TypedValue {	11719	) CompileError!TypedValue {
		11720	const mod = sema.mod;
11727	const item = try sema.resolveInst(item_ref);	11721	const item = try sema.resolveInst(item_ref);
11728	const item_ty = sema.typeOf(item);	11722	const item_ty = sema.typeOf(item);
11729	// Constructing a LazySrcLoc is costly because we only have the switch AST node.	11723	// Constructing a LazySrcLoc is costly because we only have the switch AST node.
...	@@ -11734,7 +11728,7 @@ fn resolveSwitchItemVal(	...	@@ -11734,7 +11728,7 @@ fn resolveSwitchItemVal(
11734	return TypedValue{ .ty = item_ty, .val = val };	11728	return TypedValue{ .ty = item_ty, .val = val };
11735	} else \|err\| switch (err) {	11729	} else \|err\| switch (err) {
11736	error.NeededSourceLocation => {	11730	error.NeededSourceLocation => {
11737	const src = switch_prong_src.resolve(sema.gpa, sema.mod.declPtr(block.src_decl), switch_node_offset, range_expand);	11731	const src = switch_prong_src.resolve(mod, sema.mod.declPtr(block.src_decl), switch_node_offset, range_expand);
11738	_ = try sema.resolveConstValue(block, src, item, "switch prong values must be comptime-known");	11732	_ = try sema.resolveConstValue(block, src, item, "switch prong values must be comptime-known");
11739	unreachable;	11733	unreachable;
11740	},	11734	},
...	@@ -11752,10 +11746,11 @@ fn validateSwitchRange(	...	@@ -11752,10 +11746,11 @@ fn validateSwitchRange(
11752	src_node_offset: i32,	11746	src_node_offset: i32,
11753	switch_prong_src: Module.SwitchProngSrc,	11747	switch_prong_src: Module.SwitchProngSrc,
11754	) CompileError!void {	11748	) CompileError!void {
		11749	const mod = sema.mod;
11755	const first_val = (try sema.resolveSwitchItemVal(block, first_ref, src_node_offset, switch_prong_src, .first)).val;	11750	const first_val = (try sema.resolveSwitchItemVal(block, first_ref, src_node_offset, switch_prong_src, .first)).val;
11756	const last_val = (try sema.resolveSwitchItemVal(block, last_ref, src_node_offset, switch_prong_src, .last)).val;	11751	const last_val = (try sema.resolveSwitchItemVal(block, last_ref, src_node_offset, switch_prong_src, .last)).val;
11757	if (first_val.compareScalar(.gt, last_val, operand_ty, sema.mod)) {	11752	if (first_val.compareScalar(.gt, last_val, operand_ty, mod)) {
11758	const src = switch_prong_src.resolve(sema.gpa, sema.mod.declPtr(block.src_decl), src_node_offset, .first);	11753	const src = switch_prong_src.resolve(mod, mod.declPtr(block.src_decl), src_node_offset, .first);
11759	return sema.fail(block, src, "range start value is greater than the end value", .{});	11754	return sema.fail(block, src, "range start value is greater than the end value", .{});
11760	}	11755	}
11761	const maybe_prev_src = try range_set.add(first_val, last_val, operand_ty, switch_prong_src);	11756	const maybe_prev_src = try range_set.add(first_val, last_val, operand_ty, switch_prong_src);
...	@@ -11821,10 +11816,10 @@ fn validateSwitchDupe(	...	@@ -11821,10 +11816,10 @@ fn validateSwitchDupe(
11821	src_node_offset: i32,	11816	src_node_offset: i32,
11822	) CompileError!void {	11817	) CompileError!void {
11823	const prev_prong_src = maybe_prev_src orelse return;	11818	const prev_prong_src = maybe_prev_src orelse return;
11824	const gpa = sema.gpa;	11819	const mod = sema.mod;
11825	const block_src_decl = sema.mod.declPtr(block.src_decl);	11820	const block_src_decl = sema.mod.declPtr(block.src_decl);
11826	const src = switch_prong_src.resolve(gpa, block_src_decl, src_node_offset, .none);	11821	const src = switch_prong_src.resolve(mod, block_src_decl, src_node_offset, .none);
11827	const prev_src = prev_prong_src.resolve(gpa, block_src_decl, src_node_offset, .none);	11822	const prev_src = prev_prong_src.resolve(mod, block_src_decl, src_node_offset, .none);
11828	const msg = msg: {	11823	const msg = msg: {
11829	const msg = try sema.errMsg(	11824	const msg = try sema.errMsg(
11830	block,	11825	block,
...	@@ -11863,7 +11858,7 @@ fn validateSwitchItemBool(	...	@@ -11863,7 +11858,7 @@ fn validateSwitchItemBool(
11863	}	11858	}
11864	if (true_count.* + false_count.* > 2) {	11859	if (true_count.* + false_count.* > 2) {
11865	const block_src_decl = sema.mod.declPtr(block.src_decl);	11860	const block_src_decl = sema.mod.declPtr(block.src_decl);
11866	const src = switch_prong_src.resolve(sema.gpa, block_src_decl, src_node_offset, .none);	11861	const src = switch_prong_src.resolve(mod, block_src_decl, src_node_offset, .none);
11867	return sema.fail(block, src, "duplicate switch value", .{});	11862	return sema.fail(block, src, "duplicate switch value", .{});
11868	}	11863	}
11869	}	11864	}
...	@@ -12068,6 +12063,7 @@ fn zirHasField(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -12068,6 +12063,7 @@ fn zirHasField(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
12068	}	12063	}
12069		12064
12070	fn zirHasDecl(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {	12065	fn zirHasDecl(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {
		12066	const mod = sema.mod;
12071	const inst_data = sema.code.instructions.items(.data)[inst].pl_node;	12067	const inst_data = sema.code.instructions.items(.data)[inst].pl_node;
12072	const extra = sema.code.extraData(Zir.Inst.Bin, inst_data.payload_index).data;	12068	const extra = sema.code.extraData(Zir.Inst.Bin, inst_data.payload_index).data;
12073	const src = inst_data.src();	12069	const src = inst_data.src();
...	@@ -12078,10 +12074,11 @@ fn zirHasDecl(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air	...	@@ -12078,10 +12074,11 @@ fn zirHasDecl(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air
12078		12074
12079	try sema.checkNamespaceType(block, lhs_src, container_type);	12075	try sema.checkNamespaceType(block, lhs_src, container_type);
12080		12076
12081	const namespace = container_type.getNamespace() orelse return Air.Inst.Ref.bool_false;	12077	const namespace = container_type.getNamespaceIndex(mod).unwrap() orelse
		12078	return Air.Inst.Ref.bool_false;
12082	if (try sema.lookupInNamespace(block, src, namespace, decl_name, true)) \|decl_index\| {	12079	if (try sema.lookupInNamespace(block, src, namespace, decl_name, true)) \|decl_index\| {
12083	const decl = sema.mod.declPtr(decl_index);	12080	const decl = mod.declPtr(decl_index);
12084	if (decl.is_pub or decl.getFileScope() == block.getFileScope()) {	12081	if (decl.is_pub or decl.getFileScope(mod) == block.getFileScope(mod)) {
12085	return Air.Inst.Ref.bool_true;	12082	return Air.Inst.Ref.bool_true;
12086	}	12083	}
12087	}	12084	}
...	@@ -12097,12 +12094,12 @@ fn zirImport(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air.	...	@@ -12097,12 +12094,12 @@ fn zirImport(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air.
12097	const operand_src = inst_data.src();	12094	const operand_src = inst_data.src();
12098	const operand = inst_data.get(sema.code);	12095	const operand = inst_data.get(sema.code);
12099		12096
12100	const result = mod.importFile(block.getFileScope(), operand) catch \|err\| switch (err) {	12097	const result = mod.importFile(block.getFileScope(mod), operand) catch \|err\| switch (err) {
12101	error.ImportOutsidePkgPath => {	12098	error.ImportOutsidePkgPath => {
12102	return sema.fail(block, operand_src, "import of file outside package path: '{s}'", .{operand});	12099	return sema.fail(block, operand_src, "import of file outside package path: '{s}'", .{operand});
12103	},	12100	},
12104	error.PackageNotFound => {	12101	error.PackageNotFound => {
12105	const name = try block.getFileScope().pkg.getName(sema.gpa, mod.*);	12102	const name = try block.getFileScope(mod).pkg.getName(sema.gpa, mod.*);
12106	defer sema.gpa.free(name);	12103	defer sema.gpa.free(name);
12107	return sema.fail(block, operand_src, "no package named '{s}' available within package '{s}'", .{ operand, name });	12104	return sema.fail(block, operand_src, "no package named '{s}' available within package '{s}'", .{ operand, name });
12108	},	12105	},
...	@@ -12128,7 +12125,7 @@ fn zirEmbedFile(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!A	...	@@ -12128,7 +12125,7 @@ fn zirEmbedFile(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!A
12128	const operand_src: LazySrcLoc = .{ .node_offset_builtin_call_arg0 = inst_data.src_node };	12125	const operand_src: LazySrcLoc = .{ .node_offset_builtin_call_arg0 = inst_data.src_node };
12129	const name = try sema.resolveConstString(block, operand_src, inst_data.operand, "file path name must be comptime-known");	12126	const name = try sema.resolveConstString(block, operand_src, inst_data.operand, "file path name must be comptime-known");
12130		12127
12131	const embed_file = mod.embedFile(block.getFileScope(), name) catch \|err\| switch (err) {	12128	const embed_file = mod.embedFile(block.getFileScope(mod), name) catch \|err\| switch (err) {
12132	error.ImportOutsidePkgPath => {	12129	error.ImportOutsidePkgPath => {
12133	return sema.fail(block, operand_src, "embed of file outside package path: '{s}'", .{name});	12130	return sema.fail(block, operand_src, "embed of file outside package path: '{s}'", .{name});
12134	},	12131	},
...	@@ -15666,7 +15663,8 @@ fn zirThis(	...	@@ -15666,7 +15663,8 @@ fn zirThis(
15666	block: *Block,	15663	block: *Block,
15667	extended: Zir.Inst.Extended.InstData,	15664	extended: Zir.Inst.Extended.InstData,
15668	) CompileError!Air.Inst.Ref {	15665	) CompileError!Air.Inst.Ref {
15669	const this_decl_index = block.namespace.getDeclIndex();	15666	const mod = sema.mod;
		15667	const this_decl_index = mod.namespaceDeclIndex(block.namespace);
15670	const src = LazySrcLoc.nodeOffset(@bitCast(i32, extended.operand));	15668	const src = LazySrcLoc.nodeOffset(@bitCast(i32, extended.operand));
15671	return sema.analyzeDeclVal(block, src, this_decl_index);	15669	return sema.analyzeDeclVal(block, src, this_decl_index);
15672	}	15670	}
...	@@ -15698,9 +15696,10 @@ fn zirClosureGet(	...	@@ -15698,9 +15696,10 @@ fn zirClosureGet(
15698	block: *Block,	15696	block: *Block,
15699	inst: Zir.Inst.Index,	15697	inst: Zir.Inst.Index,
15700	) CompileError!Air.Inst.Ref {	15698	) CompileError!Air.Inst.Ref {
		15699	const mod = sema.mod;
15701	// TODO CLOSURE: Test this with inline functions	15700	// TODO CLOSURE: Test this with inline functions
15702	const inst_data = sema.code.instructions.items(.data)[inst].inst_node;	15701	const inst_data = sema.code.instructions.items(.data)[inst].inst_node;
15703	var scope: *CaptureScope = sema.mod.declPtr(block.src_decl).src_scope.?;	15702	var scope: *CaptureScope = mod.declPtr(block.src_decl).src_scope.?;
15704	// Note: The target closure must be in this scope list.	15703	// Note: The target closure must be in this scope list.
15705	// If it's not here, the zir is invalid, or the list is broken.	15704	// If it's not here, the zir is invalid, or the list is broken.
15706	const tv = while (true) {	15705	const tv = while (true) {
...	@@ -15725,8 +15724,8 @@ fn zirClosureGet(	...	@@ -15725,8 +15724,8 @@ fn zirClosureGet(
15725	if (tv.val.ip_index == .unreachable_value and !block.is_typeof and sema.func == null) {	15724	if (tv.val.ip_index == .unreachable_value and !block.is_typeof and sema.func == null) {
15726	const msg = msg: {	15725	const msg = msg: {
15727	const name = name: {	15726	const name = name: {
15728	const file = sema.owner_decl.getFileScope();	15727	const file = sema.owner_decl.getFileScope(mod);
15729	const tree = file.getTree(sema.mod.gpa) catch \|err\| {	15728	const tree = file.getTree(mod.gpa) catch \|err\| {
15730	// In this case we emit a warning + a less precise source location.	15729	// In this case we emit a warning + a less precise source location.
15731	log.warn("unable to load {s}: {s}", .{	15730	log.warn("unable to load {s}: {s}", .{
15732	file.sub_file_path, @errorName(err),	15731	file.sub_file_path, @errorName(err),
...	@@ -15753,8 +15752,8 @@ fn zirClosureGet(	...	@@ -15753,8 +15752,8 @@ fn zirClosureGet(
15753	if (tv.val.ip_index == .unreachable_value and !block.is_typeof and !block.is_comptime and sema.func != null) {	15752	if (tv.val.ip_index == .unreachable_value and !block.is_typeof and !block.is_comptime and sema.func != null) {
15754	const msg = msg: {	15753	const msg = msg: {
15755	const name = name: {	15754	const name = name: {
15756	const file = sema.owner_decl.getFileScope();	15755	const file = sema.owner_decl.getFileScope(mod);
15757	const tree = file.getTree(sema.mod.gpa) catch \|err\| {	15756	const tree = file.getTree(mod.gpa) catch \|err\| {
15758	// In this case we emit a warning + a less precise source location.	15757	// In this case we emit a warning + a less precise source location.
15759	log.warn("unable to load {s}: {s}", .{	15758	log.warn("unable to load {s}: {s}", .{
15760	file.sub_file_path, @errorName(err),	15759	file.sub_file_path, @errorName(err),
...	@@ -15825,7 +15824,7 @@ fn zirBuiltinSrc(	...	@@ -15825,7 +15824,7 @@ fn zirBuiltinSrc(
15825	const extra = sema.code.extraData(Zir.Inst.Src, extended.operand).data;	15824	const extra = sema.code.extraData(Zir.Inst.Src, extended.operand).data;
15826	const src = LazySrcLoc.nodeOffset(extra.node);	15825	const src = LazySrcLoc.nodeOffset(extra.node);
15827	const func = sema.func orelse return sema.fail(block, src, "@src outside function", .{});	15826	const func = sema.func orelse return sema.fail(block, src, "@src outside function", .{});
15828	const fn_owner_decl = sema.mod.declPtr(func.owner_decl);	15827	const fn_owner_decl = mod.declPtr(func.owner_decl);
15829		15828
15830	const func_name_val = blk: {	15829	const func_name_val = blk: {
15831	var anon_decl = try block.startAnonDecl();	15830	var anon_decl = try block.startAnonDecl();
...	@@ -15844,7 +15843,7 @@ fn zirBuiltinSrc(	...	@@ -15844,7 +15843,7 @@ fn zirBuiltinSrc(
15844	var anon_decl = try block.startAnonDecl();	15843	var anon_decl = try block.startAnonDecl();
15845	defer anon_decl.deinit();	15844	defer anon_decl.deinit();
15846	// The compiler must not call realpath anywhere.	15845	// The compiler must not call realpath anywhere.
15847	const name = try fn_owner_decl.getFileScope().fullPathZ(anon_decl.arena());	15846	const name = try fn_owner_decl.getFileScope(mod).fullPathZ(anon_decl.arena());
15848	const new_decl = try anon_decl.finish(	15847	const new_decl = try anon_decl.finish(
15849	try Type.array(anon_decl.arena(), name.len, try mod.intValue(Type.u8, 0), Type.u8, mod),	15848	try Type.array(anon_decl.arena(), name.len, try mod.intValue(Type.u8, 0), Type.u8, mod),
15850	try Value.Tag.bytes.create(anon_decl.arena(), name[0 .. name.len + 1]),	15849	try Value.Tag.bytes.create(anon_decl.arena(), name[0 .. name.len + 1]),
...	@@ -15980,22 +15979,22 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -15980,22 +15979,22 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
15980	const fn_info_decl_index = (try sema.namespaceLookup(	15979	const fn_info_decl_index = (try sema.namespaceLookup(
15981	block,	15980	block,
15982	src,	15981	src,
15983	type_info_ty.getNamespace().?,	15982	type_info_ty.getNamespaceIndex(mod).unwrap().?,
15984	"Fn",	15983	"Fn",
15985	)).?;	15984	)).?;
15986	try sema.mod.declareDeclDependency(sema.owner_decl_index, fn_info_decl_index);	15985	try mod.declareDeclDependency(sema.owner_decl_index, fn_info_decl_index);
15987	try sema.ensureDeclAnalyzed(fn_info_decl_index);	15986	try sema.ensureDeclAnalyzed(fn_info_decl_index);
15988	const fn_info_decl = sema.mod.declPtr(fn_info_decl_index);	15987	const fn_info_decl = mod.declPtr(fn_info_decl_index);
15989	const fn_ty = fn_info_decl.val.toType();	15988	const fn_ty = fn_info_decl.val.toType();
15990	const param_info_decl_index = (try sema.namespaceLookup(	15989	const param_info_decl_index = (try sema.namespaceLookup(
15991	block,	15990	block,
15992	src,	15991	src,
15993	fn_ty.getNamespace().?,	15992	fn_ty.getNamespaceIndex(mod).unwrap().?,
15994	"Param",	15993	"Param",
15995	)).?;	15994	)).?;
15996	try sema.mod.declareDeclDependency(sema.owner_decl_index, param_info_decl_index);	15995	try mod.declareDeclDependency(sema.owner_decl_index, param_info_decl_index);
15997	try sema.ensureDeclAnalyzed(param_info_decl_index);	15996	try sema.ensureDeclAnalyzed(param_info_decl_index);
15998	const param_info_decl = sema.mod.declPtr(param_info_decl_index);	15997	const param_info_decl = mod.declPtr(param_info_decl_index);
15999	const param_ty = param_info_decl.val.toType();	15998	const param_ty = param_info_decl.val.toType();
16000	const new_decl = try params_anon_decl.finish(	15999	const new_decl = try params_anon_decl.finish(
16001	try Type.Tag.array.create(params_anon_decl.arena(), .{	16000	try Type.Tag.array.create(params_anon_decl.arena(), .{
...	@@ -16169,12 +16168,12 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -16169,12 +16168,12 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
16169	const set_field_ty_decl_index = (try sema.namespaceLookup(	16168	const set_field_ty_decl_index = (try sema.namespaceLookup(
16170	block,	16169	block,
16171	src,	16170	src,
16172	type_info_ty.getNamespace().?,	16171	type_info_ty.getNamespaceIndex(mod).unwrap().?,
16173	"Error",	16172	"Error",
16174	)).?;	16173	)).?;
16175	try sema.mod.declareDeclDependency(sema.owner_decl_index, set_field_ty_decl_index);	16174	try mod.declareDeclDependency(sema.owner_decl_index, set_field_ty_decl_index);
16176	try sema.ensureDeclAnalyzed(set_field_ty_decl_index);	16175	try sema.ensureDeclAnalyzed(set_field_ty_decl_index);
16177	const set_field_ty_decl = sema.mod.declPtr(set_field_ty_decl_index);	16176	const set_field_ty_decl = mod.declPtr(set_field_ty_decl_index);
16178	break :t try set_field_ty_decl.val.toType().copy(fields_anon_decl.arena());	16177	break :t try set_field_ty_decl.val.toType().copy(fields_anon_decl.arena());
16179	};	16178	};
16180		16179
...	@@ -16277,12 +16276,12 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -16277,12 +16276,12 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
16277	const enum_field_ty_decl_index = (try sema.namespaceLookup(	16276	const enum_field_ty_decl_index = (try sema.namespaceLookup(
16278	block,	16277	block,
16279	src,	16278	src,
16280	type_info_ty.getNamespace().?,	16279	type_info_ty.getNamespaceIndex(mod).unwrap().?,
16281	"EnumField",	16280	"EnumField",
16282	)).?;	16281	)).?;
16283	try sema.mod.declareDeclDependency(sema.owner_decl_index, enum_field_ty_decl_index);	16282	try mod.declareDeclDependency(sema.owner_decl_index, enum_field_ty_decl_index);
16284	try sema.ensureDeclAnalyzed(enum_field_ty_decl_index);	16283	try sema.ensureDeclAnalyzed(enum_field_ty_decl_index);
16285	const enum_field_ty_decl = sema.mod.declPtr(enum_field_ty_decl_index);	16284	const enum_field_ty_decl = mod.declPtr(enum_field_ty_decl_index);
16286	break :t try enum_field_ty_decl.val.toType().copy(fields_anon_decl.arena());	16285	break :t try enum_field_ty_decl.val.toType().copy(fields_anon_decl.arena());
16287	};	16286	};
16288		16287
...	@@ -16336,7 +16335,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -16336,7 +16335,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
16336	break :v try Value.Tag.decl_ref.create(sema.arena, new_decl);	16335	break :v try Value.Tag.decl_ref.create(sema.arena, new_decl);
16337	};	16336	};
16338		16337
16339	const decls_val = try sema.typeInfoDecls(block, src, type_info_ty, ty.getNamespace());	16338	const decls_val = try sema.typeInfoDecls(block, src, type_info_ty, ty.getNamespace(mod));
16340		16339
16341	const field_values = try sema.arena.create([4]Value);	16340	const field_values = try sema.arena.create([4]Value);
16342	field_values.* = .{	16341	field_values.* = .{
...	@@ -16368,12 +16367,12 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -16368,12 +16367,12 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
16368	const union_field_ty_decl_index = (try sema.namespaceLookup(	16367	const union_field_ty_decl_index = (try sema.namespaceLookup(
16369	block,	16368	block,
16370	src,	16369	src,
16371	type_info_ty.getNamespace().?,	16370	type_info_ty.getNamespaceIndex(mod).unwrap().?,
16372	"UnionField",	16371	"UnionField",
16373	)).?;	16372	)).?;
16374	try sema.mod.declareDeclDependency(sema.owner_decl_index, union_field_ty_decl_index);	16373	try mod.declareDeclDependency(sema.owner_decl_index, union_field_ty_decl_index);
16375	try sema.ensureDeclAnalyzed(union_field_ty_decl_index);	16374	try sema.ensureDeclAnalyzed(union_field_ty_decl_index);
16376	const union_field_ty_decl = sema.mod.declPtr(union_field_ty_decl_index);	16375	const union_field_ty_decl = mod.declPtr(union_field_ty_decl_index);
16377	break :t try union_field_ty_decl.val.toType().copy(fields_anon_decl.arena());	16376	break :t try union_field_ty_decl.val.toType().copy(fields_anon_decl.arena());
16378	};	16377	};
16379		16378
...	@@ -16434,7 +16433,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -16434,7 +16433,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
16434	});	16433	});
16435	};	16434	};
16436		16435
16437	const decls_val = try sema.typeInfoDecls(block, src, type_info_ty, union_ty.getNamespace());	16436	const decls_val = try sema.typeInfoDecls(block, src, type_info_ty, union_ty.getNamespace(mod));
16438		16437
16439	const enum_tag_ty_val = if (union_ty.unionTagType()) \|tag_ty\| v: {	16438	const enum_tag_ty_val = if (union_ty.unionTagType()) \|tag_ty\| v: {
16440	const ty_val = try Value.Tag.ty.create(sema.arena, tag_ty);	16439	const ty_val = try Value.Tag.ty.create(sema.arena, tag_ty);
...	@@ -16475,12 +16474,12 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -16475,12 +16474,12 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
16475	const struct_field_ty_decl_index = (try sema.namespaceLookup(	16474	const struct_field_ty_decl_index = (try sema.namespaceLookup(
16476	block,	16475	block,
16477	src,	16476	src,
16478	type_info_ty.getNamespace().?,	16477	type_info_ty.getNamespaceIndex(mod).unwrap().?,
16479	"StructField",	16478	"StructField",
16480	)).?;	16479	)).?;
16481	try sema.mod.declareDeclDependency(sema.owner_decl_index, struct_field_ty_decl_index);	16480	try mod.declareDeclDependency(sema.owner_decl_index, struct_field_ty_decl_index);
16482	try sema.ensureDeclAnalyzed(struct_field_ty_decl_index);	16481	try sema.ensureDeclAnalyzed(struct_field_ty_decl_index);
16483	const struct_field_ty_decl = sema.mod.declPtr(struct_field_ty_decl_index);	16482	const struct_field_ty_decl = mod.declPtr(struct_field_ty_decl_index);
16484	break :t try struct_field_ty_decl.val.toType().copy(fields_anon_decl.arena());	16483	break :t try struct_field_ty_decl.val.toType().copy(fields_anon_decl.arena());
16485	};	16484	};
16486	const struct_ty = try sema.resolveTypeFields(ty);	16485	const struct_ty = try sema.resolveTypeFields(ty);
...	@@ -16597,7 +16596,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -16597,7 +16596,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
16597	});	16596	});
16598	};	16597	};
16599		16598
16600	const decls_val = try sema.typeInfoDecls(block, src, type_info_ty, struct_ty.getNamespace());	16599	const decls_val = try sema.typeInfoDecls(block, src, type_info_ty, struct_ty.getNamespace(mod));
16601		16600
16602	const backing_integer_val = blk: {	16601	const backing_integer_val = blk: {
16603	if (layout == .Packed) {	16602	if (layout == .Packed) {
...	@@ -16640,7 +16639,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -16640,7 +16639,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
16640	// TODO: look into memoizing this result.	16639	// TODO: look into memoizing this result.
16641		16640
16642	const opaque_ty = try sema.resolveTypeFields(ty);	16641	const opaque_ty = try sema.resolveTypeFields(ty);
16643	const decls_val = try sema.typeInfoDecls(block, src, type_info_ty, opaque_ty.getNamespace());	16642	const decls_val = try sema.typeInfoDecls(block, src, type_info_ty, opaque_ty.getNamespace(mod));
16644		16643
16645	const field_values = try sema.arena.create([1]Value);	16644	const field_values = try sema.arena.create([1]Value);
16646	field_values.* = .{	16645	field_values.* = .{
...	@@ -16676,7 +16675,7 @@ fn typeInfoDecls(	...	@@ -16676,7 +16675,7 @@ fn typeInfoDecls(
16676	const declaration_ty_decl_index = (try sema.namespaceLookup(	16675	const declaration_ty_decl_index = (try sema.namespaceLookup(
16677	block,	16676	block,
16678	src,	16677	src,
16679	type_info_ty.getNamespace().?,	16678	type_info_ty.getNamespaceIndex(mod).unwrap().?,
16680	"Declaration",	16679	"Declaration",
16681	)).?;	16680	)).?;
16682	try mod.declareDeclDependency(sema.owner_decl_index, declaration_ty_decl_index);	16681	try mod.declareDeclDependency(sema.owner_decl_index, declaration_ty_decl_index);
...	@@ -16730,7 +16729,7 @@ fn typeInfoNamespaceDecls(	...	@@ -16730,7 +16729,7 @@ fn typeInfoNamespaceDecls(
16730	if (decl.kind == .@"usingnamespace") {	16729	if (decl.kind == .@"usingnamespace") {
16731	if (decl.analysis == .in_progress) continue;	16730	if (decl.analysis == .in_progress) continue;
16732	try mod.ensureDeclAnalyzed(decl_index);	16731	try mod.ensureDeclAnalyzed(decl_index);
16733	const new_ns = decl.val.toType().getNamespace().?;	16732	const new_ns = decl.val.toType().getNamespace(mod).?;
16734	try sema.typeInfoNamespaceDecls(block, decls_anon_decl, new_ns, decl_vals, seen_namespaces);	16733	try sema.typeInfoNamespaceDecls(block, decls_anon_decl, new_ns, decl_vals, seen_namespaces);
16735	continue;	16734	continue;
16736	}	16735	}
...	@@ -17750,7 +17749,7 @@ fn zirPtrType(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air	...	@@ -17750,7 +17749,7 @@ fn zirPtrType(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air
17750	errdefer msg.destroy(sema.gpa);	17749	errdefer msg.destroy(sema.gpa);
17751		17750
17752	const src_decl = sema.mod.declPtr(block.src_decl);	17751	const src_decl = sema.mod.declPtr(block.src_decl);
17753	try sema.explainWhyTypeIsNotExtern(msg, elem_ty_src.toSrcLoc(src_decl), elem_ty, .other);	17752	try sema.explainWhyTypeIsNotExtern(msg, elem_ty_src.toSrcLoc(src_decl, mod), elem_ty, .other);
17754		17753
17755	try sema.addDeclaredHereNote(msg, elem_ty);	17754	try sema.addDeclaredHereNote(msg, elem_ty);
17756	break :msg msg;	17755	break :msg msg;
...	@@ -18006,6 +18005,7 @@ fn finishStructInit(	...	@@ -18006,6 +18005,7 @@ fn finishStructInit(
18006	struct_ty: Type,	18005	struct_ty: Type,
18007	is_ref: bool,	18006	is_ref: bool,
18008	) CompileError!Air.Inst.Ref {	18007	) CompileError!Air.Inst.Ref {
		18008	const mod = sema.mod;
18009	const gpa = sema.gpa;	18009	const gpa = sema.gpa;
18010		18010
18011	var root_msg: ?*Module.ErrorMsg = null;	18011	var root_msg: ?*Module.ErrorMsg = null;
...	@@ -18118,8 +18118,8 @@ fn finishStructInit(	...	@@ -18118,8 +18118,8 @@ fn finishStructInit(
18118		18118
18119	sema.requireRuntimeBlock(block, .unneeded, null) catch \|err\| switch (err) {	18119	sema.requireRuntimeBlock(block, .unneeded, null) catch \|err\| switch (err) {
18120	error.NeededSourceLocation => {	18120	error.NeededSourceLocation => {
18121	const decl = sema.mod.declPtr(block.src_decl);	18121	const decl = mod.declPtr(block.src_decl);
18122	const field_src = Module.initSrc(dest_src.node_offset.x, sema.gpa, decl, runtime_index);	18122	const field_src = mod.initSrc(dest_src.node_offset.x, decl, runtime_index);
18123	try sema.requireRuntimeBlock(block, dest_src, field_src);	18123	try sema.requireRuntimeBlock(block, dest_src, field_src);
18124	unreachable;	18124	unreachable;
18125	},	18125	},
...	@@ -18158,11 +18158,11 @@ fn zirStructInitAnon(	...	@@ -18158,11 +18158,11 @@ fn zirStructInitAnon(
18158	if (gop.found_existing) {	18158	if (gop.found_existing) {
18159	const msg = msg: {	18159	const msg = msg: {
18160	const decl = sema.mod.declPtr(block.src_decl);	18160	const decl = sema.mod.declPtr(block.src_decl);
18161	const field_src = Module.initSrc(src.node_offset.x, sema.gpa, decl, i);	18161	const field_src = mod.initSrc(src.node_offset.x, decl, i);
18162	const msg = try sema.errMsg(block, field_src, "duplicate field", .{});	18162	const msg = try sema.errMsg(block, field_src, "duplicate field", .{});
18163	errdefer msg.destroy(sema.gpa);	18163	errdefer msg.destroy(sema.gpa);
18164		18164
18165	const prev_source = Module.initSrc(src.node_offset.x, sema.gpa, decl, gop.value_ptr.*);	18165	const prev_source = mod.initSrc(src.node_offset.x, decl, gop.value_ptr.*);
18166	try sema.errNote(block, prev_source, msg, "other field here", .{});	18166	try sema.errNote(block, prev_source, msg, "other field here", .{});
18167	break :msg msg;	18167	break :msg msg;
18168	};	18168	};
...	@@ -18175,7 +18175,7 @@ fn zirStructInitAnon(	...	@@ -18175,7 +18175,7 @@ fn zirStructInitAnon(
18175	if (types[i].zigTypeTag(mod) == .Opaque) {	18175	if (types[i].zigTypeTag(mod) == .Opaque) {
18176	const msg = msg: {	18176	const msg = msg: {
18177	const decl = sema.mod.declPtr(block.src_decl);	18177	const decl = sema.mod.declPtr(block.src_decl);
18178	const field_src = Module.initSrc(src.node_offset.x, sema.gpa, decl, i);	18178	const field_src = mod.initSrc(src.node_offset.x, decl, i);
18179	const msg = try sema.errMsg(block, field_src, "opaque types have unknown size and therefore cannot be directly embedded in structs", .{});	18179	const msg = try sema.errMsg(block, field_src, "opaque types have unknown size and therefore cannot be directly embedded in structs", .{});
18180	errdefer msg.destroy(sema.gpa);	18180	errdefer msg.destroy(sema.gpa);
18181		18181
...	@@ -18208,7 +18208,7 @@ fn zirStructInitAnon(	...	@@ -18208,7 +18208,7 @@ fn zirStructInitAnon(
18208	sema.requireRuntimeBlock(block, .unneeded, null) catch \|err\| switch (err) {	18208	sema.requireRuntimeBlock(block, .unneeded, null) catch \|err\| switch (err) {
18209	error.NeededSourceLocation => {	18209	error.NeededSourceLocation => {
18210	const decl = sema.mod.declPtr(block.src_decl);	18210	const decl = sema.mod.declPtr(block.src_decl);
18211	const field_src = Module.initSrc(src.node_offset.x, sema.gpa, decl, runtime_index);	18211	const field_src = mod.initSrc(src.node_offset.x, decl, runtime_index);
18212	try sema.requireRuntimeBlock(block, src, field_src);	18212	try sema.requireRuntimeBlock(block, src, field_src);
18213	unreachable;	18213	unreachable;
18214	},	18214	},
...	@@ -18283,7 +18283,7 @@ fn zirArrayInit(	...	@@ -18283,7 +18283,7 @@ fn zirArrayInit(
18283	resolved_args[i] = sema.coerce(block, elem_ty, resolved_arg, .unneeded) catch \|err\| switch (err) {	18283	resolved_args[i] = sema.coerce(block, elem_ty, resolved_arg, .unneeded) catch \|err\| switch (err) {
18284	error.NeededSourceLocation => {	18284	error.NeededSourceLocation => {
18285	const decl = sema.mod.declPtr(block.src_decl);	18285	const decl = sema.mod.declPtr(block.src_decl);
18286	const elem_src = Module.initSrc(src.node_offset.x, sema.gpa, decl, i);	18286	const elem_src = mod.initSrc(src.node_offset.x, decl, i);
18287	_ = try sema.coerce(block, elem_ty, resolved_arg, elem_src);	18287	_ = try sema.coerce(block, elem_ty, resolved_arg, elem_src);
18288	unreachable;	18288	unreachable;
18289	},	18289	},
...	@@ -18315,7 +18315,7 @@ fn zirArrayInit(	...	@@ -18315,7 +18315,7 @@ fn zirArrayInit(
18315	sema.requireRuntimeBlock(block, .unneeded, null) catch \|err\| switch (err) {	18315	sema.requireRuntimeBlock(block, .unneeded, null) catch \|err\| switch (err) {
18316	error.NeededSourceLocation => {	18316	error.NeededSourceLocation => {
18317	const decl = sema.mod.declPtr(block.src_decl);	18317	const decl = sema.mod.declPtr(block.src_decl);
18318	const elem_src = Module.initSrc(src.node_offset.x, sema.gpa, decl, runtime_index);	18318	const elem_src = mod.initSrc(src.node_offset.x, decl, runtime_index);
18319	try sema.requireRuntimeBlock(block, src, elem_src);	18319	try sema.requireRuntimeBlock(block, src, elem_src);
18320	unreachable;	18320	unreachable;
18321	},	18321	},
...	@@ -18724,7 +18724,7 @@ fn zirTagName(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air	...	@@ -18724,7 +18724,7 @@ fn zirTagName(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air
18724	enum_ty.fmt(mod),	18724	enum_ty.fmt(mod),
18725	});	18725	});
18726	}	18726	}
18727	const enum_decl_index = enum_ty.getOwnerDecl();	18727	const enum_decl_index = enum_ty.getOwnerDecl(mod);
18728	const casted_operand = try sema.coerce(block, enum_ty, operand, operand_src);	18728	const casted_operand = try sema.coerce(block, enum_ty, operand, operand_src);
18729	if (try sema.resolveDefinedValue(block, operand_src, casted_operand)) \|val\| {	18729	if (try sema.resolveDefinedValue(block, operand_src, casted_operand)) \|val\| {
18730	const field_index = enum_ty.enumTagFieldIndex(val, mod) orelse {	18730	const field_index = enum_ty.enumTagFieldIndex(val, mod) orelse {
...	@@ -18734,7 +18734,7 @@ fn zirTagName(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air	...	@@ -18734,7 +18734,7 @@ fn zirTagName(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air
18734	val.fmtValue(enum_ty, sema.mod), enum_decl.name,	18734	val.fmtValue(enum_ty, sema.mod), enum_decl.name,
18735	});	18735	});
18736	errdefer msg.destroy(sema.gpa);	18736	errdefer msg.destroy(sema.gpa);
18737	try mod.errNoteNonLazy(enum_decl.srcLoc(), msg, "declared here", .{});	18737	try mod.errNoteNonLazy(enum_decl.srcLoc(mod), msg, "declared here", .{});
18738	break :msg msg;	18738	break :msg msg;
18739	};	18739	};
18740	return sema.failWithOwnedErrorMsg(msg);	18740	return sema.failWithOwnedErrorMsg(msg);
...	@@ -18760,6 +18760,7 @@ fn zirReify(	...	@@ -18760,6 +18760,7 @@ fn zirReify(
18760	inst: Zir.Inst.Index,	18760	inst: Zir.Inst.Index,
18761	) CompileError!Air.Inst.Ref {	18761	) CompileError!Air.Inst.Ref {
18762	const mod = sema.mod;	18762	const mod = sema.mod;
		18763	const gpa = sema.gpa;
18763	const name_strategy = @intToEnum(Zir.Inst.NameStrategy, extended.small);	18764	const name_strategy = @intToEnum(Zir.Inst.NameStrategy, extended.small);
18764	const extra = sema.code.extraData(Zir.Inst.UnNode, extended.operand).data;	18765	const extra = sema.code.extraData(Zir.Inst.UnNode, extended.operand).data;
18765	const src = LazySrcLoc.nodeOffset(extra.node);	18766	const src = LazySrcLoc.nodeOffset(extra.node);
...	@@ -18887,10 +18888,10 @@ fn zirReify(	...	@@ -18887,10 +18888,10 @@ fn zirReify(
18887	if (!try sema.validateExternType(elem_ty, .other)) {	18888	if (!try sema.validateExternType(elem_ty, .other)) {
18888	const msg = msg: {	18889	const msg = msg: {
18889	const msg = try sema.errMsg(block, src, "C pointers cannot point to non-C-ABI-compatible type '{}'", .{elem_ty.fmt(mod)});	18890	const msg = try sema.errMsg(block, src, "C pointers cannot point to non-C-ABI-compatible type '{}'", .{elem_ty.fmt(mod)});
18890	errdefer msg.destroy(sema.gpa);	18891	errdefer msg.destroy(gpa);
18891		18892
18892	const src_decl = mod.declPtr(block.src_decl);	18893	const src_decl = mod.declPtr(block.src_decl);
18893	try sema.explainWhyTypeIsNotExtern(msg, src.toSrcLoc(src_decl), elem_ty, .other);	18894	try sema.explainWhyTypeIsNotExtern(msg, src.toSrcLoc(src_decl, mod), elem_ty, .other);
18894		18895
18895	try sema.addDeclaredHereNote(msg, elem_ty);	18896	try sema.addDeclaredHereNote(msg, elem_ty);
18896	break :msg msg;	18897	break :msg msg;
...	@@ -19043,7 +19044,6 @@ fn zirReify(	...	@@ -19043,7 +19044,6 @@ fn zirReify(
19043	return sema.fail(block, src, "reified enums must have no decls", .{});	19044	return sema.fail(block, src, "reified enums must have no decls", .{});
19044	}	19045	}
19045		19046
19046	const gpa = sema.gpa;
19047	var new_decl_arena = std.heap.ArenaAllocator.init(gpa);	19047	var new_decl_arena = std.heap.ArenaAllocator.init(gpa);
19048	errdefer new_decl_arena.deinit();	19048	errdefer new_decl_arena.deinit();
19049	const new_decl_arena_allocator = new_decl_arena.allocator();	19049	const new_decl_arena_allocator = new_decl_arena.allocator();
...	@@ -19076,11 +19076,11 @@ fn zirReify(	...	@@ -19076,11 +19076,11 @@ fn zirReify(
19076	.tag_ty_inferred = false,	19076	.tag_ty_inferred = false,
19077	.fields = .{},	19077	.fields = .{},
19078	.values = .{},	19078	.values = .{},
19079	.namespace = .{	19079	.namespace = try mod.createNamespace(.{
19080	.parent = block.namespace,	19080	.parent = block.namespace.toOptional(),
19081	.ty = enum_ty,	19081	.ty = enum_ty,
19082	.file_scope = block.getFileScope(),	19082	.file_scope = block.getFileScope(mod),
19083	},	19083	}),
19084	};	19084	};
19085		19085
19086	// Enum tag type	19086	// Enum tag type
...	@@ -19164,34 +19164,37 @@ fn zirReify(	...	@@ -19164,34 +19164,37 @@ fn zirReify(
19164	return sema.fail(block, src, "reified opaque must have no decls", .{});	19164	return sema.fail(block, src, "reified opaque must have no decls", .{});
19165	}	19165	}
19166		19166
19167	var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);	19167	var new_decl_arena = std.heap.ArenaAllocator.init(gpa);
19168	errdefer new_decl_arena.deinit();	19168	errdefer new_decl_arena.deinit();
19169	const new_decl_arena_allocator = new_decl_arena.allocator();
19170		19169
19171	const opaque_obj = try new_decl_arena_allocator.create(Module.Opaque);	19170	// Because these three things each reference each other,
19172	const opaque_ty_payload = try new_decl_arena_allocator.create(Type.Payload.Opaque);	19171	// `undefined` placeholders are used in two places before being set
19173	opaque_ty_payload.* = .{	19172	// after the opaque type gains an InternPool index.
19174	.base = .{ .tag = .@"opaque" },	19173
19175	.data = opaque_obj,
19176	};
19177	const opaque_ty = Type.initPayload(&opaque_ty_payload.base);
19178	const opaque_val = try Value.Tag.ty.create(new_decl_arena_allocator, opaque_ty);
19179	const new_decl_index = try sema.createAnonymousDeclTypeNamed(block, src, .{	19174	const new_decl_index = try sema.createAnonymousDeclTypeNamed(block, src, .{
19180	.ty = Type.type,	19175	.ty = Type.type,
19181	.val = opaque_val,	19176	.val = undefined,
19182	}, name_strategy, "opaque", inst);	19177	}, name_strategy, "opaque", inst);
19183	const new_decl = mod.declPtr(new_decl_index);	19178	const new_decl = mod.declPtr(new_decl_index);
19184	new_decl.owns_tv = true;	19179	new_decl.owns_tv = true;
19185	errdefer mod.abortAnonDecl(new_decl_index);	19180	errdefer mod.abortAnonDecl(new_decl_index);
19186		19181
19187	opaque_obj.* = .{	19182	const new_namespace_index = try mod.createNamespace(.{
19188	.owner_decl = new_decl_index,	19183	.parent = block.namespace.toOptional(),
19189	.namespace = .{	19184	.ty = undefined,
19190	.parent = block.namespace,	19185	.file_scope = block.getFileScope(mod),
19191	.ty = opaque_ty,	19186	});
19192	.file_scope = block.getFileScope(),	19187	const new_namespace = mod.namespacePtr(new_namespace_index);
19193	},	19188	errdefer @panic("TODO error handling");
19194	};	19189
		19190	const opaque_ty = try mod.intern_pool.get(gpa, .{ .opaque_type = .{
		19191	.decl = new_decl_index,
		19192	.namespace = new_namespace_index,
		19193	} });
		19194	errdefer @panic("TODO error handling");
		19195
		19196	new_decl.val = opaque_ty.toValue();
		19197	new_namespace.ty = opaque_ty.toType();
19195		19198
19196	try new_decl.finalizeNewArena(&new_decl_arena);	19199	try new_decl.finalizeNewArena(&new_decl_arena);
19197	return sema.analyzeDeclVal(block, src, new_decl_index);	19200	return sema.analyzeDeclVal(block, src, new_decl_index);
...	@@ -19214,7 +19217,7 @@ fn zirReify(	...	@@ -19214,7 +19217,7 @@ fn zirReify(
19214	}	19217	}
19215	const layout = layout_val.toEnum(std.builtin.Type.ContainerLayout);	19218	const layout = layout_val.toEnum(std.builtin.Type.ContainerLayout);
19216		19219
19217	var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);	19220	var new_decl_arena = std.heap.ArenaAllocator.init(gpa);
19218	errdefer new_decl_arena.deinit();	19221	errdefer new_decl_arena.deinit();
19219	const new_decl_arena_allocator = new_decl_arena.allocator();	19222	const new_decl_arena_allocator = new_decl_arena.allocator();
19220		19223
...	@@ -19248,11 +19251,11 @@ fn zirReify(	...	@@ -19248,11 +19251,11 @@ fn zirReify(
19248	.zir_index = inst,	19251	.zir_index = inst,
19249	.layout = layout,	19252	.layout = layout,
19250	.status = .have_field_types,	19253	.status = .have_field_types,
19251	.namespace = .{	19254	.namespace = try mod.createNamespace(.{
19252	.parent = block.namespace,	19255	.parent = block.namespace.toOptional(),
19253	.ty = union_ty,	19256	.ty = union_ty,
19254	.file_scope = block.getFileScope(),	19257	.file_scope = block.getFileScope(mod),
19255	},	19258	}),
19256	};	19259	};
19257		19260
19258	// Tag type	19261	// Tag type
...	@@ -19301,7 +19304,7 @@ fn zirReify(	...	@@ -19301,7 +19304,7 @@ fn zirReify(
19301	if (!enum_has_field) {	19304	if (!enum_has_field) {
19302	const msg = msg: {	19305	const msg = msg: {
19303	const msg = try sema.errMsg(block, src, "no field named '{s}' in enum '{}'", .{ field_name, union_obj.tag_ty.fmt(mod) });	19306	const msg = try sema.errMsg(block, src, "no field named '{s}' in enum '{}'", .{ field_name, union_obj.tag_ty.fmt(mod) });
19304	errdefer msg.destroy(sema.gpa);	19307	errdefer msg.destroy(gpa);
19305	try sema.addDeclaredHereNote(msg, union_obj.tag_ty);	19308	try sema.addDeclaredHereNote(msg, union_obj.tag_ty);
19306	break :msg msg;	19309	break :msg msg;
19307	};	19310	};
...	@@ -19324,7 +19327,7 @@ fn zirReify(	...	@@ -19324,7 +19327,7 @@ fn zirReify(
19324	if (field_ty.zigTypeTag(mod) == .Opaque) {	19327	if (field_ty.zigTypeTag(mod) == .Opaque) {
19325	const msg = msg: {	19328	const msg = msg: {
19326	const msg = try sema.errMsg(block, src, "opaque types have unknown size and therefore cannot be directly embedded in unions", .{});	19329	const msg = try sema.errMsg(block, src, "opaque types have unknown size and therefore cannot be directly embedded in unions", .{});
19327	errdefer msg.destroy(sema.gpa);	19330	errdefer msg.destroy(gpa);
19328		19331
19329	try sema.addDeclaredHereNote(msg, field_ty);	19332	try sema.addDeclaredHereNote(msg, field_ty);
19330	break :msg msg;	19333	break :msg msg;
...	@@ -19334,10 +19337,10 @@ fn zirReify(	...	@@ -19334,10 +19337,10 @@ fn zirReify(
19334	if (union_obj.layout == .Extern and !try sema.validateExternType(field_ty, .union_field)) {	19337	if (union_obj.layout == .Extern and !try sema.validateExternType(field_ty, .union_field)) {
19335	const msg = msg: {	19338	const msg = msg: {
19336	const msg = try sema.errMsg(block, src, "extern unions cannot contain fields of type '{}'", .{field_ty.fmt(mod)});	19339	const msg = try sema.errMsg(block, src, "extern unions cannot contain fields of type '{}'", .{field_ty.fmt(mod)});
19337	errdefer msg.destroy(sema.gpa);	19340	errdefer msg.destroy(gpa);
19338		19341
19339	const src_decl = mod.declPtr(block.src_decl);	19342	const src_decl = mod.declPtr(block.src_decl);
19340	try sema.explainWhyTypeIsNotExtern(msg, src.toSrcLoc(src_decl), field_ty, .union_field);	19343	try sema.explainWhyTypeIsNotExtern(msg, src.toSrcLoc(src_decl, mod), field_ty, .union_field);
19341		19344
19342	try sema.addDeclaredHereNote(msg, field_ty);	19345	try sema.addDeclaredHereNote(msg, field_ty);
19343	break :msg msg;	19346	break :msg msg;
...	@@ -19346,10 +19349,10 @@ fn zirReify(	...	@@ -19346,10 +19349,10 @@ fn zirReify(
19346	} else if (union_obj.layout == .Packed and !(validatePackedType(field_ty, mod))) {	19349	} else if (union_obj.layout == .Packed and !(validatePackedType(field_ty, mod))) {
19347	const msg = msg: {	19350	const msg = msg: {
19348	const msg = try sema.errMsg(block, src, "packed unions cannot contain fields of type '{}'", .{field_ty.fmt(mod)});	19351	const msg = try sema.errMsg(block, src, "packed unions cannot contain fields of type '{}'", .{field_ty.fmt(mod)});
19349	errdefer msg.destroy(sema.gpa);	19352	errdefer msg.destroy(gpa);
19350		19353
19351	const src_decl = mod.declPtr(block.src_decl);	19354	const src_decl = mod.declPtr(block.src_decl);
19352	try sema.explainWhyTypeIsNotPacked(msg, src.toSrcLoc(src_decl), field_ty);	19355	try sema.explainWhyTypeIsNotPacked(msg, src.toSrcLoc(src_decl, mod), field_ty);
19353		19356
19354	try sema.addDeclaredHereNote(msg, field_ty);	19357	try sema.addDeclaredHereNote(msg, field_ty);
19355	break :msg msg;	19358	break :msg msg;
...	@@ -19362,7 +19365,7 @@ fn zirReify(	...	@@ -19362,7 +19365,7 @@ fn zirReify(
19362	if (names.count() > 0) {	19365	if (names.count() > 0) {
19363	const msg = msg: {	19366	const msg = msg: {
19364	const msg = try sema.errMsg(block, src, "enum field(s) missing in union", .{});	19367	const msg = try sema.errMsg(block, src, "enum field(s) missing in union", .{});
19365	errdefer msg.destroy(sema.gpa);	19368	errdefer msg.destroy(gpa);
19366		19369
19367	const enum_ty = union_obj.tag_ty;	19370	const enum_ty = union_obj.tag_ty;
19368	for (names.keys()) \|field_name\| {	19371	for (names.keys()) \|field_name\| {
...	@@ -19513,11 +19516,11 @@ fn reifyStruct(	...	@@ -19513,11 +19516,11 @@ fn reifyStruct(
19513	.status = .have_field_types,	19516	.status = .have_field_types,
19514	.known_non_opv = false,	19517	.known_non_opv = false,
19515	.is_tuple = is_tuple,	19518	.is_tuple = is_tuple,
19516	.namespace = .{	19519	.namespace = try mod.createNamespace(.{
19517	.parent = block.namespace,	19520	.parent = block.namespace.toOptional(),
19518	.ty = struct_ty,	19521	.ty = struct_ty,
19519	.file_scope = block.getFileScope(),	19522	.file_scope = block.getFileScope(mod),
19520	},	19523	}),
19521	};	19524	};
19522		19525
19523	// Fields	19526	// Fields
...	@@ -19629,7 +19632,7 @@ fn reifyStruct(	...	@@ -19629,7 +19632,7 @@ fn reifyStruct(
19629	errdefer msg.destroy(sema.gpa);	19632	errdefer msg.destroy(sema.gpa);
19630		19633
19631	const src_decl = sema.mod.declPtr(block.src_decl);	19634	const src_decl = sema.mod.declPtr(block.src_decl);
19632	try sema.explainWhyTypeIsNotExtern(msg, src.toSrcLoc(src_decl), field_ty, .struct_field);	19635	try sema.explainWhyTypeIsNotExtern(msg, src.toSrcLoc(src_decl, mod), field_ty, .struct_field);
19633		19636
19634	try sema.addDeclaredHereNote(msg, field_ty);	19637	try sema.addDeclaredHereNote(msg, field_ty);
19635	break :msg msg;	19638	break :msg msg;
...	@@ -19641,7 +19644,7 @@ fn reifyStruct(	...	@@ -19641,7 +19644,7 @@ fn reifyStruct(
19641	errdefer msg.destroy(sema.gpa);	19644	errdefer msg.destroy(sema.gpa);
19642		19645
19643	const src_decl = sema.mod.declPtr(block.src_decl);	19646	const src_decl = sema.mod.declPtr(block.src_decl);
19644	try sema.explainWhyTypeIsNotPacked(msg, src.toSrcLoc(src_decl), field_ty);	19647	try sema.explainWhyTypeIsNotPacked(msg, src.toSrcLoc(src_decl, mod), field_ty);
19645		19648
19646	try sema.addDeclaredHereNote(msg, field_ty);	19649	try sema.addDeclaredHereNote(msg, field_ty);
19647	break :msg msg;	19650	break :msg msg;
...	@@ -19741,6 +19744,7 @@ fn resolveVaListRef(sema: Sema, block: Block, src: LazySrcLoc, zir_ref: Zir.In	...	@@ -19741,6 +19744,7 @@ fn resolveVaListRef(sema: Sema, block: Block, src: LazySrcLoc, zir_ref: Zir.In
19741	}	19744	}
19742		19745
19743	fn zirCVaArg(sema: Sema, block: Block, extended: Zir.Inst.Extended.InstData) CompileError!Air.Inst.Ref {	19746	fn zirCVaArg(sema: Sema, block: Block, extended: Zir.Inst.Extended.InstData) CompileError!Air.Inst.Ref {
		19747	const mod = sema.mod;
19744	const extra = sema.code.extraData(Zir.Inst.BinNode, extended.operand).data;	19748	const extra = sema.code.extraData(Zir.Inst.BinNode, extended.operand).data;
19745	const src = LazySrcLoc.nodeOffset(extra.node);	19749	const src = LazySrcLoc.nodeOffset(extra.node);
19746	const va_list_src: LazySrcLoc = .{ .node_offset_builtin_call_arg0 = extra.node };	19750	const va_list_src: LazySrcLoc = .{ .node_offset_builtin_call_arg0 = extra.node };
...	@@ -19755,7 +19759,7 @@ fn zirCVaArg(sema: Sema, block: Block, extended: Zir.Inst.Extended.InstData) C	...	@@ -19755,7 +19759,7 @@ fn zirCVaArg(sema: Sema, block: Block, extended: Zir.Inst.Extended.InstData) C
19755	errdefer msg.destroy(sema.gpa);	19759	errdefer msg.destroy(sema.gpa);
19756		19760
19757	const src_decl = sema.mod.declPtr(block.src_decl);	19761	const src_decl = sema.mod.declPtr(block.src_decl);
19758	try sema.explainWhyTypeIsNotExtern(msg, ty_src.toSrcLoc(src_decl), arg_ty, .param_ty);	19762	try sema.explainWhyTypeIsNotExtern(msg, ty_src.toSrcLoc(src_decl, mod), arg_ty, .param_ty);
19759		19763
19760	try sema.addDeclaredHereNote(msg, arg_ty);	19764	try sema.addDeclaredHereNote(msg, arg_ty);
19761	break :msg msg;	19765	break :msg msg;
...	@@ -21006,7 +21010,8 @@ fn checkVectorizableBinaryOperands(	...	@@ -21006,7 +21010,8 @@ fn checkVectorizableBinaryOperands(
21006		21010
21007	fn maybeOptionsSrc(sema: Sema, block: Block, base_src: LazySrcLoc, wanted: []const u8) LazySrcLoc {	21011	fn maybeOptionsSrc(sema: Sema, block: Block, base_src: LazySrcLoc, wanted: []const u8) LazySrcLoc {
21008	if (base_src == .unneeded) return .unneeded;	21012	if (base_src == .unneeded) return .unneeded;
21009	return Module.optionsSrc(sema.gpa, sema.mod.declPtr(block.src_decl), base_src, wanted);	21013	const mod = sema.mod;
		21014	return mod.optionsSrc(sema.mod.declPtr(block.src_decl), base_src, wanted);
21010	}	21015	}
21011		21016
21012	fn resolveExportOptions(	21017	fn resolveExportOptions(
...	@@ -23067,7 +23072,7 @@ fn zirBuiltinExtern(	...	@@ -23067,7 +23072,7 @@ fn zirBuiltinExtern(
23067	const msg = try sema.errMsg(block, ty_src, "extern symbol cannot have type '{}'", .{ty.fmt(mod)});	23072	const msg = try sema.errMsg(block, ty_src, "extern symbol cannot have type '{}'", .{ty.fmt(mod)});
23068	errdefer msg.destroy(sema.gpa);	23073	errdefer msg.destroy(sema.gpa);
23069	const src_decl = sema.mod.declPtr(block.src_decl);	23074	const src_decl = sema.mod.declPtr(block.src_decl);
23070	try sema.explainWhyTypeIsNotExtern(msg, ty_src.toSrcLoc(src_decl), ty, .other);	23075	try sema.explainWhyTypeIsNotExtern(msg, ty_src.toSrcLoc(src_decl, mod), ty, .other);
23071	break :msg msg;	23076	break :msg msg;
23072	};	23077	};
23073	return sema.failWithOwnedErrorMsg(msg);	23078	return sema.failWithOwnedErrorMsg(msg);
...	@@ -23087,9 +23092,9 @@ fn zirBuiltinExtern(	...	@@ -23087,9 +23092,9 @@ fn zirBuiltinExtern(
23087		23092
23088	// TODO check duplicate extern	23093	// TODO check duplicate extern
23089		23094
23090	const new_decl_index = try sema.mod.allocateNewDecl(sema.owner_decl.src_namespace, sema.owner_decl.src_node, null);	23095	const new_decl_index = try mod.allocateNewDecl(sema.owner_decl.src_namespace, sema.owner_decl.src_node, null);
23091	errdefer sema.mod.destroyDecl(new_decl_index);	23096	errdefer mod.destroyDecl(new_decl_index);
23092	const new_decl = sema.mod.declPtr(new_decl_index);	23097	const new_decl = mod.declPtr(new_decl_index);
23093	new_decl.name = try sema.gpa.dupeZ(u8, options.name);	23098	new_decl.name = try sema.gpa.dupeZ(u8, options.name);
23094		23099
23095	{	23100	{
...	@@ -23117,12 +23122,12 @@ fn zirBuiltinExtern(	...	@@ -23117,12 +23122,12 @@ fn zirBuiltinExtern(
23117	new_decl.@"linksection" = null;	23122	new_decl.@"linksection" = null;
23118	new_decl.has_tv = true;	23123	new_decl.has_tv = true;
23119	new_decl.analysis = .complete;	23124	new_decl.analysis = .complete;
23120	new_decl.generation = sema.mod.generation;	23125	new_decl.generation = mod.generation;
23121		23126
23122	try new_decl.finalizeNewArena(&new_decl_arena);	23127	try new_decl.finalizeNewArena(&new_decl_arena);
23123	}	23128	}
23124		23129
23125	try sema.mod.declareDeclDependency(sema.owner_decl_index, new_decl_index);	23130	try mod.declareDeclDependency(sema.owner_decl_index, new_decl_index);
23126	try sema.ensureDeclAnalyzed(new_decl_index);	23131	try sema.ensureDeclAnalyzed(new_decl_index);
23127		23132
23128	const ref = try Value.Tag.decl_ref.create(sema.arena, new_decl_index);	23133	const ref = try Value.Tag.decl_ref.create(sema.arena, new_decl_index);
...	@@ -23209,7 +23214,7 @@ fn validateVarType(	...	@@ -23209,7 +23214,7 @@ fn validateVarType(
23209	const msg = try sema.errMsg(block, src, "extern variable cannot have type '{}'", .{var_ty.fmt(mod)});	23214	const msg = try sema.errMsg(block, src, "extern variable cannot have type '{}'", .{var_ty.fmt(mod)});
23210	errdefer msg.destroy(sema.gpa);	23215	errdefer msg.destroy(sema.gpa);
23211	const src_decl = mod.declPtr(block.src_decl);	23216	const src_decl = mod.declPtr(block.src_decl);
23212	try sema.explainWhyTypeIsNotExtern(msg, src.toSrcLoc(src_decl), var_ty, .other);	23217	try sema.explainWhyTypeIsNotExtern(msg, src.toSrcLoc(src_decl, mod), var_ty, .other);
23213	break :msg msg;	23218	break :msg msg;
23214	};	23219	};
23215	return sema.failWithOwnedErrorMsg(msg);	23220	return sema.failWithOwnedErrorMsg(msg);
...	@@ -23222,7 +23227,7 @@ fn validateVarType(	...	@@ -23222,7 +23227,7 @@ fn validateVarType(
23222	errdefer msg.destroy(sema.gpa);	23227	errdefer msg.destroy(sema.gpa);
23223		23228
23224	const src_decl = mod.declPtr(block.src_decl);	23229	const src_decl = mod.declPtr(block.src_decl);
23225	try sema.explainWhyTypeIsComptime(msg, src.toSrcLoc(src_decl), var_ty);	23230	try sema.explainWhyTypeIsComptime(msg, src.toSrcLoc(src_decl, mod), var_ty);
23226	if (var_ty.zigTypeTag(mod) == .ComptimeInt or var_ty.zigTypeTag(mod) == .ComptimeFloat) {	23231	if (var_ty.zigTypeTag(mod) == .ComptimeInt or var_ty.zigTypeTag(mod) == .ComptimeFloat) {
23227	try sema.errNote(block, src, msg, "to modify this variable at runtime, it must be given an explicit fixed-size number type", .{});	23232	try sema.errNote(block, src, msg, "to modify this variable at runtime, it must be given an explicit fixed-size number type", .{});
23228	}	23233	}
...	@@ -23939,11 +23944,12 @@ fn safetyPanic(	...	@@ -23939,11 +23944,12 @@ fn safetyPanic(
23939	block: *Block,	23944	block: *Block,
23940	panic_id: PanicId,	23945	panic_id: PanicId,
23941	) CompileError!void {	23946	) CompileError!void {
		23947	const mod = sema.mod;
23942	const panic_messages_ty = try sema.getBuiltinType("panic_messages");	23948	const panic_messages_ty = try sema.getBuiltinType("panic_messages");
23943	const msg_decl_index = (try sema.namespaceLookup(	23949	const msg_decl_index = (try sema.namespaceLookup(
23944	block,	23950	block,
23945	sema.src,	23951	sema.src,
23946	panic_messages_ty.getNamespace().?,	23952	panic_messages_ty.getNamespaceIndex(mod).unwrap().?,
23947	@tagName(panic_id),	23953	@tagName(panic_id),
23948	)).?;	23954	)).?;
23949		23955
...	@@ -24006,7 +24012,7 @@ fn fieldVal(	...	@@ -24006,7 +24012,7 @@ fn fieldVal(
24006	);	24012	);
24007	} else if (mem.eql(u8, field_name, "ptr") and is_pointer_to) {	24013	} else if (mem.eql(u8, field_name, "ptr") and is_pointer_to) {
24008	const ptr_info = object_ty.ptrInfo(mod);	24014	const ptr_info = object_ty.ptrInfo(mod);
24009	const result_ty = try Type.ptr(sema.arena, sema.mod, .{	24015	const result_ty = try Type.ptr(sema.arena, mod, .{
24010	.pointee_type = ptr_info.pointee_type.childType(mod),	24016	.pointee_type = ptr_info.pointee_type.childType(mod),
24011	.sentinel = ptr_info.sentinel,	24017	.sentinel = ptr_info.sentinel,
24012	.@"align" = ptr_info.@"align",	24018	.@"align" = ptr_info.@"align",
...	@@ -24025,7 +24031,7 @@ fn fieldVal(	...	@@ -24025,7 +24031,7 @@ fn fieldVal(
24025	block,	24031	block,
24026	field_name_src,	24032	field_name_src,
24027	"no member named '{s}' in '{}'",	24033	"no member named '{s}' in '{}'",
24028	.{ field_name, object_ty.fmt(sema.mod) },	24034	.{ field_name, object_ty.fmt(mod) },
24029	);	24035	);
24030	}	24036	}
24031	},	24037	},
...	@@ -24049,7 +24055,7 @@ fn fieldVal(	...	@@ -24049,7 +24055,7 @@ fn fieldVal(
24049	block,	24055	block,
24050	field_name_src,	24056	field_name_src,
24051	"no member named '{s}' in '{}'",	24057	"no member named '{s}' in '{}'",
24052	.{ field_name, object_ty.fmt(sema.mod) },	24058	.{ field_name, object_ty.fmt(mod) },
24053	);	24059	);
24054	}	24060	}
24055	}	24061	}
...	@@ -24071,14 +24077,14 @@ fn fieldVal(	...	@@ -24071,14 +24077,14 @@ fn fieldVal(
24071	}	24077	}
24072	const msg = msg: {	24078	const msg = msg: {
24073	const msg = try sema.errMsg(block, src, "no error named '{s}' in '{}'", .{	24079	const msg = try sema.errMsg(block, src, "no error named '{s}' in '{}'", .{
24074	field_name, child_type.fmt(sema.mod),	24080	field_name, child_type.fmt(mod),
24075	});	24081	});
24076	errdefer msg.destroy(sema.gpa);	24082	errdefer msg.destroy(sema.gpa);
24077	try sema.addDeclaredHereNote(msg, child_type);	24083	try sema.addDeclaredHereNote(msg, child_type);
24078	break :msg msg;	24084	break :msg msg;
24079	};	24085	};
24080	return sema.failWithOwnedErrorMsg(msg);	24086	return sema.failWithOwnedErrorMsg(msg);
24081	} else (try sema.mod.getErrorValue(field_name)).key;	24087	} else (try mod.getErrorValue(field_name)).key;
24082		24088
24083	return sema.addConstant(	24089	return sema.addConstant(
24084	if (!child_type.isAnyError())	24090	if (!child_type.isAnyError())
...	@@ -24089,7 +24095,7 @@ fn fieldVal(	...	@@ -24089,7 +24095,7 @@ fn fieldVal(
24089	);	24095	);
24090	},	24096	},
24091	.Union => {	24097	.Union => {
24092	if (child_type.getNamespace()) \|namespace\| {	24098	if (child_type.getNamespaceIndex(mod).unwrap()) \|namespace\| {
24093	if (try sema.namespaceLookupVal(block, src, namespace, field_name)) \|inst\| {	24099	if (try sema.namespaceLookupVal(block, src, namespace, field_name)) \|inst\| {
24094	return inst;	24100	return inst;
24095	}	24101	}
...	@@ -24107,7 +24113,7 @@ fn fieldVal(	...	@@ -24107,7 +24113,7 @@ fn fieldVal(
24107	return sema.failWithBadMemberAccess(block, union_ty, field_name_src, field_name);	24113	return sema.failWithBadMemberAccess(block, union_ty, field_name_src, field_name);
24108	},	24114	},
24109	.Enum => {	24115	.Enum => {
24110	if (child_type.getNamespace()) \|namespace\| {	24116	if (child_type.getNamespaceIndex(mod).unwrap()) \|namespace\| {
24111	if (try sema.namespaceLookupVal(block, src, namespace, field_name)) \|inst\| {	24117	if (try sema.namespaceLookupVal(block, src, namespace, field_name)) \|inst\| {
24112	return inst;	24118	return inst;
24113	}	24119	}
...	@@ -24119,7 +24125,7 @@ fn fieldVal(	...	@@ -24119,7 +24125,7 @@ fn fieldVal(
24119	return sema.addConstant(try child_type.copy(arena), enum_val);	24125	return sema.addConstant(try child_type.copy(arena), enum_val);
24120	},	24126	},
24121	.Struct, .Opaque => {	24127	.Struct, .Opaque => {
24122	if (child_type.getNamespace()) \|namespace\| {	24128	if (child_type.getNamespaceIndex(mod).unwrap()) \|namespace\| {
24123	if (try sema.namespaceLookupVal(block, src, namespace, field_name)) \|inst\| {	24129	if (try sema.namespaceLookupVal(block, src, namespace, field_name)) \|inst\| {
24124	return inst;	24130	return inst;
24125	}	24131	}
...	@@ -24128,7 +24134,7 @@ fn fieldVal(	...	@@ -24128,7 +24134,7 @@ fn fieldVal(
24128	},	24134	},
24129	else => {	24135	else => {
24130	const msg = msg: {	24136	const msg = msg: {
24131	const msg = try sema.errMsg(block, src, "type '{}' has no members", .{child_type.fmt(sema.mod)});	24137	const msg = try sema.errMsg(block, src, "type '{}' has no members", .{child_type.fmt(mod)});
24132	errdefer msg.destroy(sema.gpa);	24138	errdefer msg.destroy(sema.gpa);
24133	if (child_type.isSlice(mod)) try sema.errNote(block, src, msg, "slice values have 'len' and 'ptr' members", .{});	24139	if (child_type.isSlice(mod)) try sema.errNote(block, src, msg, "slice values have 'len' and 'ptr' members", .{});
24134	if (child_type.zigTypeTag(mod) == .Array) try sema.errNote(block, src, msg, "array values have 'len' member", .{});	24140	if (child_type.zigTypeTag(mod) == .Array) try sema.errNote(block, src, msg, "array values have 'len' member", .{});
...	@@ -24174,7 +24180,7 @@ fn fieldPtr(	...	@@ -24174,7 +24180,7 @@ fn fieldPtr(
24174	const object_ptr_ty = sema.typeOf(object_ptr);	24180	const object_ptr_ty = sema.typeOf(object_ptr);
24175	const object_ty = switch (object_ptr_ty.zigTypeTag(mod)) {	24181	const object_ty = switch (object_ptr_ty.zigTypeTag(mod)) {
24176	.Pointer => object_ptr_ty.childType(mod),	24182	.Pointer => object_ptr_ty.childType(mod),
24177	else => return sema.fail(block, object_ptr_src, "expected pointer, found '{}'", .{object_ptr_ty.fmt(sema.mod)}),	24183	else => return sema.fail(block, object_ptr_src, "expected pointer, found '{}'", .{object_ptr_ty.fmt(mod)}),
24178	};	24184	};
24179		24185
24180	// Zig allows dereferencing a single pointer during field lookup. Note that	24186	// Zig allows dereferencing a single pointer during field lookup. Note that
...	@@ -24202,7 +24208,7 @@ fn fieldPtr(	...	@@ -24202,7 +24208,7 @@ fn fieldPtr(
24202	block,	24208	block,
24203	field_name_src,	24209	field_name_src,
24204	"no member named '{s}' in '{}'",	24210	"no member named '{s}' in '{}'",
24205	.{ field_name, object_ty.fmt(sema.mod) },	24211	.{ field_name, object_ty.fmt(mod) },
24206	);	24212	);
24207	}	24213	}
24208	},	24214	},
...	@@ -24218,7 +24224,7 @@ fn fieldPtr(	...	@@ -24218,7 +24224,7 @@ fn fieldPtr(
24218	const buf = try sema.arena.create(Type.SlicePtrFieldTypeBuffer);	24224	const buf = try sema.arena.create(Type.SlicePtrFieldTypeBuffer);
24219	const slice_ptr_ty = inner_ty.slicePtrFieldType(buf, mod);	24225	const slice_ptr_ty = inner_ty.slicePtrFieldType(buf, mod);
24220		24226
24221	const result_ty = try Type.ptr(sema.arena, sema.mod, .{	24227	const result_ty = try Type.ptr(sema.arena, mod, .{
24222	.pointee_type = slice_ptr_ty,	24228	.pointee_type = slice_ptr_ty,
24223	.mutable = attr_ptr_ty.ptrIsMutable(mod),	24229	.mutable = attr_ptr_ty.ptrIsMutable(mod),
24224	.@"volatile" = attr_ptr_ty.isVolatilePtr(mod),	24230	.@"volatile" = attr_ptr_ty.isVolatilePtr(mod),
...	@@ -24239,7 +24245,7 @@ fn fieldPtr(	...	@@ -24239,7 +24245,7 @@ fn fieldPtr(
24239		24245
24240	return block.addTyOp(.ptr_slice_ptr_ptr, result_ty, inner_ptr);	24246	return block.addTyOp(.ptr_slice_ptr_ptr, result_ty, inner_ptr);
24241	} else if (mem.eql(u8, field_name, "len")) {	24247	} else if (mem.eql(u8, field_name, "len")) {
24242	const result_ty = try Type.ptr(sema.arena, sema.mod, .{	24248	const result_ty = try Type.ptr(sema.arena, mod, .{
24243	.pointee_type = Type.usize,	24249	.pointee_type = Type.usize,
24244	.mutable = attr_ptr_ty.ptrIsMutable(mod),	24250	.mutable = attr_ptr_ty.ptrIsMutable(mod),
24245	.@"volatile" = attr_ptr_ty.isVolatilePtr(mod),	24251	.@"volatile" = attr_ptr_ty.isVolatilePtr(mod),
...	@@ -24264,7 +24270,7 @@ fn fieldPtr(	...	@@ -24264,7 +24270,7 @@ fn fieldPtr(
24264	block,	24270	block,
24265	field_name_src,	24271	field_name_src,
24266	"no member named '{s}' in '{}'",	24272	"no member named '{s}' in '{}'",
24267	.{ field_name, object_ty.fmt(sema.mod) },	24273	.{ field_name, object_ty.fmt(mod) },
24268	);	24274	);
24269	}	24275	}
24270	},	24276	},
...	@@ -24287,9 +24293,9 @@ fn fieldPtr(	...	@@ -24287,9 +24293,9 @@ fn fieldPtr(
24287	break :blk entry.key_ptr.*;	24293	break :blk entry.key_ptr.*;
24288	}	24294	}
24289	return sema.fail(block, src, "no error named '{s}' in '{}'", .{	24295	return sema.fail(block, src, "no error named '{s}' in '{}'", .{
24290	field_name, child_type.fmt(sema.mod),	24296	field_name, child_type.fmt(mod),
24291	});	24297	});
24292	} else (try sema.mod.getErrorValue(field_name)).key;	24298	} else (try mod.getErrorValue(field_name)).key;
24293		24299
24294	var anon_decl = try block.startAnonDecl();	24300	var anon_decl = try block.startAnonDecl();
24295	defer anon_decl.deinit();	24301	defer anon_decl.deinit();
...	@@ -24303,7 +24309,7 @@ fn fieldPtr(	...	@@ -24303,7 +24309,7 @@ fn fieldPtr(
24303	));	24309	));
24304	},	24310	},
24305	.Union => {	24311	.Union => {
24306	if (child_type.getNamespace()) \|namespace\| {	24312	if (child_type.getNamespaceIndex(mod).unwrap()) \|namespace\| {
24307	if (try sema.namespaceLookupRef(block, src, namespace, field_name)) \|inst\| {	24313	if (try sema.namespaceLookupRef(block, src, namespace, field_name)) \|inst\| {
24308	return inst;	24314	return inst;
24309	}	24315	}
...	@@ -24324,7 +24330,7 @@ fn fieldPtr(	...	@@ -24324,7 +24330,7 @@ fn fieldPtr(
24324	return sema.failWithBadMemberAccess(block, child_type, field_name_src, field_name);	24330	return sema.failWithBadMemberAccess(block, child_type, field_name_src, field_name);
24325	},	24331	},
24326	.Enum => {	24332	.Enum => {
24327	if (child_type.getNamespace()) \|namespace\| {	24333	if (child_type.getNamespaceIndex(mod).unwrap()) \|namespace\| {
24328	if (try sema.namespaceLookupRef(block, src, namespace, field_name)) \|inst\| {	24334	if (try sema.namespaceLookupRef(block, src, namespace, field_name)) \|inst\| {
24329	return inst;	24335	return inst;
24330	}	24336	}
...	@@ -24342,14 +24348,14 @@ fn fieldPtr(	...	@@ -24342,14 +24348,14 @@ fn fieldPtr(
24342	));	24348	));
24343	},	24349	},
24344	.Struct, .Opaque => {	24350	.Struct, .Opaque => {
24345	if (child_type.getNamespace()) \|namespace\| {	24351	if (child_type.getNamespaceIndex(mod).unwrap()) \|namespace\| {
24346	if (try sema.namespaceLookupRef(block, src, namespace, field_name)) \|inst\| {	24352	if (try sema.namespaceLookupRef(block, src, namespace, field_name)) \|inst\| {
24347	return inst;	24353	return inst;
24348	}	24354	}
24349	}	24355	}
24350	return sema.failWithBadMemberAccess(block, child_type, field_name_src, field_name);	24356	return sema.failWithBadMemberAccess(block, child_type, field_name_src, field_name);
24351	},	24357	},
24352	else => return sema.fail(block, src, "type '{}' has no members", .{child_type.fmt(sema.mod)}),	24358	else => return sema.fail(block, src, "type '{}' has no members", .{child_type.fmt(mod)}),
24353	}	24359	}
24354	},	24360	},
24355	.Struct => {	24361	.Struct => {
...	@@ -24398,7 +24404,7 @@ fn fieldCallBind(	...	@@ -24398,7 +24404,7 @@ fn fieldCallBind(
24398	const inner_ty = if (raw_ptr_ty.zigTypeTag(mod) == .Pointer and (raw_ptr_ty.ptrSize(mod) == .One or raw_ptr_ty.ptrSize(mod) == .C))	24404	const inner_ty = if (raw_ptr_ty.zigTypeTag(mod) == .Pointer and (raw_ptr_ty.ptrSize(mod) == .One or raw_ptr_ty.ptrSize(mod) == .C))
24399	raw_ptr_ty.childType(mod)	24405	raw_ptr_ty.childType(mod)
24400	else	24406	else
24401	return sema.fail(block, raw_ptr_src, "expected single pointer, found '{}'", .{raw_ptr_ty.fmt(sema.mod)});	24407	return sema.fail(block, raw_ptr_src, "expected single pointer, found '{}'", .{raw_ptr_ty.fmt(mod)});
24402		24408
24403	// Optionally dereference a second pointer to get the concrete type.	24409	// Optionally dereference a second pointer to get the concrete type.
24404	const is_double_ptr = inner_ty.zigTypeTag(mod) == .Pointer and inner_ty.ptrSize(mod) == .One;	24410	const is_double_ptr = inner_ty.zigTypeTag(mod) == .Pointer and inner_ty.ptrSize(mod) == .One;
...	@@ -24458,7 +24464,7 @@ fn fieldCallBind(	...	@@ -24458,7 +24464,7 @@ fn fieldCallBind(
24458	// If we get here, we need to look for a decl in the struct type instead.	24464	// If we get here, we need to look for a decl in the struct type instead.
24459	const found_decl = switch (concrete_ty.zigTypeTag(mod)) {	24465	const found_decl = switch (concrete_ty.zigTypeTag(mod)) {
24460	.Struct, .Opaque, .Union, .Enum => found_decl: {	24466	.Struct, .Opaque, .Union, .Enum => found_decl: {
24461	if (concrete_ty.getNamespace()) \|namespace\| {	24467	if (concrete_ty.getNamespaceIndex(mod).unwrap()) \|namespace\| {
24462	if (try sema.namespaceLookup(block, src, namespace, field_name)) \|decl_idx\| {	24468	if (try sema.namespaceLookup(block, src, namespace, field_name)) \|decl_idx\| {
24463	try sema.addReferencedBy(block, src, decl_idx);	24469	try sema.addReferencedBy(block, src, decl_idx);
24464	const decl_val = try sema.analyzeDeclVal(block, src, decl_idx);	24470	const decl_val = try sema.analyzeDeclVal(block, src, decl_idx);
...	@@ -24472,7 +24478,7 @@ fn fieldCallBind(	...	@@ -24472,7 +24478,7 @@ fn fieldCallBind(
24472	first_param_type.zigTypeTag(mod) == .Pointer and	24478	first_param_type.zigTypeTag(mod) == .Pointer and
24473	(first_param_type.ptrSize(mod) == .One or	24479	(first_param_type.ptrSize(mod) == .One or
24474	first_param_type.ptrSize(mod) == .C) and	24480	first_param_type.ptrSize(mod) == .C) and
24475	first_param_type.childType(mod).eql(concrete_ty, sema.mod)))	24481	first_param_type.childType(mod).eql(concrete_ty, mod)))
24476	{	24482	{
24477	// zig fmt: on	24483	// zig fmt: on
24478	// Note that if the param type is generic poison, we know that it must	24484	// Note that if the param type is generic poison, we know that it must
...	@@ -24484,7 +24490,7 @@ fn fieldCallBind(	...	@@ -24484,7 +24490,7 @@ fn fieldCallBind(
24484	.func_inst = decl_val,	24490	.func_inst = decl_val,
24485	.arg0_inst = object_ptr,	24491	.arg0_inst = object_ptr,
24486	} };	24492	} };
24487	} else if (first_param_type.eql(concrete_ty, sema.mod)) {	24493	} else if (first_param_type.eql(concrete_ty, mod)) {
24488	const deref = try sema.analyzeLoad(block, src, object_ptr, src);	24494	const deref = try sema.analyzeLoad(block, src, object_ptr, src);
24489	return .{ .method = .{	24495	return .{ .method = .{
24490	.func_inst = decl_val,	24496	.func_inst = decl_val,
...	@@ -24492,7 +24498,7 @@ fn fieldCallBind(	...	@@ -24492,7 +24498,7 @@ fn fieldCallBind(
24492	} };	24498	} };
24493	} else if (first_param_type.zigTypeTag(mod) == .Optional) {	24499	} else if (first_param_type.zigTypeTag(mod) == .Optional) {
24494	const child = first_param_type.optionalChild(mod);	24500	const child = first_param_type.optionalChild(mod);
24495	if (child.eql(concrete_ty, sema.mod)) {	24501	if (child.eql(concrete_ty, mod)) {
24496	const deref = try sema.analyzeLoad(block, src, object_ptr, src);	24502	const deref = try sema.analyzeLoad(block, src, object_ptr, src);
24497	return .{ .method = .{	24503	return .{ .method = .{
24498	.func_inst = decl_val,	24504	.func_inst = decl_val,
...	@@ -24500,7 +24506,7 @@ fn fieldCallBind(	...	@@ -24500,7 +24506,7 @@ fn fieldCallBind(
24500	} };	24506	} };
24501	} else if (child.zigTypeTag(mod) == .Pointer and	24507	} else if (child.zigTypeTag(mod) == .Pointer and
24502	child.ptrSize(mod) == .One and	24508	child.ptrSize(mod) == .One and
24503	child.childType(mod).eql(concrete_ty, sema.mod))	24509	child.childType(mod).eql(concrete_ty, mod))
24504	{	24510	{
24505	return .{ .method = .{	24511	return .{ .method = .{
24506	.func_inst = decl_val,	24512	.func_inst = decl_val,
...	@@ -24508,7 +24514,7 @@ fn fieldCallBind(	...	@@ -24508,7 +24514,7 @@ fn fieldCallBind(
24508	} };	24514	} };
24509	}	24515	}
24510	} else if (first_param_type.zigTypeTag(mod) == .ErrorUnion and	24516	} else if (first_param_type.zigTypeTag(mod) == .ErrorUnion and
24511	first_param_type.errorUnionPayload().eql(concrete_ty, sema.mod))	24517	first_param_type.errorUnionPayload().eql(concrete_ty, mod))
24512	{	24518	{
24513	const deref = try sema.analyzeLoad(block, src, object_ptr, src);	24519	const deref = try sema.analyzeLoad(block, src, object_ptr, src);
24514	return .{ .method = .{	24520	return .{ .method = .{
...	@@ -24526,12 +24532,12 @@ fn fieldCallBind(	...	@@ -24526,12 +24532,12 @@ fn fieldCallBind(
24526	};	24532	};
24527		24533
24528	const msg = msg: {	24534	const msg = msg: {
24529	const msg = try sema.errMsg(block, src, "no field or member function named '{s}' in '{}'", .{ field_name, concrete_ty.fmt(sema.mod) });	24535	const msg = try sema.errMsg(block, src, "no field or member function named '{s}' in '{}'", .{ field_name, concrete_ty.fmt(mod) });
24530	errdefer msg.destroy(sema.gpa);	24536	errdefer msg.destroy(sema.gpa);
24531	try sema.addDeclaredHereNote(msg, concrete_ty);	24537	try sema.addDeclaredHereNote(msg, concrete_ty);
24532	if (found_decl) \|decl_idx\| {	24538	if (found_decl) \|decl_idx\| {
24533	const decl = sema.mod.declPtr(decl_idx);	24539	const decl = mod.declPtr(decl_idx);
24534	try sema.mod.errNoteNonLazy(decl.srcLoc(), msg, "'{s}' is not a member function", .{field_name});	24540	try mod.errNoteNonLazy(decl.srcLoc(mod), msg, "'{s}' is not a member function", .{field_name});
24535	}	24541	}
24536	break :msg msg;	24542	break :msg msg;
24537	};	24543	};
...	@@ -24549,7 +24555,7 @@ fn finishFieldCallBind(	...	@@ -24549,7 +24555,7 @@ fn finishFieldCallBind(
24549	) CompileError!ResolvedFieldCallee {	24555	) CompileError!ResolvedFieldCallee {
24550	const mod = sema.mod;	24556	const mod = sema.mod;
24551	const arena = sema.arena;	24557	const arena = sema.arena;
24552	const ptr_field_ty = try Type.ptr(arena, sema.mod, .{	24558	const ptr_field_ty = try Type.ptr(arena, mod, .{
24553	.pointee_type = field_ty,	24559	.pointee_type = field_ty,
24554	.mutable = ptr_ty.ptrIsMutable(mod),	24560	.mutable = ptr_ty.ptrIsMutable(mod),
24555	.@"addrspace" = ptr_ty.ptrAddressSpace(mod),	24561	.@"addrspace" = ptr_ty.ptrAddressSpace(mod),
...	@@ -24583,19 +24589,20 @@ fn namespaceLookup(	...	@@ -24583,19 +24589,20 @@ fn namespaceLookup(
24583	sema: *Sema,	24589	sema: *Sema,
24584	block: *Block,	24590	block: *Block,
24585	src: LazySrcLoc,	24591	src: LazySrcLoc,
24586	namespace: *Namespace,	24592	namespace: Namespace.Index,
24587	decl_name: []const u8,	24593	decl_name: []const u8,
24588	) CompileError!?Decl.Index {	24594	) CompileError!?Decl.Index {
		24595	const mod = sema.mod;
24589	const gpa = sema.gpa;	24596	const gpa = sema.gpa;
24590	if (try sema.lookupInNamespace(block, src, namespace, decl_name, true)) \|decl_index\| {	24597	if (try sema.lookupInNamespace(block, src, namespace, decl_name, true)) \|decl_index\| {
24591	const decl = sema.mod.declPtr(decl_index);	24598	const decl = mod.declPtr(decl_index);
24592	if (!decl.is_pub and decl.getFileScope() != block.getFileScope()) {	24599	if (!decl.is_pub and decl.getFileScope(mod) != block.getFileScope(mod)) {
24593	const msg = msg: {	24600	const msg = msg: {
24594	const msg = try sema.errMsg(block, src, "'{s}' is not marked 'pub'", .{	24601	const msg = try sema.errMsg(block, src, "'{s}' is not marked 'pub'", .{
24595	decl_name,	24602	decl_name,
24596	});	24603	});
24597	errdefer msg.destroy(gpa);	24604	errdefer msg.destroy(gpa);
24598	try sema.mod.errNoteNonLazy(decl.srcLoc(), msg, "declared here", .{});	24605	try mod.errNoteNonLazy(decl.srcLoc(mod), msg, "declared here", .{});
24599	break :msg msg;	24606	break :msg msg;
24600	};	24607	};
24601	return sema.failWithOwnedErrorMsg(msg);	24608	return sema.failWithOwnedErrorMsg(msg);
...	@@ -24609,7 +24616,7 @@ fn namespaceLookupRef(	...	@@ -24609,7 +24616,7 @@ fn namespaceLookupRef(
24609	sema: *Sema,	24616	sema: *Sema,
24610	block: *Block,	24617	block: *Block,
24611	src: LazySrcLoc,	24618	src: LazySrcLoc,
24612	namespace: *Namespace,	24619	namespace: Namespace.Index,
24613	decl_name: []const u8,	24620	decl_name: []const u8,
24614	) CompileError!?Air.Inst.Ref {	24621	) CompileError!?Air.Inst.Ref {
24615	const decl = (try sema.namespaceLookup(block, src, namespace, decl_name)) orelse return null;	24622	const decl = (try sema.namespaceLookup(block, src, namespace, decl_name)) orelse return null;
...	@@ -24621,7 +24628,7 @@ fn namespaceLookupVal(	...	@@ -24621,7 +24628,7 @@ fn namespaceLookupVal(
24621	sema: *Sema,	24628	sema: *Sema,
24622	block: *Block,	24629	block: *Block,
24623	src: LazySrcLoc,	24630	src: LazySrcLoc,
24624	namespace: *Namespace,	24631	namespace: Namespace.Index,
24625	decl_name: []const u8,	24632	decl_name: []const u8,
24626	) CompileError!?Air.Inst.Ref {	24633	) CompileError!?Air.Inst.Ref {
24627	const decl = (try sema.namespaceLookup(block, src, namespace, decl_name)) orelse return null;	24634	const decl = (try sema.namespaceLookup(block, src, namespace, decl_name)) orelse return null;
...	@@ -24692,7 +24699,7 @@ fn structFieldPtrByIndex(	...	@@ -24692,7 +24699,7 @@ fn structFieldPtrByIndex(
24692	.@"addrspace" = struct_ptr_ty_info.@"addrspace",	24699	.@"addrspace" = struct_ptr_ty_info.@"addrspace",
24693	};	24700	};
24694		24701
24695	const target = sema.mod.getTarget();	24702	const target = mod.getTarget();
24696		24703
24697	if (struct_obj.layout == .Packed) {	24704	if (struct_obj.layout == .Packed) {
24698	comptime assert(Type.packed_struct_layout_version == 2);	24705	comptime assert(Type.packed_struct_layout_version == 2);
...	@@ -24746,7 +24753,7 @@ fn structFieldPtrByIndex(	...	@@ -24746,7 +24753,7 @@ fn structFieldPtrByIndex(
24746	ptr_ty_data.@"align" = field.abi_align;	24753	ptr_ty_data.@"align" = field.abi_align;
24747	}	24754	}
24748		24755
24749	const ptr_field_ty = try Type.ptr(sema.arena, sema.mod, ptr_ty_data);	24756	const ptr_field_ty = try Type.ptr(sema.arena, mod, ptr_ty_data);
24750		24757
24751	if (field.is_comptime) {	24758	if (field.is_comptime) {
24752	const val = try Value.Tag.comptime_field_ptr.create(sema.arena, .{	24759	const val = try Value.Tag.comptime_field_ptr.create(sema.arena, .{
...	@@ -24848,16 +24855,17 @@ fn tupleFieldIndex(	...	@@ -24848,16 +24855,17 @@ fn tupleFieldIndex(
24848	field_name: []const u8,	24855	field_name: []const u8,
24849	field_name_src: LazySrcLoc,	24856	field_name_src: LazySrcLoc,
24850	) CompileError!u32 {	24857	) CompileError!u32 {
		24858	const mod = sema.mod;
24851	assert(!std.mem.eql(u8, field_name, "len"));	24859	assert(!std.mem.eql(u8, field_name, "len"));
24852	if (std.fmt.parseUnsigned(u32, field_name, 10)) \|field_index\| {	24860	if (std.fmt.parseUnsigned(u32, field_name, 10)) \|field_index\| {
24853	if (field_index < tuple_ty.structFieldCount()) return field_index;	24861	if (field_index < tuple_ty.structFieldCount()) return field_index;
24854	return sema.fail(block, field_name_src, "index '{s}' out of bounds of tuple '{}'", .{	24862	return sema.fail(block, field_name_src, "index '{s}' out of bounds of tuple '{}'", .{
24855	field_name, tuple_ty.fmt(sema.mod),	24863	field_name, tuple_ty.fmt(mod),
24856	});	24864	});
24857	} else \|_\| {}	24865	} else \|_\| {}
24858		24866
24859	return sema.fail(block, field_name_src, "no field named '{s}' in tuple '{}'", .{	24867	return sema.fail(block, field_name_src, "no field named '{s}' in tuple '{}'", .{
24860	field_name, tuple_ty.fmt(sema.mod),	24868	field_name, tuple_ty.fmt(mod),
24861	});	24869	});
24862	}	24870	}
24863		24871
...	@@ -24913,7 +24921,7 @@ fn unionFieldPtr(	...	@@ -24913,7 +24921,7 @@ fn unionFieldPtr(
24913	const union_obj = union_ty.cast(Type.Payload.Union).?.data;	24921	const union_obj = union_ty.cast(Type.Payload.Union).?.data;
24914	const field_index = try sema.unionFieldIndex(block, union_ty, field_name, field_name_src);	24922	const field_index = try sema.unionFieldIndex(block, union_ty, field_name, field_name_src);
24915	const field = union_obj.fields.values()[field_index];	24923	const field = union_obj.fields.values()[field_index];
24916	const ptr_field_ty = try Type.ptr(arena, sema.mod, .{	24924	const ptr_field_ty = try Type.ptr(arena, mod, .{
24917	.pointee_type = field.ty,	24925	.pointee_type = field.ty,
24918	.mutable = union_ptr_ty.ptrIsMutable(mod),	24926	.mutable = union_ptr_ty.ptrIsMutable(mod),
24919	.@"volatile" = union_ptr_ty.isVolatilePtr(mod),	24927	.@"volatile" = union_ptr_ty.isVolatilePtr(mod),
...	@@ -24947,7 +24955,7 @@ fn unionFieldPtr(	...	@@ -24947,7 +24955,7 @@ fn unionFieldPtr(
24947	.data = enum_field_index,	24955	.data = enum_field_index,
24948	};	24956	};
24949	const field_tag = Value.initPayload(&field_tag_buf.base);	24957	const field_tag = Value.initPayload(&field_tag_buf.base);
24950	const tag_matches = tag_and_val.tag.eql(field_tag, union_obj.tag_ty, sema.mod);	24958	const tag_matches = tag_and_val.tag.eql(field_tag, union_obj.tag_ty, mod);
24951	if (!tag_matches) {	24959	if (!tag_matches) {
24952	const msg = msg: {	24960	const msg = msg: {
24953	const active_index = tag_and_val.tag.castTag(.enum_field_index).?.data;	24961	const active_index = tag_and_val.tag.castTag(.enum_field_index).?.data;
...	@@ -25017,7 +25025,7 @@ fn unionFieldVal(	...	@@ -25017,7 +25025,7 @@ fn unionFieldVal(
25017	.data = enum_field_index,	25025	.data = enum_field_index,
25018	};	25026	};
25019	const field_tag = Value.initPayload(&field_tag_buf.base);	25027	const field_tag = Value.initPayload(&field_tag_buf.base);
25020	const tag_matches = tag_and_val.tag.eql(field_tag, union_obj.tag_ty, sema.mod);	25028	const tag_matches = tag_and_val.tag.eql(field_tag, union_obj.tag_ty, mod);
25021	switch (union_obj.layout) {	25029	switch (union_obj.layout) {
25022	.Auto => {	25030	.Auto => {
25023	if (tag_matches) {	25031	if (tag_matches) {
...	@@ -25038,7 +25046,7 @@ fn unionFieldVal(	...	@@ -25038,7 +25046,7 @@ fn unionFieldVal(
25038	if (tag_matches) {	25046	if (tag_matches) {
25039	return sema.addConstant(field.ty, tag_and_val.val);	25047	return sema.addConstant(field.ty, tag_and_val.val);
25040	} else {	25048	} else {
25041	const old_ty = union_ty.unionFieldType(tag_and_val.tag, sema.mod);	25049	const old_ty = union_ty.unionFieldType(tag_and_val.tag, mod);
25042	if (try sema.bitCastVal(block, src, tag_and_val.val, old_ty, field.ty, 0)) \|new_val\| {	25050	if (try sema.bitCastVal(block, src, tag_and_val.val, old_ty, field.ty, 0)) \|new_val\| {
25043	return sema.addConstant(field.ty, new_val);	25051	return sema.addConstant(field.ty, new_val);
25044	}	25052	}
...	@@ -25079,7 +25087,7 @@ fn elemPtr(	...	@@ -25079,7 +25087,7 @@ fn elemPtr(
25079		25087
25080	const indexable_ty = switch (indexable_ptr_ty.zigTypeTag(mod)) {	25088	const indexable_ty = switch (indexable_ptr_ty.zigTypeTag(mod)) {
25081	.Pointer => indexable_ptr_ty.childType(mod),	25089	.Pointer => indexable_ptr_ty.childType(mod),
25082	else => return sema.fail(block, indexable_ptr_src, "expected pointer, found '{}'", .{indexable_ptr_ty.fmt(sema.mod)}),	25090	else => return sema.fail(block, indexable_ptr_src, "expected pointer, found '{}'", .{indexable_ptr_ty.fmt(mod)}),
25083	};	25091	};
25084	try checkIndexable(sema, block, src, indexable_ty);	25092	try checkIndexable(sema, block, src, indexable_ty);
25085		25093
...	@@ -25124,7 +25132,7 @@ fn elemPtrOneLayerOnly(	...	@@ -25124,7 +25132,7 @@ fn elemPtrOneLayerOnly(
25124	const ptr_val = maybe_ptr_val orelse break :rs indexable_src;	25132	const ptr_val = maybe_ptr_val orelse break :rs indexable_src;
25125	const index_val = maybe_index_val orelse break :rs elem_index_src;	25133	const index_val = maybe_index_val orelse break :rs elem_index_src;
25126	const index = @intCast(usize, index_val.toUnsignedInt(mod));	25134	const index = @intCast(usize, index_val.toUnsignedInt(mod));
25127	const elem_ptr = try ptr_val.elemPtr(indexable_ty, sema.arena, index, sema.mod);	25135	const elem_ptr = try ptr_val.elemPtr(indexable_ty, sema.arena, index, mod);
25128	const result_ty = try sema.elemPtrType(indexable_ty, index);	25136	const result_ty = try sema.elemPtrType(indexable_ty, index);
25129	return sema.addConstant(result_ty, elem_ptr);	25137	return sema.addConstant(result_ty, elem_ptr);
25130	};	25138	};
...	@@ -25170,7 +25178,7 @@ fn elemVal(	...	@@ -25170,7 +25178,7 @@ fn elemVal(
25170	const indexable_val = maybe_indexable_val orelse break :rs indexable_src;	25178	const indexable_val = maybe_indexable_val orelse break :rs indexable_src;
25171	const index_val = maybe_index_val orelse break :rs elem_index_src;	25179	const index_val = maybe_index_val orelse break :rs elem_index_src;
25172	const index = @intCast(usize, index_val.toUnsignedInt(mod));	25180	const index = @intCast(usize, index_val.toUnsignedInt(mod));
25173	const elem_ptr_val = try indexable_val.elemPtr(indexable_ty, sema.arena, index, sema.mod);	25181	const elem_ptr_val = try indexable_val.elemPtr(indexable_ty, sema.arena, index, mod);
25174	if (try sema.pointerDeref(block, indexable_src, elem_ptr_val, indexable_ty)) \|elem_val\| {	25182	if (try sema.pointerDeref(block, indexable_src, elem_ptr_val, indexable_ty)) \|elem_val\| {
25175	return sema.addConstant(indexable_ty.elemType2(mod), elem_val);	25183	return sema.addConstant(indexable_ty.elemType2(mod), elem_val);
25176	}	25184	}
...	@@ -25209,6 +25217,7 @@ fn validateRuntimeElemAccess(	...	@@ -25209,6 +25217,7 @@ fn validateRuntimeElemAccess(
25209	parent_ty: Type,	25217	parent_ty: Type,
25210	parent_src: LazySrcLoc,	25218	parent_src: LazySrcLoc,
25211	) CompileError!void {	25219	) CompileError!void {
		25220	const mod = sema.mod;
25212	const valid_rt = try sema.validateRunTimeType(elem_ty, false);	25221	const valid_rt = try sema.validateRunTimeType(elem_ty, false);
25213	if (!valid_rt) {	25222	if (!valid_rt) {
25214	const msg = msg: {	25223	const msg = msg: {
...	@@ -25216,12 +25225,12 @@ fn validateRuntimeElemAccess(	...	@@ -25216,12 +25225,12 @@ fn validateRuntimeElemAccess(
25216	block,	25225	block,
25217	elem_index_src,	25226	elem_index_src,
25218	"values of type '{}' must be comptime-known, but index value is runtime-known",	25227	"values of type '{}' must be comptime-known, but index value is runtime-known",
25219	.{parent_ty.fmt(sema.mod)},	25228	.{parent_ty.fmt(mod)},
25220	);	25229	);
25221	errdefer msg.destroy(sema.gpa);	25230	errdefer msg.destroy(sema.gpa);
25222		25231
25223	const src_decl = sema.mod.declPtr(block.src_decl);	25232	const src_decl = mod.declPtr(block.src_decl);
25224	try sema.explainWhyTypeIsComptime(msg, parent_src.toSrcLoc(src_decl), parent_ty);	25233	try sema.explainWhyTypeIsComptime(msg, parent_src.toSrcLoc(src_decl, mod), parent_ty);
25225		25234
25226	break :msg msg;	25235	break :msg msg;
25227	};	25236	};
...	@@ -25255,7 +25264,7 @@ fn tupleFieldPtr(	...	@@ -25255,7 +25264,7 @@ fn tupleFieldPtr(
25255	}	25264	}
25256		25265
25257	const field_ty = tuple_ty.structFieldType(field_index);	25266	const field_ty = tuple_ty.structFieldType(field_index);
25258	const ptr_field_ty = try Type.ptr(sema.arena, sema.mod, .{	25267	const ptr_field_ty = try Type.ptr(sema.arena, mod, .{
25259	.pointee_type = field_ty,	25268	.pointee_type = field_ty,
25260	.mutable = tuple_ptr_ty.ptrIsMutable(mod),	25269	.mutable = tuple_ptr_ty.ptrIsMutable(mod),
25261	.@"volatile" = tuple_ptr_ty.isVolatilePtr(mod),	25270	.@"volatile" = tuple_ptr_ty.isVolatilePtr(mod),
...	@@ -25431,7 +25440,7 @@ fn elemPtrArray(	...	@@ -25431,7 +25440,7 @@ fn elemPtrArray(
25431	return sema.addConstUndef(elem_ptr_ty);	25440	return sema.addConstUndef(elem_ptr_ty);
25432	}	25441	}
25433	if (offset) \|index\| {	25442	if (offset) \|index\| {
25434	const elem_ptr = try array_ptr_val.elemPtr(array_ptr_ty, sema.arena, index, sema.mod);	25443	const elem_ptr = try array_ptr_val.elemPtr(array_ptr_ty, sema.arena, index, mod);
25435	return sema.addConstant(elem_ptr_ty, elem_ptr);	25444	return sema.addConstant(elem_ptr_ty, elem_ptr);
25436	}	25445	}
25437	}	25446	}
...	@@ -25476,7 +25485,7 @@ fn elemValSlice(	...	@@ -25476,7 +25485,7 @@ fn elemValSlice(
25476		25485
25477	if (maybe_slice_val) \|slice_val\| {	25486	if (maybe_slice_val) \|slice_val\| {
25478	runtime_src = elem_index_src;	25487	runtime_src = elem_index_src;
25479	const slice_len = slice_val.sliceLen(sema.mod);	25488	const slice_len = slice_val.sliceLen(mod);
25480	const slice_len_s = slice_len + @boolToInt(slice_sent);	25489	const slice_len_s = slice_len + @boolToInt(slice_sent);
25481	if (slice_len_s == 0) {	25490	if (slice_len_s == 0) {
25482	return sema.fail(block, slice_src, "indexing into empty slice is not allowed", .{});	25491	return sema.fail(block, slice_src, "indexing into empty slice is not allowed", .{});
...	@@ -25487,7 +25496,7 @@ fn elemValSlice(	...	@@ -25487,7 +25496,7 @@ fn elemValSlice(
25487	const sentinel_label: []const u8 = if (slice_sent) " +1 (sentinel)" else "";	25496	const sentinel_label: []const u8 = if (slice_sent) " +1 (sentinel)" else "";
25488	return sema.fail(block, elem_index_src, "index {d} outside slice of length {d}{s}", .{ index, slice_len, sentinel_label });	25497	return sema.fail(block, elem_index_src, "index {d} outside slice of length {d}{s}", .{ index, slice_len, sentinel_label });
25489	}	25498	}
25490	const elem_ptr_val = try slice_val.elemPtr(slice_ty, sema.arena, index, sema.mod);	25499	const elem_ptr_val = try slice_val.elemPtr(slice_ty, sema.arena, index, mod);
25491	if (try sema.pointerDeref(block, slice_src, elem_ptr_val, slice_ty)) \|elem_val\| {	25500	if (try sema.pointerDeref(block, slice_src, elem_ptr_val, slice_ty)) \|elem_val\| {
25492	return sema.addConstant(elem_ty, elem_val);	25501	return sema.addConstant(elem_ty, elem_val);
25493	}	25502	}
...	@@ -25500,7 +25509,7 @@ fn elemValSlice(	...	@@ -25500,7 +25509,7 @@ fn elemValSlice(
25500	try sema.requireRuntimeBlock(block, src, runtime_src);	25509	try sema.requireRuntimeBlock(block, src, runtime_src);
25501	if (oob_safety and block.wantSafety()) {	25510	if (oob_safety and block.wantSafety()) {
25502	const len_inst = if (maybe_slice_val) \|slice_val\|	25511	const len_inst = if (maybe_slice_val) \|slice_val\|
25503	try sema.addIntUnsigned(Type.usize, slice_val.sliceLen(sema.mod))	25512	try sema.addIntUnsigned(Type.usize, slice_val.sliceLen(mod))
25504	else	25513	else
25505	try block.addTyOp(.slice_len, Type.usize, slice);	25514	try block.addTyOp(.slice_len, Type.usize, slice);
25506	const cmp_op: Air.Inst.Tag = if (slice_sent) .cmp_lte else .cmp_lt;	25515	const cmp_op: Air.Inst.Tag = if (slice_sent) .cmp_lte else .cmp_lt;
...	@@ -25537,7 +25546,7 @@ fn elemPtrSlice(	...	@@ -25537,7 +25546,7 @@ fn elemPtrSlice(
25537	if (slice_val.isUndef()) {	25546	if (slice_val.isUndef()) {
25538	return sema.addConstUndef(elem_ptr_ty);	25547	return sema.addConstUndef(elem_ptr_ty);
25539	}	25548	}
25540	const slice_len = slice_val.sliceLen(sema.mod);	25549	const slice_len = slice_val.sliceLen(mod);
25541	const slice_len_s = slice_len + @boolToInt(slice_sent);	25550	const slice_len_s = slice_len + @boolToInt(slice_sent);
25542	if (slice_len_s == 0) {	25551	if (slice_len_s == 0) {
25543	return sema.fail(block, slice_src, "indexing into empty slice is not allowed", .{});	25552	return sema.fail(block, slice_src, "indexing into empty slice is not allowed", .{});
...	@@ -25547,7 +25556,7 @@ fn elemPtrSlice(	...	@@ -25547,7 +25556,7 @@ fn elemPtrSlice(
25547	const sentinel_label: []const u8 = if (slice_sent) " +1 (sentinel)" else "";	25556	const sentinel_label: []const u8 = if (slice_sent) " +1 (sentinel)" else "";
25548	return sema.fail(block, elem_index_src, "index {d} outside slice of length {d}{s}", .{ index, slice_len, sentinel_label });	25557	return sema.fail(block, elem_index_src, "index {d} outside slice of length {d}{s}", .{ index, slice_len, sentinel_label });
25549	}	25558	}
25550	const elem_ptr_val = try slice_val.elemPtr(slice_ty, sema.arena, index, sema.mod);	25559	const elem_ptr_val = try slice_val.elemPtr(slice_ty, sema.arena, index, mod);
25551	return sema.addConstant(elem_ptr_ty, elem_ptr_val);	25560	return sema.addConstant(elem_ptr_ty, elem_ptr_val);
25552	}	25561	}
25553	}	25562	}
...	@@ -25560,7 +25569,7 @@ fn elemPtrSlice(	...	@@ -25560,7 +25569,7 @@ fn elemPtrSlice(
25560	const len_inst = len: {	25569	const len_inst = len: {
25561	if (maybe_undef_slice_val) \|slice_val\|	25570	if (maybe_undef_slice_val) \|slice_val\|
25562	if (!slice_val.isUndef())	25571	if (!slice_val.isUndef())
25563	break :len try sema.addIntUnsigned(Type.usize, slice_val.sliceLen(sema.mod));	25572	break :len try sema.addIntUnsigned(Type.usize, slice_val.sliceLen(mod));
25564	break :len try block.addTyOp(.slice_len, Type.usize, slice);	25573	break :len try block.addTyOp(.slice_len, Type.usize, slice);
25565	};	25574	};
25566	const cmp_op: Air.Inst.Tag = if (slice_sent) .cmp_lte else .cmp_lt;	25575	const cmp_op: Air.Inst.Tag = if (slice_sent) .cmp_lte else .cmp_lt;
...	@@ -25602,16 +25611,17 @@ const CoerceOpts = struct {	...	@@ -25602,16 +25611,17 @@ const CoerceOpts = struct {
25602		25611
25603	fn get(info: @This(), sema: *Sema) !?Module.SrcLoc {	25612	fn get(info: @This(), sema: *Sema) !?Module.SrcLoc {
25604	if (info.func_inst == .none) return null;	25613	if (info.func_inst == .none) return null;
		25614	const mod = sema.mod;
25605	const fn_decl = (try sema.funcDeclSrc(info.func_inst)) orelse return null;	25615	const fn_decl = (try sema.funcDeclSrc(info.func_inst)) orelse return null;
25606	const param_src = Module.paramSrc(0, sema.gpa, fn_decl, info.param_i);	25616	const param_src = Module.paramSrc(0, mod, fn_decl, info.param_i);
25607	if (param_src == .node_offset_param) {	25617	if (param_src == .node_offset_param) {
25608	return Module.SrcLoc{	25618	return Module.SrcLoc{
25609	.file_scope = fn_decl.getFileScope(),	25619	.file_scope = fn_decl.getFileScope(mod),
25610	.parent_decl_node = fn_decl.src_node,	25620	.parent_decl_node = fn_decl.src_node,
25611	.lazy = LazySrcLoc.nodeOffset(param_src.node_offset_param),	25621	.lazy = LazySrcLoc.nodeOffset(param_src.node_offset_param),
25612	};	25622	};
25613	}	25623	}
25614	return param_src.toSrcLoc(fn_decl);	25624	return param_src.toSrcLoc(fn_decl, mod);
25615	}	25625	}
25616	} = .{},	25626	} = .{},
25617	};	25627	};
...	@@ -25625,13 +25635,13 @@ fn coerceExtra(	...	@@ -25625,13 +25635,13 @@ fn coerceExtra(
25625	opts: CoerceOpts,	25635	opts: CoerceOpts,
25626	) CoersionError!Air.Inst.Ref {	25636	) CoersionError!Air.Inst.Ref {
25627	if (dest_ty_unresolved.isGenericPoison()) return inst;	25637	if (dest_ty_unresolved.isGenericPoison()) return inst;
		25638	const mod = sema.mod;
25628	const dest_ty_src = inst_src; // TODO better source location	25639	const dest_ty_src = inst_src; // TODO better source location
25629	const dest_ty = try sema.resolveTypeFields(dest_ty_unresolved);	25640	const dest_ty = try sema.resolveTypeFields(dest_ty_unresolved);
25630	const inst_ty = try sema.resolveTypeFields(sema.typeOf(inst));	25641	const inst_ty = try sema.resolveTypeFields(sema.typeOf(inst));
25631	const mod = sema.mod;	25642	const target = mod.getTarget();
25632	const target = sema.mod.getTarget();
25633	// If the types are the same, we can return the operand.	25643	// If the types are the same, we can return the operand.
25634	if (dest_ty.eql(inst_ty, sema.mod))	25644	if (dest_ty.eql(inst_ty, mod))
25635	return inst;	25645	return inst;
25636		25646
25637	const arena = sema.arena;	25647	const arena = sema.arena;
...	@@ -26254,7 +26264,7 @@ fn coerceExtra(	...	@@ -26254,7 +26264,7 @@ fn coerceExtra(
26254		26264
26255	const ret_ty_src: LazySrcLoc = .{ .node_offset_fn_type_ret_ty = 0 };	26265	const ret_ty_src: LazySrcLoc = .{ .node_offset_fn_type_ret_ty = 0 };
26256	const src_decl = sema.mod.declPtr(sema.func.?.owner_decl);	26266	const src_decl = sema.mod.declPtr(sema.func.?.owner_decl);
26257	try sema.mod.errNoteNonLazy(ret_ty_src.toSrcLoc(src_decl), msg, "'noreturn' declared here", .{});	26267	try sema.mod.errNoteNonLazy(ret_ty_src.toSrcLoc(src_decl, mod), msg, "'noreturn' declared here", .{});
26258	break :msg msg;	26268	break :msg msg;
26259	};	26269	};
26260	return sema.failWithOwnedErrorMsg(msg);	26270	return sema.failWithOwnedErrorMsg(msg);
...	@@ -26287,9 +26297,9 @@ fn coerceExtra(	...	@@ -26287,9 +26297,9 @@ fn coerceExtra(
26287	const ret_ty_src: LazySrcLoc = .{ .node_offset_fn_type_ret_ty = 0 };	26297	const ret_ty_src: LazySrcLoc = .{ .node_offset_fn_type_ret_ty = 0 };
26288	const src_decl = sema.mod.declPtr(sema.func.?.owner_decl);	26298	const src_decl = sema.mod.declPtr(sema.func.?.owner_decl);
26289	if (inst_ty.isError(mod) and !dest_ty.isError(mod)) {	26299	if (inst_ty.isError(mod) and !dest_ty.isError(mod)) {
26290	try sema.mod.errNoteNonLazy(ret_ty_src.toSrcLoc(src_decl), msg, "function cannot return an error", .{});	26300	try sema.mod.errNoteNonLazy(ret_ty_src.toSrcLoc(src_decl, mod), msg, "function cannot return an error", .{});
26291	} else {	26301	} else {
26292	try sema.mod.errNoteNonLazy(ret_ty_src.toSrcLoc(src_decl), msg, "function return type declared here", .{});	26302	try sema.mod.errNoteNonLazy(ret_ty_src.toSrcLoc(src_decl, mod), msg, "function return type declared here", .{});
26293	}	26303	}
26294	}	26304	}
26295		26305
...	@@ -27246,7 +27256,7 @@ fn coerceVarArgParam(	...	@@ -27246,7 +27256,7 @@ fn coerceVarArgParam(
27246	errdefer msg.destroy(sema.gpa);	27256	errdefer msg.destroy(sema.gpa);
27247		27257
27248	const src_decl = sema.mod.declPtr(block.src_decl);	27258	const src_decl = sema.mod.declPtr(block.src_decl);
27249	try sema.explainWhyTypeIsNotExtern(msg, inst_src.toSrcLoc(src_decl), coerced_ty, .param_ty);	27259	try sema.explainWhyTypeIsNotExtern(msg, inst_src.toSrcLoc(src_decl, mod), coerced_ty, .param_ty);
27250		27260
27251	try sema.addDeclaredHereNote(msg, coerced_ty);	27261	try sema.addDeclaredHereNote(msg, coerced_ty);
27252	break :msg msg;	27262	break :msg msg;
...	@@ -29186,13 +29196,14 @@ fn addReferencedBy(	...	@@ -29186,13 +29196,14 @@ fn addReferencedBy(
29186	}	29196	}
29187		29197
29188	fn ensureDeclAnalyzed(sema: *Sema, decl_index: Decl.Index) CompileError!void {	29198	fn ensureDeclAnalyzed(sema: *Sema, decl_index: Decl.Index) CompileError!void {
29189	const decl = sema.mod.declPtr(decl_index);	29199	const mod = sema.mod;
		29200	const decl = mod.declPtr(decl_index);
29190	if (decl.analysis == .in_progress) {	29201	if (decl.analysis == .in_progress) {
29191	const msg = try Module.ErrorMsg.create(sema.gpa, decl.srcLoc(), "dependency loop detected", .{});	29202	const msg = try Module.ErrorMsg.create(sema.gpa, decl.srcLoc(mod), "dependency loop detected", .{});
29192	return sema.failWithOwnedErrorMsg(msg);	29203	return sema.failWithOwnedErrorMsg(msg);
29193	}	29204	}
29194		29205
29195	sema.mod.ensureDeclAnalyzed(decl_index) catch \|err\| {	29206	mod.ensureDeclAnalyzed(decl_index) catch \|err\| {
29196	if (sema.owner_func) \|owner_func\| {	29207	if (sema.owner_func) \|owner_func\| {
29197	owner_func.state = .dependency_failure;	29208	owner_func.state = .dependency_failure;
29198	} else {	29209	} else {
...	@@ -31015,12 +31026,12 @@ fn resolvePeerTypes(	...	@@ -31015,12 +31026,12 @@ fn resolvePeerTypes(
31015	// At this point, we hit a compile error. We need to recover	31026	// At this point, we hit a compile error. We need to recover
31016	// the source locations.	31027	// the source locations.
31017	const chosen_src = candidate_srcs.resolve(	31028	const chosen_src = candidate_srcs.resolve(
31018	sema.gpa,	31029	mod,
31019	mod.declPtr(block.src_decl),	31030	mod.declPtr(block.src_decl),
31020	chosen_i,	31031	chosen_i,
31021	);	31032	);
31022	const candidate_src = candidate_srcs.resolve(	31033	const candidate_src = candidate_srcs.resolve(
31023	sema.gpa,	31034	mod,
31024	mod.declPtr(block.src_decl),	31035	mod.declPtr(block.src_decl),
31025	candidate_i + 1,	31036	candidate_i + 1,
31026	);	31037	);
...	@@ -31315,7 +31326,7 @@ fn semaBackingIntType(mod: Module, struct_obj: Module.Struct) CompileError!voi	...	@@ -31315,7 +31326,7 @@ fn semaBackingIntType(mod: Module, struct_obj: Module.Struct) CompileError!voi
31315	const decl_arena_allocator = decl.value_arena.?.acquire(gpa, &decl_arena);	31326	const decl_arena_allocator = decl.value_arena.?.acquire(gpa, &decl_arena);
31316	defer decl.value_arena.?.release(&decl_arena);	31327	defer decl.value_arena.?.release(&decl_arena);
31317		31328
31318	const zir = struct_obj.namespace.file_scope.zir;	31329	const zir = mod.namespacePtr(struct_obj.namespace).file_scope.zir;
31319	const extended = zir.instructions.items(.data)[struct_obj.zir_index].extended;	31330	const extended = zir.instructions.items(.data)[struct_obj.zir_index].extended;
31320	assert(extended.opcode == .struct_decl);	31331	assert(extended.opcode == .struct_decl);
31321	const small = @bitCast(Zir.Inst.StructDecl.Small, extended.small);	31332	const small = @bitCast(Zir.Inst.StructDecl.Small, extended.small);
...	@@ -31353,7 +31364,7 @@ fn semaBackingIntType(mod: Module, struct_obj: Module.Struct) CompileError!voi	...	@@ -31353,7 +31364,7 @@ fn semaBackingIntType(mod: Module, struct_obj: Module.Struct) CompileError!voi
31353	.parent = null,	31364	.parent = null,
31354	.sema = &sema,	31365	.sema = &sema,
31355	.src_decl = decl_index,	31366	.src_decl = decl_index,
31356	.namespace = &struct_obj.namespace,	31367	.namespace = struct_obj.namespace,
31357	.wip_capture_scope = wip_captures.scope,	31368	.wip_capture_scope = wip_captures.scope,
31358	.instructions = .{},	31369	.instructions = .{},
31359	.inlining = null,	31370	.inlining = null,
...	@@ -31399,7 +31410,7 @@ fn semaBackingIntType(mod: Module, struct_obj: Module.Struct) CompileError!voi	...	@@ -31399,7 +31410,7 @@ fn semaBackingIntType(mod: Module, struct_obj: Module.Struct) CompileError!voi
31399	.parent = null,	31410	.parent = null,
31400	.sema = &sema,	31411	.sema = &sema,
31401	.src_decl = decl_index,	31412	.src_decl = decl_index,
31402	.namespace = &struct_obj.namespace,	31413	.namespace = struct_obj.namespace,
31403	.wip_capture_scope = undefined,	31414	.wip_capture_scope = undefined,
31404	.instructions = .{},	31415	.instructions = .{},
31405	.inlining = null,	31416	.inlining = null,
...	@@ -31522,7 +31533,6 @@ pub fn resolveTypeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {	...	@@ -31522,7 +31533,6 @@ pub fn resolveTypeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {
31522	.error_set_single,	31533	.error_set_single,
31523	.error_set_inferred,	31534	.error_set_inferred,
31524	.error_set_merged,	31535	.error_set_merged,
31525	.@"opaque",
31526	.enum_simple,	31536	.enum_simple,
31527	=> false,	31537	=> false,
31528		31538
...	@@ -31678,6 +31688,7 @@ pub fn resolveTypeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {	...	@@ -31678,6 +31688,7 @@ pub fn resolveTypeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {
31678	},	31688	},
31679	.struct_type => @panic("TODO"),	31689	.struct_type => @panic("TODO"),
31680	.union_type => @panic("TODO"),	31690	.union_type => @panic("TODO"),
		31691	.opaque_type => false,
31681		31692
31682	// values, not types	31693	// values, not types
31683	.simple_value => unreachable,	31694	.simple_value => unreachable,
...	@@ -31991,6 +32002,8 @@ fn resolveInferredErrorSet(	...	@@ -31991,6 +32002,8 @@ fn resolveInferredErrorSet(
31991	return sema.fail(block, src, "unable to resolve inferred error set", .{});	32002	return sema.fail(block, src, "unable to resolve inferred error set", .{});
31992	}	32003	}
31993		32004
		32005	const mod = sema.mod;
		32006
31994	// In order to ensure that all dependencies are properly added to the set, we	32007	// In order to ensure that all dependencies are properly added to the set, we
31995	// need to ensure the function body is analyzed of the inferred error set.	32008	// need to ensure the function body is analyzed of the inferred error set.
31996	// However, in the case of comptime/inline function calls with inferred error sets,	32009	// However, in the case of comptime/inline function calls with inferred error sets,
...	@@ -32011,7 +32024,7 @@ fn resolveInferredErrorSet(	...	@@ -32011,7 +32024,7 @@ fn resolveInferredErrorSet(
32011	const msg = try sema.errMsg(block, src, "unable to resolve inferred error set of generic function", .{});	32024	const msg = try sema.errMsg(block, src, "unable to resolve inferred error set of generic function", .{});
32012	errdefer msg.destroy(sema.gpa);	32025	errdefer msg.destroy(sema.gpa);
32013		32026
32014	try sema.mod.errNoteNonLazy(ies_func_owner_decl.srcLoc(), msg, "generic function declared here", .{});	32027	try sema.mod.errNoteNonLazy(ies_func_owner_decl.srcLoc(mod), msg, "generic function declared here", .{});
32015	break :msg msg;	32028	break :msg msg;
32016	};	32029	};
32017	return sema.failWithOwnedErrorMsg(msg);	32030	return sema.failWithOwnedErrorMsg(msg);
...	@@ -32049,7 +32062,7 @@ fn resolveInferredErrorSetTy(	...	@@ -32049,7 +32062,7 @@ fn resolveInferredErrorSetTy(
32049	fn semaStructFields(mod: Module, struct_obj: Module.Struct) CompileError!void {	32062	fn semaStructFields(mod: Module, struct_obj: Module.Struct) CompileError!void {
32050	const gpa = mod.gpa;	32063	const gpa = mod.gpa;
32051	const decl_index = struct_obj.owner_decl;	32064	const decl_index = struct_obj.owner_decl;
32052	const zir = struct_obj.namespace.file_scope.zir;	32065	const zir = mod.namespacePtr(struct_obj.namespace).file_scope.zir;
32053	const extended = zir.instructions.items(.data)[struct_obj.zir_index].extended;	32066	const extended = zir.instructions.items(.data)[struct_obj.zir_index].extended;
32054	assert(extended.opcode == .struct_decl);	32067	assert(extended.opcode == .struct_decl);
32055	const small = @bitCast(Zir.Inst.StructDecl.Small, extended.small);	32068	const small = @bitCast(Zir.Inst.StructDecl.Small, extended.small);
...	@@ -32123,7 +32136,7 @@ fn semaStructFields(mod: Module, struct_obj: Module.Struct) CompileError!void	...	@@ -32123,7 +32136,7 @@ fn semaStructFields(mod: Module, struct_obj: Module.Struct) CompileError!void
32123	.parent = null,	32136	.parent = null,
32124	.sema = &sema,	32137	.sema = &sema,
32125	.src_decl = decl_index,	32138	.src_decl = decl_index,
32126	.namespace = &struct_obj.namespace,	32139	.namespace = struct_obj.namespace,
32127	.wip_capture_scope = wip_captures.scope,	32140	.wip_capture_scope = wip_captures.scope,
32128	.instructions = .{},	32141	.instructions = .{},
32129	.inlining = null,	32142	.inlining = null,
...	@@ -32393,7 +32406,7 @@ fn semaUnionFields(mod: Module, union_obj: Module.Union) CompileError!void {	...	@@ -32393,7 +32406,7 @@ fn semaUnionFields(mod: Module, union_obj: Module.Union) CompileError!void {
32393		32406
32394	const gpa = mod.gpa;	32407	const gpa = mod.gpa;
32395	const decl_index = union_obj.owner_decl;	32408	const decl_index = union_obj.owner_decl;
32396	const zir = union_obj.namespace.file_scope.zir;	32409	const zir = mod.namespacePtr(union_obj.namespace).file_scope.zir;
32397	const extended = zir.instructions.items(.data)[union_obj.zir_index].extended;	32410	const extended = zir.instructions.items(.data)[union_obj.zir_index].extended;
32398	assert(extended.opcode == .union_decl);	32411	assert(extended.opcode == .union_decl);
32399	const small = @bitCast(Zir.Inst.UnionDecl.Small, extended.small);	32412	const small = @bitCast(Zir.Inst.UnionDecl.Small, extended.small);
...	@@ -32463,7 +32476,7 @@ fn semaUnionFields(mod: Module, union_obj: Module.Union) CompileError!void {	...	@@ -32463,7 +32476,7 @@ fn semaUnionFields(mod: Module, union_obj: Module.Union) CompileError!void {
32463	.parent = null,	32476	.parent = null,
32464	.sema = &sema,	32477	.sema = &sema,
32465	.src_decl = decl_index,	32478	.src_decl = decl_index,
32466	.namespace = &union_obj.namespace,	32479	.namespace = union_obj.namespace,
32467	.wip_capture_scope = wip_captures.scope,	32480	.wip_capture_scope = wip_captures.scope,
32468	.instructions = .{},	32481	.instructions = .{},
32469	.inlining = null,	32482	.inlining = null,
...	@@ -32665,7 +32678,7 @@ fn semaUnionFields(mod: Module, union_obj: Module.Union) CompileError!void {	...	@@ -32665,7 +32678,7 @@ fn semaUnionFields(mod: Module, union_obj: Module.Union) CompileError!void {
32665		32678
32666	const prev_field_index = union_obj.fields.getIndex(field_name).?;	32679	const prev_field_index = union_obj.fields.getIndex(field_name).?;
32667	const prev_field_src = union_obj.fieldSrcLoc(sema.mod, .{ .index = prev_field_index }).lazy;	32680	const prev_field_src = union_obj.fieldSrcLoc(sema.mod, .{ .index = prev_field_index }).lazy;
32668	try sema.mod.errNoteNonLazy(prev_field_src.toSrcLoc(decl), msg, "other field here", .{});	32681	try sema.mod.errNoteNonLazy(prev_field_src.toSrcLoc(decl, mod), msg, "other field here", .{});
32669	try sema.errNote(&block_scope, src, msg, "union declared here", .{});	32682	try sema.errNote(&block_scope, src, msg, "union declared here", .{});
32670	break :msg msg;	32683	break :msg msg;
32671	};	32684	};
...	@@ -32929,7 +32942,7 @@ fn getBuiltin(sema: *Sema, name: []const u8) CompileError!Air.Inst.Ref {	...	@@ -32929,7 +32942,7 @@ fn getBuiltin(sema: *Sema, name: []const u8) CompileError!Air.Inst.Ref {
32929	const opt_ty_decl = (try sema.namespaceLookup(	32942	const opt_ty_decl = (try sema.namespaceLookup(
32930	&block,	32943	&block,
32931	src,	32944	src,
32932	builtin_ty.getNamespace().?,	32945	builtin_ty.getNamespaceIndex(mod).unwrap().?,
32933	name,	32946	name,
32934	)) orelse std.debug.panic("lib/std/builtin.zig is corrupt and missing '{s}'", .{name});	32947	)) orelse std.debug.panic("lib/std/builtin.zig is corrupt and missing '{s}'", .{name});
32935	return sema.analyzeDeclVal(&block, src, opt_ty_decl);	32948	return sema.analyzeDeclVal(&block, src, opt_ty_decl);
...	@@ -32984,7 +32997,6 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {	...	@@ -32984,7 +32997,6 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {
32984	.function,	32997	.function,
32985	.array_sentinel,	32998	.array_sentinel,
32986	.error_set_inferred,	32999	.error_set_inferred,
32987	.@"opaque",
32988	.anyframe_T,	33000	.anyframe_T,
32989	.pointer,	33001	.pointer,
32990	=> return null,	33002	=> return null,
...	@@ -33123,7 +33135,7 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {	...	@@ -33123,7 +33135,7 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {
33123	.inferred_alloc_mut => unreachable,	33135	.inferred_alloc_mut => unreachable,
33124	},	33136	},
33125		33137
33126	else => switch (mod.intern_pool.indexToKey(ty.ip_index)) {	33138	else => return switch (mod.intern_pool.indexToKey(ty.ip_index)) {
33127	.int_type => \|int_type\| {	33139	.int_type => \|int_type\| {
33128	if (int_type.bits == 0) {	33140	if (int_type.bits == 0) {
33129	return try mod.intValue(ty, 0);	33141	return try mod.intValue(ty, 0);
...	@@ -33131,7 +33143,7 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {	...	@@ -33131,7 +33143,7 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {
33131	return null;	33143	return null;
33132	}	33144	}
33133	},	33145	},
33134	.ptr_type => return null,	33146	.ptr_type => null,
33135	.array_type => \|array_type\| {	33147	.array_type => \|array_type\| {
33136	if (array_type.len == 0)	33148	if (array_type.len == 0)
33137	return Value.initTag(.empty_array);	33149	return Value.initTag(.empty_array);
...	@@ -33152,7 +33164,7 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {	...	@@ -33152,7 +33164,7 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {
33152	return null;	33164	return null;
33153	}	33165	}
33154	},	33166	},
33155	.error_union_type => return null,	33167	.error_union_type => null,
33156	.simple_type => \|t\| switch (t) {	33168	.simple_type => \|t\| switch (t) {
33157	.f16,	33169	.f16,
33158	.f32,	33170	.f32,
...	@@ -33190,18 +33202,19 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {	...	@@ -33190,18 +33202,19 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {
33190	.export_options,	33202	.export_options,
33191	.extern_options,	33203	.extern_options,
33192	.type_info,	33204	.type_info,
33193	=> return null,	33205	=> null,
33194		33206
33195	.void => return Value.void,	33207	.void => Value.void,
33196	.noreturn => return Value.@"unreachable",	33208	.noreturn => Value.@"unreachable",
33197	.null => return Value.null,	33209	.null => Value.null,
33198	.undefined => return Value.undef,	33210	.undefined => Value.undef,
33199		33211
33200	.generic_poison => return error.GenericPoison,	33212	.generic_poison => return error.GenericPoison,
33201	.var_args_param => unreachable,	33213	.var_args_param => unreachable,
33202	},	33214	},
33203	.struct_type => @panic("TODO"),	33215	.struct_type => @panic("TODO"),
33204	.union_type => @panic("TODO"),	33216	.union_type => @panic("TODO"),
		33217	.opaque_type => null,
33205		33218
33206	// values, not types	33219	// values, not types
33207	.simple_value => unreachable,	33220	.simple_value => unreachable,
...	@@ -33606,7 +33619,6 @@ pub fn typeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {	...	@@ -33606,7 +33619,6 @@ pub fn typeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {
33606	.error_set_single,	33619	.error_set_single,
33607	.error_set_inferred,	33620	.error_set_inferred,
33608	.error_set_merged,	33621	.error_set_merged,
33609	.@"opaque",
33610	.enum_simple,	33622	.enum_simple,
33611	=> false,	33623	=> false,
33612		33624
...	@@ -33772,6 +33784,7 @@ pub fn typeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {	...	@@ -33772,6 +33784,7 @@ pub fn typeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {
33772	},	33784	},
33773	.struct_type => @panic("TODO"),	33785	.struct_type => @panic("TODO"),
33774	.union_type => @panic("TODO"),	33786	.union_type => @panic("TODO"),
		33787	.opaque_type => false,
33775		33788
33776	// values, not types	33789	// values, not types
33777	.simple_value => unreachable,	33790	.simple_value => unreachable,

src/arch/wasm/CodeGen.zig+3-2

...	@@ -764,8 +764,9 @@ pub fn deinit(func: *CodeGen) void {	...	@@ -764,8 +764,9 @@ pub fn deinit(func: *CodeGen) void {
764		764
765	/// Sets `err_msg` on `CodeGen` and returns `error.CodegenFail` which is caught in link/Wasm.zig	765	/// Sets `err_msg` on `CodeGen` and returns `error.CodegenFail` which is caught in link/Wasm.zig
766	fn fail(func: *CodeGen, comptime fmt: []const u8, args: anytype) InnerError {	766	fn fail(func: *CodeGen, comptime fmt: []const u8, args: anytype) InnerError {
		767	const mod = func.bin_file.base.options.module.?;
767	const src = LazySrcLoc.nodeOffset(0);	768	const src = LazySrcLoc.nodeOffset(0);
768	const src_loc = src.toSrcLoc(func.decl);	769	const src_loc = src.toSrcLoc(func.decl, mod);
769	func.err_msg = try Module.ErrorMsg.create(func.gpa, src_loc, fmt, args);	770	func.err_msg = try Module.ErrorMsg.create(func.gpa, src_loc, fmt, args);
770	return error.CodegenFail;	771	return error.CodegenFail;
771	}	772	}
...	@@ -6799,7 +6800,7 @@ fn airTagName(func: *CodeGen, inst: Air.Inst.Index) InnerError!void {	...	@@ -6799,7 +6800,7 @@ fn airTagName(func: *CodeGen, inst: Air.Inst.Index) InnerError!void {
6799		6800
6800	fn getTagNameFunction(func: *CodeGen, enum_ty: Type) InnerError!u32 {	6801	fn getTagNameFunction(func: *CodeGen, enum_ty: Type) InnerError!u32 {
6801	const mod = func.bin_file.base.options.module.?;	6802	const mod = func.bin_file.base.options.module.?;
6802	const enum_decl_index = enum_ty.getOwnerDecl();	6803	const enum_decl_index = enum_ty.getOwnerDecl(mod);
6803		6804
6804	var arena_allocator = std.heap.ArenaAllocator.init(func.gpa);	6805	var arena_allocator = std.heap.ArenaAllocator.init(func.gpa);
6805	defer arena_allocator.deinit();	6806	defer arena_allocator.deinit();

src/arch/wasm/Emit.zig+1-1

...	@@ -254,7 +254,7 @@ fn fail(emit: *Emit, comptime format: []const u8, args: anytype) InnerError {	...	@@ -254,7 +254,7 @@ fn fail(emit: *Emit, comptime format: []const u8, args: anytype) InnerError {
254	@setCold(true);	254	@setCold(true);
255	std.debug.assert(emit.error_msg == null);	255	std.debug.assert(emit.error_msg == null);
256	const mod = emit.bin_file.base.options.module.?;	256	const mod = emit.bin_file.base.options.module.?;
257	emit.error_msg = try Module.ErrorMsg.create(emit.bin_file.base.allocator, mod.declPtr(emit.decl_index).srcLoc(), format, args);	257	emit.error_msg = try Module.ErrorMsg.create(emit.bin_file.base.allocator, mod.declPtr(emit.decl_index).srcLoc(mod), format, args);
258	return error.EmitFail;	258	return error.EmitFail;
259	}	259	}
260		260

src/arch/x86_64/CodeGen.zig+9-6

...	@@ -112,10 +112,10 @@ const Owner = union(enum) {	...	@@ -112,10 +112,10 @@ const Owner = union(enum) {
112	mod_fn: *const Module.Fn,	112	mod_fn: *const Module.Fn,
113	lazy_sym: link.File.LazySymbol,	113	lazy_sym: link.File.LazySymbol,
114		114
115	fn getDecl(owner: Owner) Module.Decl.Index {	115	fn getDecl(owner: Owner, mod: *Module) Module.Decl.Index {
116	return switch (owner) {	116	return switch (owner) {
117	.mod_fn => \|mod_fn\| mod_fn.owner_decl,	117	.mod_fn => \|mod_fn\| mod_fn.owner_decl,
118	.lazy_sym => \|lazy_sym\| lazy_sym.ty.getOwnerDecl(),	118	.lazy_sym => \|lazy_sym\| lazy_sym.ty.getOwnerDecl(mod),
119	};	119	};
120	}	120	}
121		121
...	@@ -7926,6 +7926,7 @@ fn airArg(self: *Self, inst: Air.Inst.Index) !void {	...	@@ -7926,6 +7926,7 @@ fn airArg(self: *Self, inst: Air.Inst.Index) !void {
7926	}	7926	}
7927		7927
7928	fn genArgDbgInfo(self: Self, ty: Type, name: [:0]const u8, mcv: MCValue) !void {	7928	fn genArgDbgInfo(self: Self, ty: Type, name: [:0]const u8, mcv: MCValue) !void {
		7929	const mod = self.bin_file.options.module.?;
7929	switch (self.debug_output) {	7930	switch (self.debug_output) {
7930	.dwarf => \|dw\| {	7931	.dwarf => \|dw\| {
7931	const loc: link.File.Dwarf.DeclState.DbgInfoLoc = switch (mcv) {	7932	const loc: link.File.Dwarf.DeclState.DbgInfoLoc = switch (mcv) {
...	@@ -7944,7 +7945,7 @@ fn genArgDbgInfo(self: Self, ty: Type, name: [:0]const u8, mcv: MCValue) !void {	...	@@ -7944,7 +7945,7 @@ fn genArgDbgInfo(self: Self, ty: Type, name: [:0]const u8, mcv: MCValue) !void {
7944	// TODO: this might need adjusting like the linkers do.	7945	// TODO: this might need adjusting like the linkers do.
7945	// Instead of flattening the owner and passing Decl.Index here we may	7946	// Instead of flattening the owner and passing Decl.Index here we may
7946	// want to special case LazySymbol in DWARF linker too.	7947	// want to special case LazySymbol in DWARF linker too.
7947	try dw.genArgDbgInfo(name, ty, self.owner.getDecl(), loc);	7948	try dw.genArgDbgInfo(name, ty, self.owner.getDecl(mod), loc);
7948	},	7949	},
7949	.plan9 => {},	7950	.plan9 => {},
7950	.none => {},	7951	.none => {},
...	@@ -7958,6 +7959,7 @@ fn genVarDbgInfo(	...	@@ -7958,6 +7959,7 @@ fn genVarDbgInfo(
7958	mcv: MCValue,	7959	mcv: MCValue,
7959	name: [:0]const u8,	7960	name: [:0]const u8,
7960	) !void {	7961	) !void {
		7962	const mod = self.bin_file.options.module.?;
7961	const is_ptr = switch (tag) {	7963	const is_ptr = switch (tag) {
7962	.dbg_var_ptr => true,	7964	.dbg_var_ptr => true,
7963	.dbg_var_val => false,	7965	.dbg_var_val => false,
...	@@ -7988,7 +7990,7 @@ fn genVarDbgInfo(	...	@@ -7988,7 +7990,7 @@ fn genVarDbgInfo(
7988	// TODO: this might need adjusting like the linkers do.	7990	// TODO: this might need adjusting like the linkers do.
7989	// Instead of flattening the owner and passing Decl.Index here we may	7991	// Instead of flattening the owner and passing Decl.Index here we may
7990	// want to special case LazySymbol in DWARF linker too.	7992	// want to special case LazySymbol in DWARF linker too.
7991	try dw.genVarDbgInfo(name, ty, self.owner.getDecl(), is_ptr, loc);	7993	try dw.genVarDbgInfo(name, ty, self.owner.getDecl(mod), is_ptr, loc);
7992	},	7994	},
7993	.plan9 => {},	7995	.plan9 => {},
7994	.none => {},	7996	.none => {},
...	@@ -10936,7 +10938,7 @@ fn airTagName(self: *Self, inst: Air.Inst.Index) !void {	...	@@ -10936,7 +10938,7 @@ fn airTagName(self: *Self, inst: Air.Inst.Index) !void {
10936	try self.genLazySymbolRef(	10938	try self.genLazySymbolRef(
10937	.call,	10939	.call,
10938	.rax,	10940	.rax,
10939	link.File.LazySymbol.initDecl(.code, enum_ty.getOwnerDecl(), mod),	10941	link.File.LazySymbol.initDecl(.code, enum_ty.getOwnerDecl(mod), mod),
10940	);	10942	);
10941		10943
10942	return self.finishAir(inst, dst_mcv, .{ un_op, .none, .none });	10944	return self.finishAir(inst, dst_mcv, .{ un_op, .none, .none });
...	@@ -11651,7 +11653,8 @@ fn limitImmediateType(self: *Self, operand: Air.Inst.Ref, comptime T: type) !MCV	...	@@ -11651,7 +11653,8 @@ fn limitImmediateType(self: *Self, operand: Air.Inst.Ref, comptime T: type) !MCV
11651	}	11653	}
11652		11654
11653	fn genTypedValue(self: *Self, arg_tv: TypedValue) InnerError!MCValue {	11655	fn genTypedValue(self: *Self, arg_tv: TypedValue) InnerError!MCValue {
11654	return switch (try codegen.genTypedValue(self.bin_file, self.src_loc, arg_tv, self.owner.getDecl())) {	11656	const mod = self.bin_file.options.module.?;
		11657	return switch (try codegen.genTypedValue(self.bin_file, self.src_loc, arg_tv, self.owner.getDecl(mod))) {
11655	.mcv => \|mcv\| switch (mcv) {	11658	.mcv => \|mcv\| switch (mcv) {
11656	.none => .none,	11659	.none => .none,
11657	.undef => .undef,	11660	.undef => .undef,

src/codegen/c.zig+4-2

src/codegen/c/type.zig+4-4

src/codegen/llvm.zig+33-33

src/codegen/spirv.zig+8-3

src/codegen/spirv/Module.zig+2-2

...	@@ -390,8 +390,8 @@ pub fn addFunction(self: *Module, decl_index: Decl.Index, func: Fn) !void {	...	@@ -390,8 +390,8 @@ pub fn addFunction(self: *Module, decl_index: Decl.Index, func: Fn) !void {
390	/// Fetch the result-id of an OpString instruction that encodes the path of the source	390	/// Fetch the result-id of an OpString instruction that encodes the path of the source
391	/// file of the decl. This function may also emit an OpSource with source-level information regarding	391	/// file of the decl. This function may also emit an OpSource with source-level information regarding
392	/// the decl.	392	/// the decl.
393	pub fn resolveSourceFileName(self: Module, decl: ZigDecl) !IdRef {	393	pub fn resolveSourceFileName(self: Module, zig_module: ZigModule, zig_decl: *ZigDecl) !IdRef {
394	const path = decl.getFileScope().sub_file_path;	394	const path = zig_decl.getFileScope(zig_module).sub_file_path;
395	const result = try self.source_file_names.getOrPut(self.gpa, path);	395	const result = try self.source_file_names.getOrPut(self.gpa, path);
396	if (!result.found_existing) {	396	if (!result.found_existing) {
397	const file_result_id = self.allocId();	397	const file_result_id = self.allocId();

src/crash_report.zig+4-4

...	@@ -99,7 +99,7 @@ fn dumpStatusReport() !void {	...	@@ -99,7 +99,7 @@ fn dumpStatusReport() !void {
99	allocator,	99	allocator,
100	anal.body,	100	anal.body,
101	anal.body_index,	101	anal.body_index,
102	block.namespace.file_scope,	102	mod.namespacePtr(block.namespace).file_scope,
103	block_src_decl.src_node,	103	block_src_decl.src_node,
104	6, // indent	104	6, // indent
105	stderr,	105	stderr,
...	@@ -108,7 +108,7 @@ fn dumpStatusReport() !void {	...	@@ -108,7 +108,7 @@ fn dumpStatusReport() !void {
108	else => \|e\| return e,	108	else => \|e\| return e,
109	};	109	};
110	try stderr.writeAll(" For full context, use the command\n zig ast-check -t ");	110	try stderr.writeAll(" For full context, use the command\n zig ast-check -t ");
111	try writeFilePath(block.namespace.file_scope, stderr);	111	try writeFilePath(mod.namespacePtr(block.namespace).file_scope, stderr);
112	try stderr.writeAll("\n\n");	112	try stderr.writeAll("\n\n");
113		113
114	var parent = anal.parent;	114	var parent = anal.parent;
...	@@ -121,7 +121,7 @@ fn dumpStatusReport() !void {	...	@@ -121,7 +121,7 @@ fn dumpStatusReport() !void {
121	print_zir.renderSingleInstruction(	121	print_zir.renderSingleInstruction(
122	allocator,	122	allocator,
123	curr.body[curr.body_index],	123	curr.body[curr.body_index],
124	curr.block.namespace.file_scope,	124	mod.namespacePtr(curr.block.namespace).file_scope,
125	curr_block_src_decl.src_node,	125	curr_block_src_decl.src_node,
126	6, // indent	126	6, // indent
127	stderr,	127	stderr,
...	@@ -148,7 +148,7 @@ fn writeFilePath(file: *Module.File, stream: anytype) !void {	...	@@ -148,7 +148,7 @@ fn writeFilePath(file: *Module.File, stream: anytype) !void {
148	}	148	}
149		149
150	fn writeFullyQualifiedDeclWithFile(mod: Module, decl: Decl, stream: anytype) !void {	150	fn writeFullyQualifiedDeclWithFile(mod: Module, decl: Decl, stream: anytype) !void {
151	try writeFilePath(decl.getFileScope(), stream);	151	try writeFilePath(decl.getFileScope(mod), stream);
152	try stream.writeAll(": ");	152	try stream.writeAll(": ");
153	try decl.renderFullyQualifiedDebugName(mod, stream);	153	try decl.renderFullyQualifiedDebugName(mod, stream);
154	}	154	}

src/link.zig+2-2

...	@@ -1129,8 +1129,8 @@ pub const File = struct {	...	@@ -1129,8 +1129,8 @@ pub const File = struct {
1129	Type.anyerror };	1129	Type.anyerror };
1130	}	1130	}
1131		1131
1132	pub fn getDecl(self: LazySymbol) Module.Decl.OptionalIndex {	1132	pub fn getDecl(self: LazySymbol, mod: *Module) Module.Decl.OptionalIndex {
1133	return Module.Decl.OptionalIndex.init(self.ty.getOwnerDeclOrNull());	1133	return Module.Decl.OptionalIndex.init(self.ty.getOwnerDeclOrNull(mod));
1134	}	1134	}
1135	};	1135	};
1136		1136

src/link/Coff.zig+34-33

 @@ -1032,20 +1032,20 @@ fn freeAtom(self: *Coff, atom_index: Atom.Index) void {
     self.getAtomPtr(atom_index).sym_index = 0;
 }
-pub fn updateFunc(self: *Coff, module: *Module, func: *Module.Fn, air: Air, liveness: Liveness) !void {
+pub fn updateFunc(self: *Coff, mod: *Module, func: *Module.Fn, air: Air, liveness: Liveness) !void {
     if (build_options.skip_non_native and builtin.object_format != .coff) {
         @panic("Attempted to compile for object format that was disabled by build configuration");
     }
     if (build_options.have_llvm) {
         if (self.llvm_object) |llvm_object| {
-            return llvm_object.updateFunc(module, func, air, liveness);
+            return llvm_object.updateFunc(mod, func, air, liveness);
         }
     }
     const tracy = trace(@src());
     defer tracy.end();
     const decl_index = func.owner_decl;
-    const decl = module.declPtr(decl_index);
+    const decl = mod.declPtr(decl_index);
     const atom_index = try self.getOrCreateAtomForDecl(decl_index);
     self.freeUnnamedConsts(decl_index);
 @@ -1056,7 +1056,7 @@ pub fn updateFunc(self: *Coff, module: *Module, func: *Module.Fn, air: Air, live
     const res = try codegen.generateFunction(
         &self.base,
-        decl.srcLoc(),
+        decl.srcLoc(mod),
         func,
         air,
         liveness,
 @@ -1067,7 +1067,7 @@ pub fn updateFunc(self: *Coff, module: *Module, func: *Module.Fn, air: Air, live
         .ok => code_buffer.items,
         .fail => |em| {
             decl.analysis = .codegen_failure;
-            try module.failed_decls.put(module.gpa, decl_index, em);
+            try mod.failed_decls.put(mod.gpa, decl_index, em);
             return;
         },
     };
 @@ -1076,7 +1076,7 @@ pub fn updateFunc(self: *Coff, module: *Module, func: *Module.Fn, air: Air, live
     // Since we updated the vaddr and the size, each corresponding export
     // symbol also needs to be updated.
-    return self.updateDeclExports(module, decl_index, module.getDeclExports(decl_index));
+    return self.updateDeclExports(mod, decl_index, mod.getDeclExports(decl_index));
 }
 pub fn lowerUnnamedConst(self: *Coff, tv: TypedValue, decl_index: Module.Decl.Index) !u32 {
 @@ -1110,7 +1110,7 @@ pub fn lowerUnnamedConst(self: *Coff, tv: TypedValue, decl_index: Module.Decl.In
         sym.section_number = @intToEnum(coff.SectionNumber, self.rdata_section_index.? + 1);
     }
-    const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), tv, &code_buffer, .none, .{
+    const res = try codegen.generateSymbol(&self.base, decl.srcLoc(mod), tv, &code_buffer, .none, .{
         .parent_atom_index = self.getAtom(atom_index).getSymbolIndex().?,
     });
     var code = switch (res) {
 @@ -1141,19 +1141,19 @@ pub fn lowerUnnamedConst(self: *Coff, tv: TypedValue, decl_index: Module.Decl.In
 pub fn updateDecl(
     self: *Coff,
-    module: *Module,
+    mod: *Module,
     decl_index: Module.Decl.Index,
 ) link.File.UpdateDeclError!void {
     if (build_options.skip_non_native and builtin.object_format != .coff) {
         @panic("Attempted to compile for object format that was disabled by build configuration");
     }
     if (build_options.have_llvm) {
-        if (self.llvm_object) |llvm_object| return llvm_object.updateDecl(module, decl_index);
+        if (self.llvm_object) |llvm_object| return llvm_object.updateDecl(mod, decl_index);
     }
     const tracy = trace(@src());
     defer tracy.end();
-    const decl = module.declPtr(decl_index);
+    const decl = mod.declPtr(decl_index);
     if (decl.val.tag() == .extern_fn) {
         return; // TODO Should we do more when front-end analyzed extern decl?
 @@ -1173,7 +1173,7 @@ pub fn updateDecl(
     defer code_buffer.deinit();
     const decl_val = if (decl.val.castTag(.variable)) |payload| payload.data.init else decl.val;
-    const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), .{
+    const res = try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{
         .ty = decl.ty,
         .val = decl_val,
     }, &code_buffer, .none, .{
 @@ -1183,7 +1183,7 @@ pub fn updateDecl(
         .ok => code_buffer.items,
         .fail => |em| {
             decl.analysis = .codegen_failure;
-            try module.failed_decls.put(module.gpa, decl_index, em);
+            try mod.failed_decls.put(mod.gpa, decl_index, em);
             return;
         },
     };
 @@ -1192,7 +1192,7 @@ pub fn updateDecl(
     // Since we updated the vaddr and the size, each corresponding export
     // symbol also needs to be updated.
-    return self.updateDeclExports(module, decl_index, module.getDeclExports(decl_index));
+    return self.updateDeclExports(mod, decl_index, mod.getDeclExports(decl_index));
 }
 fn updateLazySymbolAtom(
 @@ -1217,8 +1217,8 @@ fn updateLazySymbolAtom(
     const atom = self.getAtomPtr(atom_index);
     const local_sym_index = atom.getSymbolIndex().?;
-    const src = if (sym.ty.getOwnerDeclOrNull()) |owner_decl|
+    const src = if (sym.ty.getOwnerDeclOrNull(mod)) |owner_decl|
-        mod.declPtr(owner_decl).srcLoc()
+        mod.declPtr(owner_decl).srcLoc(mod)
     else
         Module.SrcLoc{
             .file_scope = undefined,
 @@ -1262,7 +1262,8 @@ fn updateLazySymbolAtom(
 }
 pub fn getOrCreateAtomForLazySymbol(self: *Coff, sym: link.File.LazySymbol) !Atom.Index {
-    const gop = try self.lazy_syms.getOrPut(self.base.allocator, sym.getDecl());
+    const mod = self.base.options.module.?;
+    const gop = try self.lazy_syms.getOrPut(self.base.allocator, sym.getDecl(mod));
     errdefer _ = if (!gop.found_existing) self.lazy_syms.pop();
     if (!gop.found_existing) gop.value_ptr.* = .{};
     const metadata: struct { atom: *Atom.Index, state: *LazySymbolMetadata.State } = switch (sym.kind) {
 @@ -1277,7 +1278,7 @@ pub fn getOrCreateAtomForLazySymbol(self: *Coff, sym: link.File.LazySymbol) !Ato
     metadata.state.* = .pending_flush;
     const atom = metadata.atom.*;
     // anyerror needs to be deferred until flushModule
-    if (sym.getDecl() != .none) try self.updateLazySymbolAtom(sym, atom, switch (sym.kind) {
+    if (sym.getDecl(mod) != .none) try self.updateLazySymbolAtom(sym, atom, switch (sym.kind) {
         .code => self.text_section_index.?,
         .const_data => self.rdata_section_index.?,
     });
 @@ -1411,7 +1412,7 @@ pub fn freeDecl(self: *Coff, decl_index: Module.Decl.Index) void {
 pub fn updateDeclExports(
     self: *Coff,
-    module: *Module,
+    mod: *Module,
     decl_index: Module.Decl.Index,
     exports: []const *Module.Export,
 ) link.File.UpdateDeclExportsError!void {
 @@ -1423,7 +1424,7 @@ pub fn updateDeclExports(
         // Even in the case of LLVM, we need to notice certain exported symbols in order to
         // detect the default subsystem.
         for (exports) |exp| {
-            const exported_decl = module.declPtr(exp.exported_decl);
+            const exported_decl = mod.declPtr(exp.exported_decl);
             if (exported_decl.getFunction() == null) continue;
             const winapi_cc = switch (self.base.options.target.cpu.arch) {
                 .x86 => std.builtin.CallingConvention.Stdcall,
 @@ -1433,23 +1434,23 @@ pub fn updateDeclExports(
             if (decl_cc == .C and mem.eql(u8, exp.options.name, "main") and
                 self.base.options.link_libc)
             {
-                module.stage1_flags.have_c_main = true;
+                mod.stage1_flags.have_c_main = true;
             } else if (decl_cc == winapi_cc and self.base.options.target.os.tag == .windows) {
                 if (mem.eql(u8, exp.options.name, "WinMain")) {
-                    module.stage1_flags.have_winmain = true;
+                    mod.stage1_flags.have_winmain = true;
                 } else if (mem.eql(u8, exp.options.name, "wWinMain")) {
-                    module.stage1_flags.have_wwinmain = true;
+                    mod.stage1_flags.have_wwinmain = true;
                 } else if (mem.eql(u8, exp.options.name, "WinMainCRTStartup")) {
-                    module.stage1_flags.have_winmain_crt_startup = true;
+                    mod.stage1_flags.have_winmain_crt_startup = true;
                 } else if (mem.eql(u8, exp.options.name, "wWinMainCRTStartup")) {
-                    module.stage1_flags.have_wwinmain_crt_startup = true;
+                    mod.stage1_flags.have_wwinmain_crt_startup = true;
                 } else if (mem.eql(u8, exp.options.name, "DllMainCRTStartup")) {
-                    module.stage1_flags.have_dllmain_crt_startup = true;
+                    mod.stage1_flags.have_dllmain_crt_startup = true;
                 }
             }
         }
-        if (self.llvm_object) |llvm_object| return llvm_object.updateDeclExports(module, decl_index, exports);
+        if (self.llvm_object) |llvm_object| return llvm_object.updateDeclExports(mod, decl_index, exports);
     }
     const tracy = trace(@src());
 @@ -1457,7 +1458,7 @@ pub fn updateDeclExports(
     const gpa = self.base.allocator;
-    const decl = module.declPtr(decl_index);
+    const decl = mod.declPtr(decl_index);
     const atom_index = try self.getOrCreateAtomForDecl(decl_index);
     const atom = self.getAtom(atom_index);
     const decl_sym = atom.getSymbol(self);
 @@ -1468,12 +1469,12 @@ pub fn updateDeclExports(
         if (exp.options.section) |section_name| {
             if (!mem.eql(u8, section_name, ".text")) {
-                try module.failed_exports.putNoClobber(
+                try mod.failed_exports.putNoClobber(
-                    module.gpa,
+                    mod.gpa,
                     exp,
                     try Module.ErrorMsg.create(
                         gpa,
-                        decl.srcLoc(),
+                        decl.srcLoc(mod),
                         "Unimplemented: ExportOptions.section",
                         .{},
                     ),
 @@ -1483,12 +1484,12 @@ pub fn updateDeclExports(
         }
         if (exp.options.linkage == .LinkOnce) {
-            try module.failed_exports.putNoClobber(
+            try mod.failed_exports.putNoClobber(
-                module.gpa,
+                mod.gpa,
                 exp,
                 try Module.ErrorMsg.create(
                     gpa,
-                    decl.srcLoc(),
+                    decl.srcLoc(mod),
                     "Unimplemented: GlobalLinkage.LinkOnce",
                     .{},
                 ),

src/link/Dwarf.zig+1-1

...	@@ -2597,7 +2597,7 @@ pub fn flushModule(self: Dwarf, module: Module) !void {	...	@@ -2597,7 +2597,7 @@ pub fn flushModule(self: Dwarf, module: Module) !void {
2597		2597
2598	fn addDIFile(self: Dwarf, mod: Module, decl_index: Module.Decl.Index) !u28 {	2598	fn addDIFile(self: Dwarf, mod: Module, decl_index: Module.Decl.Index) !u28 {
2599	const decl = mod.declPtr(decl_index);	2599	const decl = mod.declPtr(decl_index);
2600	const file_scope = decl.getFileScope();	2600	const file_scope = decl.getFileScope(mod);
2601	const gop = try self.di_files.getOrPut(self.allocator, file_scope);	2601	const gop = try self.di_files.getOrPut(self.allocator, file_scope);
2602	if (!gop.found_existing) {	2602	if (!gop.found_existing) {
2603	switch (self.bin_file.tag) {	2603	switch (self.bin_file.tag) {

src/link/Elf.zig+33-32

 @@ -2414,7 +2414,8 @@ pub fn freeDecl(self: *Elf, decl_index: Module.Decl.Index) void {
 }
 pub fn getOrCreateAtomForLazySymbol(self: *Elf, sym: File.LazySymbol) !Atom.Index {
-    const gop = try self.lazy_syms.getOrPut(self.base.allocator, sym.getDecl());
+    const mod = self.base.options.module.?;
+    const gop = try self.lazy_syms.getOrPut(self.base.allocator, sym.getDecl(mod));
     errdefer _ = if (!gop.found_existing) self.lazy_syms.pop();
     if (!gop.found_existing) gop.value_ptr.* = .{};
     const metadata: struct { atom: *Atom.Index, state: *LazySymbolMetadata.State } = switch (sym.kind) {
 @@ -2429,7 +2430,7 @@ pub fn getOrCreateAtomForLazySymbol(self: *Elf, sym: File.LazySymbol) !Atom.Inde
     metadata.state.* = .pending_flush;
     const atom = metadata.atom.*;
     // anyerror needs to be deferred until flushModule
-    if (sym.getDecl() != .none) try self.updateLazySymbolAtom(sym, atom, switch (sym.kind) {
+    if (sym.getDecl(mod) != .none) try self.updateLazySymbolAtom(sym, atom, switch (sym.kind) {
         .code => self.text_section_index.?,
         .const_data => self.rodata_section_index.?,
     });
 @@ -2573,19 +2574,19 @@ fn updateDeclCode(self: *Elf, decl_index: Module.Decl.Index, code: []const u8, s
     return local_sym;
 }
-pub fn updateFunc(self: *Elf, module: *Module, func: *Module.Fn, air: Air, liveness: Liveness) !void {
+pub fn updateFunc(self: *Elf, mod: *Module, func: *Module.Fn, air: Air, liveness: Liveness) !void {
     if (build_options.skip_non_native and builtin.object_format != .elf) {
         @panic("Attempted to compile for object format that was disabled by build configuration");
     }
     if (build_options.have_llvm) {
-        if (self.llvm_object) |llvm_object| return llvm_object.updateFunc(module, func, air, liveness);
+        if (self.llvm_object) |llvm_object| return llvm_object.updateFunc(mod, func, air, liveness);
     }
     const tracy = trace(@src());
     defer tracy.end();
     const decl_index = func.owner_decl;
-    const decl = module.declPtr(decl_index);
+    const decl = mod.declPtr(decl_index);
     const atom_index = try self.getOrCreateAtomForDecl(decl_index);
     self.freeUnnamedConsts(decl_index);
 @@ -2594,28 +2595,28 @@ pub fn updateFunc(self: *Elf, module: *Module, func: *Module.Fn, air: Air, liven
     var code_buffer = std.ArrayList(u8).init(self.base.allocator);
     defer code_buffer.deinit();
-    var decl_state: ?Dwarf.DeclState = if (self.dwarf) |*dw| try dw.initDeclState(module, decl_index) else null;
+    var decl_state: ?Dwarf.DeclState = if (self.dwarf) |*dw| try dw.initDeclState(mod, decl_index) else null;
     defer if (decl_state) |*ds| ds.deinit();
     const res = if (decl_state) |*ds|
-        try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .{
+        try codegen.generateFunction(&self.base, decl.srcLoc(mod), func, air, liveness, &code_buffer, .{
             .dwarf = ds,
         })
     else
-        try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .none);
+        try codegen.generateFunction(&self.base, decl.srcLoc(mod), func, air, liveness, &code_buffer, .none);
     const code = switch (res) {
         .ok => code_buffer.items,
         .fail => |em| {
             decl.analysis = .codegen_failure;
-            try module.failed_decls.put(module.gpa, decl_index, em);
+            try mod.failed_decls.put(mod.gpa, decl_index, em);
             return;
         },
     };
     const local_sym = try self.updateDeclCode(decl_index, code, elf.STT_FUNC);
     if (decl_state) |*ds| {
         try self.dwarf.?.commitDeclState(
-            module,
+            mod,
             decl_index,
             local_sym.st_value,
             local_sym.st_size,
 @@ -2625,25 +2626,25 @@ pub fn updateFunc(self: *Elf, module: *Module, func: *Module.Fn, air: Air, liven
     // Since we updated the vaddr and the size, each corresponding export
     // symbol also needs to be updated.
-    return self.updateDeclExports(module, decl_index, module.getDeclExports(decl_index));
+    return self.updateDeclExports(mod, decl_index, mod.getDeclExports(decl_index));
 }
 pub fn updateDecl(
     self: *Elf,
-    module: *Module,
+    mod: *Module,
     decl_index: Module.Decl.Index,
 ) File.UpdateDeclError!void {
     if (build_options.skip_non_native and builtin.object_format != .elf) {
         @panic("Attempted to compile for object format that was disabled by build configuration");
     }
     if (build_options.have_llvm) {
-        if (self.llvm_object) |llvm_object| return llvm_object.updateDecl(module, decl_index);
+        if (self.llvm_object) |llvm_object| return llvm_object.updateDecl(mod, decl_index);
     }
     const tracy = trace(@src());
     defer tracy.end();
-    const decl = module.declPtr(decl_index);
+    const decl = mod.declPtr(decl_index);
     if (decl.val.tag() == .extern_fn) {
         return; // TODO Should we do more when front-end analyzed extern decl?
 @@ -2662,13 +2663,13 @@ pub fn updateDecl(
     var code_buffer = std.ArrayList(u8).init(self.base.allocator);
     defer code_buffer.deinit();
-    var decl_state: ?Dwarf.DeclState = if (self.dwarf) |*dw| try dw.initDeclState(module, decl_index) else null;
+    var decl_state: ?Dwarf.DeclState = if (self.dwarf) |*dw| try dw.initDeclState(mod, decl_index) else null;
     defer if (decl_state) |*ds| ds.deinit();
     // TODO implement .debug_info for global variables
     const decl_val = if (decl.val.castTag(.variable)) |payload| payload.data.init else decl.val;
     const res = if (decl_state) |*ds|
-        try codegen.generateSymbol(&self.base, decl.srcLoc(), .{
+        try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{
             .ty = decl.ty,
             .val = decl_val,
         }, &code_buffer, .{
 @@ -2677,7 +2678,7 @@ pub fn updateDecl(
             .parent_atom_index = atom.getSymbolIndex().?,
         })
     else
-        try codegen.generateSymbol(&self.base, decl.srcLoc(), .{
+        try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{
             .ty = decl.ty,
             .val = decl_val,
         }, &code_buffer, .none, .{
 @@ -2688,7 +2689,7 @@ pub fn updateDecl(
         .ok => code_buffer.items,
         .fail => |em| {
             decl.analysis = .codegen_failure;
-            try module.failed_decls.put(module.gpa, decl_index, em);
+            try mod.failed_decls.put(mod.gpa, decl_index, em);
             return;
         },
     };
 @@ -2696,7 +2697,7 @@ pub fn updateDecl(
     const local_sym = try self.updateDeclCode(decl_index, code, elf.STT_OBJECT);
     if (decl_state) |*ds| {
         try self.dwarf.?.commitDeclState(
-            module,
+            mod,
             decl_index,
             local_sym.st_value,
             local_sym.st_size,
 @@ -2706,7 +2707,7 @@ pub fn updateDecl(
     // Since we updated the vaddr and the size, each corresponding export
     // symbol also needs to be updated.
-    return self.updateDeclExports(module, decl_index, module.getDeclExports(decl_index));
+    return self.updateDeclExports(mod, decl_index, mod.getDeclExports(decl_index));
 }
 fn updateLazySymbolAtom(
 @@ -2735,8 +2736,8 @@ fn updateLazySymbolAtom(
     const atom = self.getAtom(atom_index);
     const local_sym_index = atom.getSymbolIndex().?;
-    const src = if (sym.ty.getOwnerDeclOrNull()) |owner_decl|
+    const src = if (sym.ty.getOwnerDeclOrNull(mod)) |owner_decl|
-        mod.declPtr(owner_decl).srcLoc()
+        mod.declPtr(owner_decl).srcLoc(mod)
     else
         Module.SrcLoc{
             .file_scope = undefined,
 @@ -2812,7 +2813,7 @@ pub fn lowerUnnamedConst(self: *Elf, typed_value: TypedValue, decl_index: Module
     const atom_index = try self.createAtom();
-    const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), typed_value, &code_buffer, .{
+    const res = try codegen.generateSymbol(&self.base, decl.srcLoc(mod), typed_value, &code_buffer, .{
         .none = {},
     }, .{
         .parent_atom_index = self.getAtom(atom_index).getSymbolIndex().?,
 @@ -2853,7 +2854,7 @@ pub fn lowerUnnamedConst(self: *Elf, typed_value: TypedValue, decl_index: Module
 pub fn updateDeclExports(
     self: *Elf,
-    module: *Module,
+    mod: *Module,
     decl_index: Module.Decl.Index,
     exports: []const *Module.Export,
 ) File.UpdateDeclExportsError!void {
 @@ -2861,7 +2862,7 @@ pub fn updateDeclExports(
         @panic("Attempted to compile for object format that was disabled by build configuration");
     }
     if (build_options.have_llvm) {
-        if (self.llvm_object) |llvm_object| return llvm_object.updateDeclExports(module, decl_index, exports);
+        if (self.llvm_object) |llvm_object| return llvm_object.updateDeclExports(mod, decl_index, exports);
     }
     const tracy = trace(@src());
 @@ -2869,7 +2870,7 @@ pub fn updateDeclExports(
     const gpa = self.base.allocator;
-    const decl = module.declPtr(decl_index);
+    const decl = mod.declPtr(decl_index);
     const atom_index = try self.getOrCreateAtomForDecl(decl_index);
     const atom = self.getAtom(atom_index);
     const decl_sym = atom.getSymbol(self);
 @@ -2881,10 +2882,10 @@ pub fn updateDeclExports(
     for (exports) |exp| {
         if (exp.options.section) |section_name| {
             if (!mem.eql(u8, section_name, ".text")) {
-                try module.failed_exports.ensureUnusedCapacity(module.gpa, 1);
+                try mod.failed_exports.ensureUnusedCapacity(mod.gpa, 1);
-                module.failed_exports.putAssumeCapacityNoClobber(
+                mod.failed_exports.putAssumeCapacityNoClobber(
                     exp,
-                    try Module.ErrorMsg.create(self.base.allocator, decl.srcLoc(), "Unimplemented: ExportOptions.section", .{}),
+                    try Module.ErrorMsg.create(self.base.allocator, decl.srcLoc(mod), "Unimplemented: ExportOptions.section", .{}),
                 );
                 continue;
             }
 @@ -2900,10 +2901,10 @@ pub fn updateDeclExports(
             },
             .Weak => elf.STB_WEAK,
             .LinkOnce => {
-                try module.failed_exports.ensureUnusedCapacity(module.gpa, 1);
+                try mod.failed_exports.ensureUnusedCapacity(mod.gpa, 1);
-                module.failed_exports.putAssumeCapacityNoClobber(
+                mod.failed_exports.putAssumeCapacityNoClobber(
                     exp,
-                    try Module.ErrorMsg.create(self.base.allocator, decl.srcLoc(), "Unimplemented: GlobalLinkage.LinkOnce", .{}),
+                    try Module.ErrorMsg.create(self.base.allocator, decl.srcLoc(mod), "Unimplemented: GlobalLinkage.LinkOnce", .{}),
                 );
                 continue;
             },

src/link/MachO.zig+42-42

 @@ -1847,18 +1847,18 @@ fn addStubEntry(self: *MachO, target: SymbolWithLoc) !void {
     self.markRelocsDirtyByTarget(target);
 }
-pub fn updateFunc(self: *MachO, module: *Module, func: *Module.Fn, air: Air, liveness: Liveness) !void {
+pub fn updateFunc(self: *MachO, mod: *Module, func: *Module.Fn, air: Air, liveness: Liveness) !void {
     if (build_options.skip_non_native and builtin.object_format != .macho) {
         @panic("Attempted to compile for object format that was disabled by build configuration");
     }
     if (build_options.have_llvm) {
-        if (self.llvm_object) |llvm_object| return llvm_object.updateFunc(module, func, air, liveness);
+        if (self.llvm_object) |llvm_object| return llvm_object.updateFunc(mod, func, air, liveness);
     }
     const tracy = trace(@src());
     defer tracy.end();
     const decl_index = func.owner_decl;
-    const decl = module.declPtr(decl_index);
+    const decl = mod.declPtr(decl_index);
     const atom_index = try self.getOrCreateAtomForDecl(decl_index);
     self.freeUnnamedConsts(decl_index);
 @@ -1868,23 +1868,23 @@ pub fn updateFunc(self: *MachO, module: *Module, func: *Module.Fn, air: Air, liv
     defer code_buffer.deinit();
     var decl_state = if (self.d_sym) |*d_sym|
-        try d_sym.dwarf.initDeclState(module, decl_index)
+        try d_sym.dwarf.initDeclState(mod, decl_index)
     else
         null;
     defer if (decl_state) |*ds| ds.deinit();
     const res = if (decl_state) |*ds|
-        try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .{
+        try codegen.generateFunction(&self.base, decl.srcLoc(mod), func, air, liveness, &code_buffer, .{
             .dwarf = ds,
         })
     else
-        try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .none);
+        try codegen.generateFunction(&self.base, decl.srcLoc(mod), func, air, liveness, &code_buffer, .none);
     var code = switch (res) {
         .ok => code_buffer.items,
         .fail => |em| {
             decl.analysis = .codegen_failure;
-            try module.failed_decls.put(module.gpa, decl_index, em);
+            try mod.failed_decls.put(mod.gpa, decl_index, em);
             return;
         },
     };
 @@ -1893,7 +1893,7 @@ pub fn updateFunc(self: *MachO, module: *Module, func: *Module.Fn, air: Air, liv
     if (decl_state) |*ds| {
         try self.d_sym.?.dwarf.commitDeclState(
-            module,
+            mod,
             decl_index,
             addr,
             self.getAtom(atom_index).size,
 @@ -1903,7 +1903,7 @@ pub fn updateFunc(self: *MachO, module: *Module, func: *Module.Fn, air: Air, liv
     // Since we updated the vaddr and the size, each corresponding export symbol also
     // needs to be updated.
-    try self.updateDeclExports(module, decl_index, module.getDeclExports(decl_index));
+    try self.updateDeclExports(mod, decl_index, mod.getDeclExports(decl_index));
 }
 pub fn lowerUnnamedConst(self: *MachO, typed_value: TypedValue, decl_index: Module.Decl.Index) !u32 {
 @@ -1912,15 +1912,15 @@ pub fn lowerUnnamedConst(self: *MachO, typed_value: TypedValue, decl_index: Modu
     var code_buffer = std.ArrayList(u8).init(gpa);
     defer code_buffer.deinit();
-    const module = self.base.options.module.?;
+    const mod = self.base.options.module.?;
     const gop = try self.unnamed_const_atoms.getOrPut(gpa, decl_index);
     if (!gop.found_existing) {
         gop.value_ptr.* = .{};
     }
     const unnamed_consts = gop.value_ptr;
-    const decl = module.declPtr(decl_index);
+    const decl = mod.declPtr(decl_index);
-    const decl_name = try decl.getFullyQualifiedName(module);
+    const decl_name = try decl.getFullyQualifiedName(mod);
     defer gpa.free(decl_name);
     const name_str_index = blk: {
 @@ -1935,20 +1935,19 @@ pub fn lowerUnnamedConst(self: *MachO, typed_value: TypedValue, decl_index: Modu
     const atom_index = try self.createAtom();
-    const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), typed_value, &code_buffer, .none, .{
+    const res = try codegen.generateSymbol(&self.base, decl.srcLoc(mod), typed_value, &code_buffer, .none, .{
         .parent_atom_index = self.getAtom(atom_index).getSymbolIndex().?,
     });
     var code = switch (res) {
         .ok => code_buffer.items,
         .fail => |em| {
             decl.analysis = .codegen_failure;
-            try module.failed_decls.put(module.gpa, decl_index, em);
+            try mod.failed_decls.put(mod.gpa, decl_index, em);
             log.err("{s}", .{em.msg});
             return error.CodegenFail;
         },
     };
-    const mod = self.base.options.module.?;
     const required_alignment = typed_value.ty.abiAlignment(mod);
     const atom = self.getAtomPtr(atom_index);
     atom.size = code.len;
 @@ -1972,17 +1971,17 @@ pub fn lowerUnnamedConst(self: *MachO, typed_value: TypedValue, decl_index: Modu
     return atom.getSymbolIndex().?;
 }
-pub fn updateDecl(self: *MachO, module: *Module, decl_index: Module.Decl.Index) !void {
+pub fn updateDecl(self: *MachO, mod: *Module, decl_index: Module.Decl.Index) !void {
     if (build_options.skip_non_native and builtin.object_format != .macho) {
         @panic("Attempted to compile for object format that was disabled by build configuration");
     }
     if (build_options.have_llvm) {
-        if (self.llvm_object) |llvm_object| return llvm_object.updateDecl(module, decl_index);
+        if (self.llvm_object) |llvm_object| return llvm_object.updateDecl(mod, decl_index);
     }
     const tracy = trace(@src());
     defer tracy.end();
-    const decl = module.declPtr(decl_index);
+    const decl = mod.declPtr(decl_index);
     if (decl.val.tag() == .extern_fn) {
         return; // TODO Should we do more when front-end analyzed extern decl?
 @@ -1998,7 +1997,7 @@ pub fn updateDecl(self: *MachO, module: *Module, decl_index: Module.Decl.Index)
         payload.data.is_threadlocal and !self.base.options.single_threaded
     else
         false;
-    if (is_threadlocal) return self.updateThreadlocalVariable(module, decl_index);
+    if (is_threadlocal) return self.updateThreadlocalVariable(mod, decl_index);
     const atom_index = try self.getOrCreateAtomForDecl(decl_index);
     const sym_index = self.getAtom(atom_index).getSymbolIndex().?;
 @@ -2008,14 +2007,14 @@ pub fn updateDecl(self: *MachO, module: *Module, decl_index: Module.Decl.Index)
     defer code_buffer.deinit();
     var decl_state: ?Dwarf.DeclState = if (self.d_sym) |*d_sym|
-        try d_sym.dwarf.initDeclState(module, decl_index)
+        try d_sym.dwarf.initDeclState(mod, decl_index)
     else
         null;
     defer if (decl_state) |*ds| ds.deinit();
     const decl_val = if (decl.val.castTag(.variable)) |payload| payload.data.init else decl.val;
     const res = if (decl_state) |*ds|
-        try codegen.generateSymbol(&self.base, decl.srcLoc(), .{
+        try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{
             .ty = decl.ty,
             .val = decl_val,
         }, &code_buffer, .{
 @@ -2024,7 +2023,7 @@ pub fn updateDecl(self: *MachO, module: *Module, decl_index: Module.Decl.Index)
             .parent_atom_index = sym_index,
         })
     else
-        try codegen.generateSymbol(&self.base, decl.srcLoc(), .{
+        try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{
             .ty = decl.ty,
             .val = decl_val,
         }, &code_buffer, .none, .{
 @@ -2035,7 +2034,7 @@ pub fn updateDecl(self: *MachO, module: *Module, decl_index: Module.Decl.Index)
         .ok => code_buffer.items,
         .fail => |em| {
             decl.analysis = .codegen_failure;
-            try module.failed_decls.put(module.gpa, decl_index, em);
+            try mod.failed_decls.put(mod.gpa, decl_index, em);
             return;
         },
     };
 @@ -2043,7 +2042,7 @@ pub fn updateDecl(self: *MachO, module: *Module, decl_index: Module.Decl.Index)
     if (decl_state) |*ds| {
         try self.d_sym.?.dwarf.commitDeclState(
-            module,
+            mod,
             decl_index,
             addr,
             self.getAtom(atom_index).size,
 @@ -2053,7 +2052,7 @@ pub fn updateDecl(self: *MachO, module: *Module, decl_index: Module.Decl.Index)
     // Since we updated the vaddr and the size, each corresponding export symbol also
     // needs to be updated.
-    try self.updateDeclExports(module, decl_index, module.getDeclExports(decl_index));
+    try self.updateDeclExports(mod, decl_index, mod.getDeclExports(decl_index));
 }
 fn updateLazySymbolAtom(
 @@ -2082,8 +2081,8 @@ fn updateLazySymbolAtom(
     const atom = self.getAtomPtr(atom_index);
     const local_sym_index = atom.getSymbolIndex().?;
-    const src = if (sym.ty.getOwnerDeclOrNull()) |owner_decl|
+    const src = if (sym.ty.getOwnerDeclOrNull(mod)) |owner_decl|
-        mod.declPtr(owner_decl).srcLoc()
+        mod.declPtr(owner_decl).srcLoc(mod)
     else
         Module.SrcLoc{
             .file_scope = undefined,
 @@ -2127,7 +2126,8 @@ fn updateLazySymbolAtom(
 }
 pub fn getOrCreateAtomForLazySymbol(self: *MachO, sym: File.LazySymbol) !Atom.Index {
-    const gop = try self.lazy_syms.getOrPut(self.base.allocator, sym.getDecl());
+    const mod = self.base.options.module.?;
+    const gop = try self.lazy_syms.getOrPut(self.base.allocator, sym.getDecl(mod));
     errdefer _ = if (!gop.found_existing) self.lazy_syms.pop();
     if (!gop.found_existing) gop.value_ptr.* = .{};
     const metadata: struct { atom: *Atom.Index, state: *LazySymbolMetadata.State } = switch (sym.kind) {
 @@ -2145,7 +2145,7 @@ pub fn getOrCreateAtomForLazySymbol(self: *MachO, sym: File.LazySymbol) !Atom.In
     metadata.state.* = .pending_flush;
     const atom = metadata.atom.*;
     // anyerror needs to be deferred until flushModule
-    if (sym.getDecl() != .none) try self.updateLazySymbolAtom(sym, atom, switch (sym.kind) {
+    if (sym.getDecl(mod) != .none) try self.updateLazySymbolAtom(sym, atom, switch (sym.kind) {
         .code => self.text_section_index.?,
         .const_data => self.data_const_section_index.?,
     });
 @@ -2179,7 +2179,7 @@ fn updateThreadlocalVariable(self: *MachO, module: *Module, decl_index: Module.D
     const decl_metadata = self.decls.get(decl_index).?;
     const decl_val = decl.val.castTag(.variable).?.data.init;
     const res = if (decl_state) |*ds|
-        try codegen.generateSymbol(&self.base, decl.srcLoc(), .{
+        try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{
             .ty = decl.ty,
             .val = decl_val,
         }, &code_buffer, .{
 @@ -2188,7 +2188,7 @@ fn updateThreadlocalVariable(self: *MachO, module: *Module, decl_index: Module.D
             .parent_atom_index = init_sym_index,
         })
     else
-        try codegen.generateSymbol(&self.base, decl.srcLoc(), .{
+        try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{
             .ty = decl.ty,
             .val = decl_val,
         }, &code_buffer, .none, .{
 @@ -2379,7 +2379,7 @@ pub fn updateDeclLineNumber(self: *MachO, module: *Module, decl_index: Module.De
 pub fn updateDeclExports(
     self: *MachO,
-    module: *Module,
+    mod: *Module,
     decl_index: Module.Decl.Index,
     exports: []const *Module.Export,
 ) File.UpdateDeclExportsError!void {
 @@ -2388,7 +2388,7 @@ pub fn updateDeclExports(
     }
     if (build_options.have_llvm) {
         if (self.llvm_object) |llvm_object|
-            return llvm_object.updateDeclExports(module, decl_index, exports);
+            return llvm_object.updateDeclExports(mod, decl_index, exports);
     }
     const tracy = trace(@src());
 @@ -2396,7 +2396,7 @@ pub fn updateDeclExports(
     const gpa = self.base.allocator;
-    const decl = module.declPtr(decl_index);
+    const decl = mod.declPtr(decl_index);
     const atom_index = try self.getOrCreateAtomForDecl(decl_index);
     const atom = self.getAtom(atom_index);
     const decl_sym = atom.getSymbol(self);
 @@ -2410,12 +2410,12 @@ pub fn updateDeclExports(
         if (exp.options.section) |section_name| {
             if (!mem.eql(u8, section_name, "__text")) {
-                try module.failed_exports.putNoClobber(
+                try mod.failed_exports.putNoClobber(
-                    module.gpa,
+                    mod.gpa,
                     exp,
                     try Module.ErrorMsg.create(
                         gpa,
-                        decl.srcLoc(),
+                        decl.srcLoc(mod),
                         "Unimplemented: ExportOptions.section",
                         .{},
                     ),
 @@ -2425,12 +2425,12 @@ pub fn updateDeclExports(
         }
         if (exp.options.linkage == .LinkOnce) {
-            try module.failed_exports.putNoClobber(
+            try mod.failed_exports.putNoClobber(
-                module.gpa,
+                mod.gpa,
                 exp,
                 try Module.ErrorMsg.create(
                     gpa,
-                    decl.srcLoc(),
+                    decl.srcLoc(mod),
                     "Unimplemented: GlobalLinkage.LinkOnce",
                     .{},
                 ),
 @@ -2474,9 +2474,9 @@ pub fn updateDeclExports(
                 // TODO: this needs rethinking
                 const global = self.getGlobal(exp_name).?;
                 if (sym_loc.sym_index != global.sym_index and global.file != null) {
-                    _ = try module.failed_exports.put(module.gpa, exp, try Module.ErrorMsg.create(
+                    _ = try mod.failed_exports.put(mod.gpa, exp, try Module.ErrorMsg.create(
                         gpa,
-                        decl.srcLoc(),
+                        decl.srcLoc(mod),
                         \\LinkError: symbol '{s}' defined multiple times
                     ,
                         .{exp_name},

src/link/Plan9.zig+16-16

src/link/Wasm.zig+7-7

...	@@ -1348,7 +1348,7 @@ pub fn updateFunc(wasm: Wasm, mod: Module, func: *Module.Fn, air: Air, livenes	...	@@ -1348,7 +1348,7 @@ pub fn updateFunc(wasm: Wasm, mod: Module, func: *Module.Fn, air: Air, livenes
1348	defer code_writer.deinit();	1348	defer code_writer.deinit();
1349	// const result = try codegen.generateFunction(	1349	// const result = try codegen.generateFunction(
1350	// &wasm.base,	1350	// &wasm.base,
1351	// decl.srcLoc(),	1351	// decl.srcLoc(mod),
1352	// func,	1352	// func,
1353	// air,	1353	// air,
1354	// liveness,	1354	// liveness,
...	@@ -1357,7 +1357,7 @@ pub fn updateFunc(wasm: Wasm, mod: Module, func: *Module.Fn, air: Air, livenes	...	@@ -1357,7 +1357,7 @@ pub fn updateFunc(wasm: Wasm, mod: Module, func: *Module.Fn, air: Air, livenes
1357	// );	1357	// );
1358	const result = try codegen.generateFunction(	1358	const result = try codegen.generateFunction(
1359	&wasm.base,	1359	&wasm.base,
1360	decl.srcLoc(),	1360	decl.srcLoc(mod),
1361	func,	1361	func,
1362	air,	1362	air,
1363	liveness,	1363	liveness,
...	@@ -1425,7 +1425,7 @@ pub fn updateDecl(wasm: Wasm, mod: Module, decl_index: Module.Decl.Index) !voi	...	@@ -1425,7 +1425,7 @@ pub fn updateDecl(wasm: Wasm, mod: Module, decl_index: Module.Decl.Index) !voi
1425		1425
1426	const res = try codegen.generateSymbol(	1426	const res = try codegen.generateSymbol(
1427	&wasm.base,	1427	&wasm.base,
1428	decl.srcLoc(),	1428	decl.srcLoc(mod),
1429	.{ .ty = decl.ty, .val = val },	1429	.{ .ty = decl.ty, .val = val },
1430	&code_writer,	1430	&code_writer,
1431	.none,	1431	.none,
...	@@ -1554,7 +1554,7 @@ pub fn lowerUnnamedConst(wasm: *Wasm, tv: TypedValue, decl_index: Module.Decl.In	...	@@ -1554,7 +1554,7 @@ pub fn lowerUnnamedConst(wasm: *Wasm, tv: TypedValue, decl_index: Module.Decl.In
1554		1554
1555	const result = try codegen.generateSymbol(	1555	const result = try codegen.generateSymbol(
1556	&wasm.base,	1556	&wasm.base,
1557	decl.srcLoc(),	1557	decl.srcLoc(mod),
1558	tv,	1558	tv,
1559	&value_bytes,	1559	&value_bytes,
1560	.none,	1560	.none,
...	@@ -1693,7 +1693,7 @@ pub fn updateDeclExports(	...	@@ -1693,7 +1693,7 @@ pub fn updateDeclExports(
1693	if (exp.options.section) \|section\| {	1693	if (exp.options.section) \|section\| {
1694	try mod.failed_exports.putNoClobber(mod.gpa, exp, try Module.ErrorMsg.create(	1694	try mod.failed_exports.putNoClobber(mod.gpa, exp, try Module.ErrorMsg.create(
1695	mod.gpa,	1695	mod.gpa,
1696	decl.srcLoc(),	1696	decl.srcLoc(mod),
1697	"Unimplemented: ExportOptions.section '{s}'",	1697	"Unimplemented: ExportOptions.section '{s}'",
1698	.{section},	1698	.{section},
1699	));	1699	));
...	@@ -1712,7 +1712,7 @@ pub fn updateDeclExports(	...	@@ -1712,7 +1712,7 @@ pub fn updateDeclExports(
1712	if (!exp_is_weak and !existing_sym.isWeak()) {	1712	if (!exp_is_weak and !existing_sym.isWeak()) {
1713	try mod.failed_exports.put(mod.gpa, exp, try Module.ErrorMsg.create(	1713	try mod.failed_exports.put(mod.gpa, exp, try Module.ErrorMsg.create(
1714	mod.gpa,	1714	mod.gpa,
1715	decl.srcLoc(),	1715	decl.srcLoc(mod),
1716	\\LinkError: symbol '{s}' defined multiple times	1716	\\LinkError: symbol '{s}' defined multiple times
1717	\\ first definition in '{s}'	1717	\\ first definition in '{s}'
1718	\\ next definition in '{s}'	1718	\\ next definition in '{s}'
...	@@ -1745,7 +1745,7 @@ pub fn updateDeclExports(	...	@@ -1745,7 +1745,7 @@ pub fn updateDeclExports(
1745	.LinkOnce => {	1745	.LinkOnce => {
1746	try mod.failed_exports.putNoClobber(mod.gpa, exp, try Module.ErrorMsg.create(	1746	try mod.failed_exports.putNoClobber(mod.gpa, exp, try Module.ErrorMsg.create(
1747	mod.gpa,	1747	mod.gpa,
1748	decl.srcLoc(),	1748	decl.srcLoc(mod),
1749	"Unimplemented: LinkOnce",	1749	"Unimplemented: LinkOnce",
1750	.{},	1750	.{},
1751	));	1751	));

src/type.zig+103-118

...	@@ -42,8 +42,6 @@ pub const Type = struct {	...	@@ -42,8 +42,6 @@ pub const Type = struct {
42	.error_set_merged,	42	.error_set_merged,
43	=> return .ErrorSet,	43	=> return .ErrorSet,
44		44
45	.@"opaque" => return .Opaque,
46
47	.function => return .Fn,	45	.function => return .Fn,
48		46
49	.array,	47	.array,
...	@@ -87,6 +85,7 @@ pub const Type = struct {	...	@@ -87,6 +85,7 @@ pub const Type = struct {
87	.error_union_type => return .ErrorUnion,	85	.error_union_type => return .ErrorUnion,
88	.struct_type => return .Struct,	86	.struct_type => return .Struct,
89	.union_type => return .Union,	87	.union_type => return .Union,
		88	.opaque_type => return .Opaque,
90	.simple_type => \|s\| switch (s) {	89	.simple_type => \|s\| switch (s) {
91	.f16,	90	.f16,
92	.f32,	91	.f32,
...	@@ -361,12 +360,6 @@ pub const Type = struct {	...	@@ -361,12 +360,6 @@ pub const Type = struct {
361	return true;	360	return true;
362	},	361	},
363		362
364	.@"opaque" => {
365	const opaque_obj_a = a.castTag(.@"opaque").?.data;
366	const opaque_obj_b = (b.castTag(.@"opaque") orelse return false).data;
367	return opaque_obj_a == opaque_obj_b;
368	},
369
370	.function => {	363	.function => {
371	if (b.zigTypeTag(mod) != .Fn) return false;	364	if (b.zigTypeTag(mod) != .Fn) return false;
372		365
...	@@ -649,12 +642,6 @@ pub const Type = struct {	...	@@ -649,12 +642,6 @@ pub const Type = struct {
649	std.hash.autoHash(hasher, ies);	642	std.hash.autoHash(hasher, ies);
650	},	643	},
651		644
652	.@"opaque" => {
653	std.hash.autoHash(hasher, std.builtin.TypeId.Opaque);
654	const opaque_obj = ty.castTag(.@"opaque").?.data;
655	std.hash.autoHash(hasher, opaque_obj);
656	},
657
658	.function => {	645	.function => {
659	std.hash.autoHash(hasher, std.builtin.TypeId.Fn);	646	std.hash.autoHash(hasher, std.builtin.TypeId.Fn);
660		647
...	@@ -974,7 +961,6 @@ pub const Type = struct {	...	@@ -974,7 +961,6 @@ pub const Type = struct {
974	.enum_simple => return self.copyPayloadShallow(allocator, Payload.EnumSimple),	961	.enum_simple => return self.copyPayloadShallow(allocator, Payload.EnumSimple),
975	.enum_numbered => return self.copyPayloadShallow(allocator, Payload.EnumNumbered),	962	.enum_numbered => return self.copyPayloadShallow(allocator, Payload.EnumNumbered),
976	.enum_full, .enum_nonexhaustive => return self.copyPayloadShallow(allocator, Payload.EnumFull),	963	.enum_full, .enum_nonexhaustive => return self.copyPayloadShallow(allocator, Payload.EnumFull),
977	.@"opaque" => return self.copyPayloadShallow(allocator, Payload.Opaque),
978	}	964	}
979	}	965	}
980		966
...	@@ -1079,12 +1065,6 @@ pub const Type = struct {	...	@@ -1079,12 +1065,6 @@ pub const Type = struct {
1079	@tagName(t), enum_numbered.owner_decl,	1065	@tagName(t), enum_numbered.owner_decl,
1080	});	1066	});
1081	},	1067	},
1082	.@"opaque" => {
1083	const opaque_obj = ty.castTag(.@"opaque").?.data;
1084	return writer.print("({s} decl={d})", .{
1085	@tagName(t), opaque_obj.owner_decl,
1086	});
1087	},
1088		1068
1089	.function => {	1069	.function => {
1090	const payload = ty.castTag(.function).?.data;	1070	const payload = ty.castTag(.function).?.data;
...	@@ -1303,11 +1283,6 @@ pub const Type = struct {	...	@@ -1303,11 +1283,6 @@ pub const Type = struct {
1303	const decl = mod.declPtr(enum_numbered.owner_decl);	1283	const decl = mod.declPtr(enum_numbered.owner_decl);
1304	try decl.renderFullyQualifiedName(mod, writer);	1284	try decl.renderFullyQualifiedName(mod, writer);
1305	},	1285	},
1306	.@"opaque" => {
1307	const opaque_obj = ty.cast(Payload.Opaque).?.data;
1308	const decl = mod.declPtr(opaque_obj.owner_decl);
1309	try decl.renderFullyQualifiedName(mod, writer);
1310	},
1311		1286
1312	.error_set_inferred => {	1287	.error_set_inferred => {
1313	const func = ty.castTag(.error_set_inferred).?.data.func;	1288	const func = ty.castTag(.error_set_inferred).?.data.func;
...	@@ -1575,6 +1550,10 @@ pub const Type = struct {	...	@@ -1575,6 +1550,10 @@ pub const Type = struct {
1575	.simple_type => \|s\| return writer.writeAll(@tagName(s)),	1550	.simple_type => \|s\| return writer.writeAll(@tagName(s)),
1576	.struct_type => @panic("TODO"),	1551	.struct_type => @panic("TODO"),
1577	.union_type => @panic("TODO"),	1552	.union_type => @panic("TODO"),
		1553	.opaque_type => \|opaque_type\| {
		1554	const decl = mod.declPtr(opaque_type.decl);
		1555	try decl.renderFullyQualifiedName(mod, writer);
		1556	},
1578		1557
1579	// values, not types	1558	// values, not types
1580	.simple_value => unreachable,	1559	.simple_value => unreachable,
...	@@ -1622,7 +1601,6 @@ pub const Type = struct {	...	@@ -1622,7 +1601,6 @@ pub const Type = struct {
1622	.none => switch (ty.tag()) {	1601	.none => switch (ty.tag()) {
1623	.error_set_inferred,	1602	.error_set_inferred,
1624		1603
1625	.@"opaque",
1626	.error_set_single,	1604	.error_set_single,
1627	.error_union,	1605	.error_union,
1628	.error_set,	1606	.error_set,
...	@@ -1759,8 +1737,8 @@ pub const Type = struct {	...	@@ -1759,8 +1737,8 @@ pub const Type = struct {
1759	.inferred_alloc_const => unreachable,	1737	.inferred_alloc_const => unreachable,
1760	.inferred_alloc_mut => unreachable,	1738	.inferred_alloc_mut => unreachable,
1761	},	1739	},
1762	else => switch (mod.intern_pool.indexToKey(ty.ip_index)) {	1740	else => return switch (mod.intern_pool.indexToKey(ty.ip_index)) {
1763	.int_type => \|int_type\| return int_type.bits != 0,	1741	.int_type => \|int_type\| int_type.bits != 0,
1764	.ptr_type => \|ptr_type\| {	1742	.ptr_type => \|ptr_type\| {
1765	// Pointers to zero-bit types still have a runtime address; however, pointers	1743	// Pointers to zero-bit types still have a runtime address; however, pointers
1766	// to comptime-only types do not, with the exception of function pointers.	1744	// to comptime-only types do not, with the exception of function pointers.
...	@@ -1797,7 +1775,7 @@ pub const Type = struct {	...	@@ -1797,7 +1775,7 @@ pub const Type = struct {
1797	}	1775	}
1798	},	1776	},
1799	.error_union_type => @panic("TODO"),	1777	.error_union_type => @panic("TODO"),
1800	.simple_type => \|t\| return switch (t) {	1778	.simple_type => \|t\| switch (t) {
1801	.f16,	1779	.f16,
1802	.f32,	1780	.f32,
1803	.f64,	1781	.f64,
...	@@ -1848,6 +1826,7 @@ pub const Type = struct {	...	@@ -1848,6 +1826,7 @@ pub const Type = struct {
1848	},	1826	},
1849	.struct_type => @panic("TODO"),	1827	.struct_type => @panic("TODO"),
1850	.union_type => @panic("TODO"),	1828	.union_type => @panic("TODO"),
		1829	.opaque_type => true,
1851		1830
1852	// values, not types	1831	// values, not types
1853	.simple_value => unreachable,	1832	.simple_value => unreachable,
...	@@ -1876,7 +1855,6 @@ pub const Type = struct {	...	@@ -1876,7 +1855,6 @@ pub const Type = struct {
1876	.error_set_single,	1855	.error_set_single,
1877	.error_set_inferred,	1856	.error_set_inferred,
1878	.error_set_merged,	1857	.error_set_merged,
1879	.@"opaque",
1880	// These are function bodies, not function pointers.	1858	// These are function bodies, not function pointers.
1881	.function,	1859	.function,
1882	.enum_simple,	1860	.enum_simple,
...	@@ -1960,6 +1938,7 @@ pub const Type = struct {	...	@@ -1960,6 +1938,7 @@ pub const Type = struct {
1960	},	1938	},
1961	.struct_type => @panic("TODO"),	1939	.struct_type => @panic("TODO"),
1962	.union_type => @panic("TODO"),	1940	.union_type => @panic("TODO"),
		1941	.opaque_type => false,
1963		1942
1964	// values, not types	1943	// values, not types
1965	.simple_value => unreachable,	1944	.simple_value => unreachable,
...	@@ -2144,8 +2123,6 @@ pub const Type = struct {	...	@@ -2144,8 +2123,6 @@ pub const Type = struct {
2144	switch (ty.ip_index) {	2123	switch (ty.ip_index) {
2145	.empty_struct_type => return AbiAlignmentAdvanced{ .scalar = 0 },	2124	.empty_struct_type => return AbiAlignmentAdvanced{ .scalar = 0 },
2146	.none => switch (ty.tag()) {	2125	.none => switch (ty.tag()) {
2147	.@"opaque" => return AbiAlignmentAdvanced{ .scalar = 1 },
2148
2149	// represents machine code; not a pointer	2126	// represents machine code; not a pointer
2150	.function => {	2127	.function => {
2151	const alignment = ty.castTag(.function).?.data.alignment;	2128	const alignment = ty.castTag(.function).?.data.alignment;
...	@@ -2362,6 +2339,7 @@ pub const Type = struct {	...	@@ -2362,6 +2339,7 @@ pub const Type = struct {
2362	},	2339	},
2363	.struct_type => @panic("TODO"),	2340	.struct_type => @panic("TODO"),
2364	.union_type => @panic("TODO"),	2341	.union_type => @panic("TODO"),
		2342	.opaque_type => return AbiAlignmentAdvanced{ .scalar = 1 },
2365		2343
2366	// values, not types	2344	// values, not types
2367	.simple_value => unreachable,	2345	.simple_value => unreachable,
...	@@ -2536,7 +2514,6 @@ pub const Type = struct {	...	@@ -2536,7 +2514,6 @@ pub const Type = struct {
2536		2514
2537	.none => switch (ty.tag()) {	2515	.none => switch (ty.tag()) {
2538	.function => unreachable, // represents machine code; not a pointer	2516	.function => unreachable, // represents machine code; not a pointer
2539	.@"opaque" => unreachable, // no size available
2540	.inferred_alloc_const => unreachable,	2517	.inferred_alloc_const => unreachable,
2541	.inferred_alloc_mut => unreachable,	2518	.inferred_alloc_mut => unreachable,
2542		2519
...	@@ -2777,6 +2754,7 @@ pub const Type = struct {	...	@@ -2777,6 +2754,7 @@ pub const Type = struct {
2777	},	2754	},
2778	.struct_type => @panic("TODO"),	2755	.struct_type => @panic("TODO"),
2779	.union_type => @panic("TODO"),	2756	.union_type => @panic("TODO"),
		2757	.opaque_type => unreachable, // no size available
2780		2758
2781	// values, not types	2759	// values, not types
2782	.simple_value => unreachable,	2760	.simple_value => unreachable,
...	@@ -2948,6 +2926,7 @@ pub const Type = struct {	...	@@ -2948,6 +2926,7 @@ pub const Type = struct {
2948	},	2926	},
2949	.struct_type => @panic("TODO"),	2927	.struct_type => @panic("TODO"),
2950	.union_type => @panic("TODO"),	2928	.union_type => @panic("TODO"),
		2929	.opaque_type => unreachable,
2951		2930
2952	// values, not types	2931	// values, not types
2953	.simple_value => unreachable,	2932	.simple_value => unreachable,
...	@@ -2965,7 +2944,6 @@ pub const Type = struct {	...	@@ -2965,7 +2944,6 @@ pub const Type = struct {
2965	.empty_struct => unreachable,	2944	.empty_struct => unreachable,
2966	.inferred_alloc_const => unreachable,	2945	.inferred_alloc_const => unreachable,
2967	.inferred_alloc_mut => unreachable,	2946	.inferred_alloc_mut => unreachable,
2968	.@"opaque" => unreachable,
2969		2947
2970	.@"struct" => {	2948	.@"struct" => {
2971	const struct_obj = ty.castTag(.@"struct").?.data;	2949	const struct_obj = ty.castTag(.@"struct").?.data;
...	@@ -3806,6 +3784,7 @@ pub const Type = struct {	...	@@ -3806,6 +3784,7 @@ pub const Type = struct {
3806	.simple_type => unreachable, // handled via Index enum tag above	3784	.simple_type => unreachable, // handled via Index enum tag above
3807	.struct_type => @panic("TODO"),	3785	.struct_type => @panic("TODO"),
3808	.union_type => unreachable,	3786	.union_type => unreachable,
		3787	.opaque_type => unreachable,
3809		3788
3810	// values, not types	3789	// values, not types
3811	.simple_value => unreachable,	3790	.simple_value => unreachable,
...	@@ -4004,7 +3983,6 @@ pub const Type = struct {	...	@@ -4004,7 +3983,6 @@ pub const Type = struct {
4004	.function,	3983	.function,
4005	.array_sentinel,	3984	.array_sentinel,
4006	.error_set_inferred,	3985	.error_set_inferred,
4007	.@"opaque",
4008	.anyframe_T,	3986	.anyframe_T,
4009	.pointer,	3987	.pointer,
4010	=> return null,	3988	=> return null,
...	@@ -4182,6 +4160,7 @@ pub const Type = struct {	...	@@ -4182,6 +4160,7 @@ pub const Type = struct {
4182	},	4160	},
4183	.struct_type => @panic("TODO"),	4161	.struct_type => @panic("TODO"),
4184	.union_type => @panic("TODO"),	4162	.union_type => @panic("TODO"),
		4163	.opaque_type => return null,
4185		4164
4186	// values, not types	4165	// values, not types
4187	.simple_value => unreachable,	4166	.simple_value => unreachable,
...	@@ -4208,7 +4187,6 @@ pub const Type = struct {	...	@@ -4208,7 +4187,6 @@ pub const Type = struct {
4208	.error_set_single,	4187	.error_set_single,
4209	.error_set_inferred,	4188	.error_set_inferred,
4210	.error_set_merged,	4189	.error_set_merged,
4211	.@"opaque",
4212	.enum_simple,	4190	.enum_simple,
4213	=> false,	4191	=> false,
4214		4192
...	@@ -4350,6 +4328,7 @@ pub const Type = struct {	...	@@ -4350,6 +4328,7 @@ pub const Type = struct {
4350	},	4328	},
4351	.struct_type => @panic("TODO"),	4329	.struct_type => @panic("TODO"),
4352	.union_type => @panic("TODO"),	4330	.union_type => @panic("TODO"),
		4331	.opaque_type => false,
4353		4332
4354	// values, not types	4333	// values, not types
4355	.simple_value => unreachable,	4334	.simple_value => unreachable,
...	@@ -4399,21 +4378,31 @@ pub const Type = struct {	...	@@ -4399,21 +4378,31 @@ pub const Type = struct {
4399	}	4378	}
4400		4379
4401	/// Returns null if the type has no namespace.	4380	/// Returns null if the type has no namespace.
4402	pub fn getNamespace(self: Type) ?*Module.Namespace {	4381	pub fn getNamespaceIndex(ty: Type, mod: *Module) Module.Namespace.OptionalIndex {
4403	return switch (self.tag()) {	4382	return switch (ty.ip_index) {
4404	.@"struct" => &self.castTag(.@"struct").?.data.namespace,	4383	.none => switch (ty.tag()) {
4405	.enum_full => &self.castTag(.enum_full).?.data.namespace,	4384	.@"struct" => ty.castTag(.@"struct").?.data.namespace.toOptional(),
4406	.enum_nonexhaustive => &self.castTag(.enum_nonexhaustive).?.data.namespace,	4385	.enum_full => ty.castTag(.enum_full).?.data.namespace.toOptional(),
4407	.empty_struct => self.castTag(.empty_struct).?.data,	4386	.enum_nonexhaustive => ty.castTag(.enum_nonexhaustive).?.data.namespace.toOptional(),
4408	.@"opaque" => &self.castTag(.@"opaque").?.data.namespace,	4387	.empty_struct => @panic("TODO"),
4409	.@"union" => &self.castTag(.@"union").?.data.namespace,	4388	.@"union" => ty.castTag(.@"union").?.data.namespace.toOptional(),
4410	.union_safety_tagged => &self.castTag(.union_safety_tagged).?.data.namespace,	4389	.union_safety_tagged => ty.castTag(.union_safety_tagged).?.data.namespace.toOptional(),
4411	.union_tagged => &self.castTag(.union_tagged).?.data.namespace,	4390	.union_tagged => ty.castTag(.union_tagged).?.data.namespace.toOptional(),
4412		4391
4413	else => null,	4392	else => .none,
		4393	},
		4394	else => switch (mod.intern_pool.indexToKey(ty.ip_index)) {
		4395	.opaque_type => \|opaque_type\| opaque_type.namespace.toOptional(),
		4396	else => .none,
		4397	},
4414	};	4398	};
4415	}	4399	}
4416		4400
		4401	/// Returns null if the type has no namespace.
		4402	pub fn getNamespace(ty: Type, mod: Module) ?Module.Namespace {
		4403	return if (getNamespaceIndex(ty, mod).unwrap()) \|i\| mod.namespacePtr(i) else null;
		4404	}
		4405
4417	// Works for vectors and vectors of integers.	4406	// Works for vectors and vectors of integers.
4418	pub fn minInt(ty: Type, arena: Allocator, mod: *Module) !Value {	4407	pub fn minInt(ty: Type, arena: Allocator, mod: *Module) !Value {
4419	const scalar = try minIntScalar(ty.scalarType(mod), mod);	4408	const scalar = try minIntScalar(ty.scalarType(mod), mod);
...	@@ -4911,78 +4900,81 @@ pub const Type = struct {	...	@@ -4911,78 +4900,81 @@ pub const Type = struct {
4911	}	4900	}
4912		4901
4913	pub fn declSrcLocOrNull(ty: Type, mod: *Module) ?Module.SrcLoc {	4902	pub fn declSrcLocOrNull(ty: Type, mod: *Module) ?Module.SrcLoc {
4914	if (ty.ip_index != .none) switch (mod.intern_pool.indexToKey(ty.ip_index)) {	4903	switch (ty.ip_index) {
4915	.struct_type => @panic("TODO"),	4904	.none => switch (ty.tag()) {
4916	.union_type => @panic("TODO"),	4905	.enum_full, .enum_nonexhaustive => {
4917	else => return null,	4906	const enum_full = ty.cast(Payload.EnumFull).?.data;
4918	};	4907	return enum_full.srcLoc(mod);
4919	switch (ty.tag()) {	4908	},
4920	.enum_full, .enum_nonexhaustive => {	4909	.enum_numbered => {
4921	const enum_full = ty.cast(Payload.EnumFull).?.data;	4910	const enum_numbered = ty.castTag(.enum_numbered).?.data;
4922	return enum_full.srcLoc(mod);	4911	return enum_numbered.srcLoc(mod);
4923	},	4912	},
4924	.enum_numbered => {	4913	.enum_simple => {
4925	const enum_numbered = ty.castTag(.enum_numbered).?.data;	4914	const enum_simple = ty.castTag(.enum_simple).?.data;
4926	return enum_numbered.srcLoc(mod);	4915	return enum_simple.srcLoc(mod);
4927	},	4916	},
4928	.enum_simple => {	4917	.@"struct" => {
4929	const enum_simple = ty.castTag(.enum_simple).?.data;	4918	const struct_obj = ty.castTag(.@"struct").?.data;
4930	return enum_simple.srcLoc(mod);	4919	return struct_obj.srcLoc(mod);
4931	},	4920	},
4932	.@"struct" => {	4921	.error_set => {
4933	const struct_obj = ty.castTag(.@"struct").?.data;	4922	const error_set = ty.castTag(.error_set).?.data;
4934	return struct_obj.srcLoc(mod);	4923	return error_set.srcLoc(mod);
4935	},	4924	},
4936	.error_set => {	4925	.@"union", .union_safety_tagged, .union_tagged => {
4937	const error_set = ty.castTag(.error_set).?.data;	4926	const union_obj = ty.cast(Payload.Union).?.data;
4938	return error_set.srcLoc(mod);	4927	return union_obj.srcLoc(mod);
4939	},	4928	},
4940	.@"union", .union_safety_tagged, .union_tagged => {	4929
4941	const union_obj = ty.cast(Payload.Union).?.data;	4930	else => return null,
4942	return union_obj.srcLoc(mod);
4943	},	4931	},
4944	.@"opaque" => {	4932	else => return switch (mod.intern_pool.indexToKey(ty.ip_index)) {
4945	const opaque_obj = ty.cast(Payload.Opaque).?.data;	4933	.struct_type => @panic("TODO"),
4946	return opaque_obj.srcLoc(mod);	4934	.union_type => @panic("TODO"),
		4935	.opaque_type => \|opaque_type\| mod.opaqueSrcLoc(opaque_type),
		4936	else => null,
4947	},	4937	},
4948
4949	else => return null,
4950	}	4938	}
4951	}	4939	}
4952		4940
4953	pub fn getOwnerDecl(ty: Type) Module.Decl.Index {	4941	pub fn getOwnerDecl(ty: Type, mod: *Module) Module.Decl.Index {
4954	return ty.getOwnerDeclOrNull() orelse unreachable;	4942	return ty.getOwnerDeclOrNull(mod) orelse unreachable;
4955	}	4943	}
4956		4944
4957	pub fn getOwnerDeclOrNull(ty: Type) ?Module.Decl.Index {	4945	pub fn getOwnerDeclOrNull(ty: Type, mod: *Module) ?Module.Decl.Index {
4958	switch (ty.tag()) {	4946	switch (ty.ip_index) {
4959	.enum_full, .enum_nonexhaustive => {	4947	.none => switch (ty.tag()) {
4960	const enum_full = ty.cast(Payload.EnumFull).?.data;	4948	.enum_full, .enum_nonexhaustive => {
4961	return enum_full.owner_decl;	4949	const enum_full = ty.cast(Payload.EnumFull).?.data;
4962	},	4950	return enum_full.owner_decl;
4963	.enum_numbered => return ty.castTag(.enum_numbered).?.data.owner_decl,	4951	},
4964	.enum_simple => {	4952	.enum_numbered => return ty.castTag(.enum_numbered).?.data.owner_decl,
4965	const enum_simple = ty.castTag(.enum_simple).?.data;	4953	.enum_simple => {
4966	return enum_simple.owner_decl;	4954	const enum_simple = ty.castTag(.enum_simple).?.data;
4967	},	4955	return enum_simple.owner_decl;
4968	.@"struct" => {	4956	},
4969	const struct_obj = ty.castTag(.@"struct").?.data;	4957	.@"struct" => {
4970	return struct_obj.owner_decl;	4958	const struct_obj = ty.castTag(.@"struct").?.data;
4971	},	4959	return struct_obj.owner_decl;
4972	.error_set => {	4960	},
4973	const error_set = ty.castTag(.error_set).?.data;	4961	.error_set => {
4974	return error_set.owner_decl;	4962	const error_set = ty.castTag(.error_set).?.data;
4975	},	4963	return error_set.owner_decl;
4976	.@"union", .union_safety_tagged, .union_tagged => {	4964	},
4977	const union_obj = ty.cast(Payload.Union).?.data;	4965	.@"union", .union_safety_tagged, .union_tagged => {
4978	return union_obj.owner_decl;	4966	const union_obj = ty.cast(Payload.Union).?.data;
		4967	return union_obj.owner_decl;
		4968	},
		4969
		4970	else => return null,
4979	},	4971	},
4980	.@"opaque" => {	4972	else => return switch (mod.intern_pool.indexToKey(ty.ip_index)) {
4981	const opaque_obj = ty.cast(Payload.Opaque).?.data;	4973	.struct_type => @panic("TODO"),
4982	return opaque_obj.owner_decl;	4974	.union_type => @panic("TODO"),
		4975	.opaque_type => \|opaque_type\| opaque_type.decl,
		4976	else => null,
4983	},	4977	},
4984
4985	else => return null,
4986	}	4978	}
4987	}	4979	}
4988		4980
...	@@ -5022,7 +5014,6 @@ pub const Type = struct {	...	@@ -5022,7 +5014,6 @@ pub const Type = struct {
5022	error_set_inferred,	5014	error_set_inferred,
5023	error_set_merged,	5015	error_set_merged,
5024	empty_struct,	5016	empty_struct,
5025	@"opaque",
5026	@"struct",	5017	@"struct",
5027	@"union",	5018	@"union",
5028	union_safety_tagged,	5019	union_safety_tagged,
...	@@ -5055,7 +5046,6 @@ pub const Type = struct {	...	@@ -5055,7 +5046,6 @@ pub const Type = struct {
5055	.function => Payload.Function,	5046	.function => Payload.Function,
5056	.error_union => Payload.ErrorUnion,	5047	.error_union => Payload.ErrorUnion,
5057	.error_set_single => Payload.Name,	5048	.error_set_single => Payload.Name,
5058	.@"opaque" => Payload.Opaque,
5059	.@"struct" => Payload.Struct,	5049	.@"struct" => Payload.Struct,
5060	.@"union", .union_safety_tagged, .union_tagged => Payload.Union,	5050	.@"union", .union_safety_tagged, .union_tagged => Payload.Union,
5061	.enum_full, .enum_nonexhaustive => Payload.EnumFull,	5051	.enum_full, .enum_nonexhaustive => Payload.EnumFull,
...	@@ -5336,11 +5326,6 @@ pub const Type = struct {	...	@@ -5336,11 +5326,6 @@ pub const Type = struct {
5336	data: *Module.Namespace,	5326	data: *Module.Namespace,
5337	};	5327	};
5338		5328
5339	pub const Opaque = struct {
5340	base: Payload = .{ .tag = .@"opaque" },
5341	data: *Module.Opaque,
5342	};
5343
5344	pub const Struct = struct {	5329	pub const Struct = struct {
5345	base: Payload = .{ .tag = .@"struct" },	5330	base: Payload = .{ .tag = .@"struct" },
5346	data: *Module.Struct,	5331	data: *Module.Struct,

...	@@ -2048,7 +2048,7 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void	...	@@ -2048,7 +2048,7 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void
2048	assert(decl.deletion_flag);	2048	assert(decl.deletion_flag);
2049	assert(decl.dependants.count() == 0);	2049	assert(decl.dependants.count() == 0);
2050	const is_anon = if (decl.zir_decl_index == 0) blk: {	2050	const is_anon = if (decl.zir_decl_index == 0) blk: {
2051	break :blk decl.src_namespace.anon_decls.swapRemove(decl_index);	2051	break :blk module.namespacePtr(decl.src_namespace).anon_decls.swapRemove(decl_index);
2052	} else false;	2052	} else false;
2053		2053
2054	try module.clearDecl(decl_index, null);	2054	try module.clearDecl(decl_index, null);
...	@@ -2530,8 +2530,7 @@ pub fn totalErrorCount(self: *Compilation) u32 {	...	@@ -2530,8 +2530,7 @@ pub fn totalErrorCount(self: *Compilation) u32 {
2530	// the previous parse success, including compile errors, but we cannot	2530	// the previous parse success, including compile errors, but we cannot
2531	// emit them until the file succeeds parsing.	2531	// emit them until the file succeeds parsing.
2532	for (module.failed_decls.keys()) \|key\| {	2532	for (module.failed_decls.keys()) \|key\| {
2533	const decl = module.declPtr(key);	2533	if (module.declFileScope(key).okToReportErrors()) {
2534	if (decl.getFileScope().okToReportErrors()) {
2535	total += 1;	2534	total += 1;
2536	if (module.cimport_errors.get(key)) \|errors\| {	2535	if (module.cimport_errors.get(key)) \|errors\| {
2537	total += errors.len;	2536	total += errors.len;
...	@@ -2540,8 +2539,7 @@ pub fn totalErrorCount(self: *Compilation) u32 {	...	@@ -2540,8 +2539,7 @@ pub fn totalErrorCount(self: *Compilation) u32 {
2540	}	2539	}
2541	if (module.emit_h) \|emit_h\| {	2540	if (module.emit_h) \|emit_h\| {
2542	for (emit_h.failed_decls.keys()) \|key\| {	2541	for (emit_h.failed_decls.keys()) \|key\| {
2543	const decl = module.declPtr(key);	2542	if (module.declFileScope(key).okToReportErrors()) {
2544	if (decl.getFileScope().okToReportErrors()) {
2545	total += 1;	2543	total += 1;
2546	}	2544	}
2547	}	2545	}
...	@@ -2644,10 +2642,10 @@ pub fn getAllErrorsAlloc(self: *Compilation) !ErrorBundle {	...	@@ -2644,10 +2642,10 @@ pub fn getAllErrorsAlloc(self: *Compilation) !ErrorBundle {
2644	{	2642	{
2645	var it = module.failed_decls.iterator();	2643	var it = module.failed_decls.iterator();
2646	while (it.next()) \|entry\| {	2644	while (it.next()) \|entry\| {
2647	const decl = module.declPtr(entry.key_ptr.*);	2645	const decl_index = entry.key_ptr.*;
2648	// Skip errors for Decls within files that had a parse failure.	2646	// Skip errors for Decls within files that had a parse failure.
2649	// We'll try again once parsing succeeds.	2647	// We'll try again once parsing succeeds.
2650	if (decl.getFileScope().okToReportErrors()) {	2648	if (module.declFileScope(decl_index).okToReportErrors()) {
2651	try addModuleErrorMsg(&bundle, entry.value_ptr..);	2649	try addModuleErrorMsg(&bundle, entry.value_ptr..);
2652	if (module.cimport_errors.get(entry.key_ptr.*)) \|cimport_errors\| for (cimport_errors) \|c_error\| {	2650	if (module.cimport_errors.get(entry.key_ptr.*)) \|cimport_errors\| for (cimport_errors) \|c_error\| {
2653	try bundle.addRootErrorMessage(.{	2651	try bundle.addRootErrorMessage(.{
...	@@ -2669,10 +2667,10 @@ pub fn getAllErrorsAlloc(self: *Compilation) !ErrorBundle {	...	@@ -2669,10 +2667,10 @@ pub fn getAllErrorsAlloc(self: *Compilation) !ErrorBundle {
2669	if (module.emit_h) \|emit_h\| {	2667	if (module.emit_h) \|emit_h\| {
2670	var it = emit_h.failed_decls.iterator();	2668	var it = emit_h.failed_decls.iterator();
2671	while (it.next()) \|entry\| {	2669	while (it.next()) \|entry\| {
2672	const decl = module.declPtr(entry.key_ptr.*);	2670	const decl_index = entry.key_ptr.*;
2673	// Skip errors for Decls within files that had a parse failure.	2671	// Skip errors for Decls within files that had a parse failure.
2674	// We'll try again once parsing succeeds.	2672	// We'll try again once parsing succeeds.
2675	if (decl.getFileScope().okToReportErrors()) {	2673	if (module.declFileScope(decl_index).okToReportErrors()) {
2676	try addModuleErrorMsg(&bundle, entry.value_ptr..);	2674	try addModuleErrorMsg(&bundle, entry.value_ptr..);
2677	}	2675	}
2678	}	2676	}
...	@@ -2710,7 +2708,7 @@ pub fn getAllErrorsAlloc(self: *Compilation) !ErrorBundle {	...	@@ -2710,7 +2708,7 @@ pub fn getAllErrorsAlloc(self: *Compilation) !ErrorBundle {
2710	const values = module.compile_log_decls.values();	2708	const values = module.compile_log_decls.values();
2711	// First one will be the error; subsequent ones will be notes.	2709	// First one will be the error; subsequent ones will be notes.
2712	const err_decl = module.declPtr(keys[0]);	2710	const err_decl = module.declPtr(keys[0]);
2713	const src_loc = err_decl.nodeOffsetSrcLoc(values[0]);	2711	const src_loc = err_decl.nodeOffsetSrcLoc(values[0], module);
2714	const err_msg = Module.ErrorMsg{	2712	const err_msg = Module.ErrorMsg{
2715	.src_loc = src_loc,	2713	.src_loc = src_loc,
2716	.msg = "found compile log statement",	2714	.msg = "found compile log statement",
...	@@ -2721,7 +2719,7 @@ pub fn getAllErrorsAlloc(self: *Compilation) !ErrorBundle {	...	@@ -2721,7 +2719,7 @@ pub fn getAllErrorsAlloc(self: *Compilation) !ErrorBundle {
2721	for (keys[1..], 0..) \|key, i\| {	2719	for (keys[1..], 0..) \|key, i\| {
2722	const note_decl = module.declPtr(key);	2720	const note_decl = module.declPtr(key);
2723	err_msg.notes[i] = .{	2721	err_msg.notes[i] = .{
2724	.src_loc = note_decl.nodeOffsetSrcLoc(values[i + 1]),	2722	.src_loc = note_decl.nodeOffsetSrcLoc(values[i + 1], module),
2725	.msg = "also here",	2723	.msg = "also here",
2726	};	2724	};
2727	}	2725	}
...	@@ -3235,7 +3233,7 @@ fn processOneJob(comp: Compilation, job: Job, prog_node: std.Progress.Node) !v	...	@@ -3235,7 +3233,7 @@ fn processOneJob(comp: Compilation, job: Job, prog_node: std.Progress.Node) !v
3235	try module.failed_decls.ensureUnusedCapacity(gpa, 1);	3233	try module.failed_decls.ensureUnusedCapacity(gpa, 1);
3236	module.failed_decls.putAssumeCapacityNoClobber(decl_index, try Module.ErrorMsg.create(	3234	module.failed_decls.putAssumeCapacityNoClobber(decl_index, try Module.ErrorMsg.create(
3237	gpa,	3235	gpa,
3238	decl.srcLoc(),	3236	decl.srcLoc(module),
3239	"unable to update line number: {s}",	3237	"unable to update line number: {s}",
3240	.{@errorName(err)},	3238	.{@errorName(err)},
3241	));	3239	));
...	@@ -3848,7 +3846,7 @@ fn reportRetryableEmbedFileError(	...	@@ -3848,7 +3846,7 @@ fn reportRetryableEmbedFileError(
3848	const mod = comp.bin_file.options.module.?;	3846	const mod = comp.bin_file.options.module.?;
3849	const gpa = mod.gpa;	3847	const gpa = mod.gpa;
3850		3848
3851	const src_loc: Module.SrcLoc = mod.declPtr(embed_file.owner_decl).srcLoc();	3849	const src_loc: Module.SrcLoc = mod.declPtr(embed_file.owner_decl).srcLoc(mod);
3852		3850
3853	const err_msg = if (embed_file.pkg.root_src_directory.path) \|dir_path\|	3851	const err_msg = if (embed_file.pkg.root_src_directory.path) \|dir_path\|
3854	try Module.ErrorMsg.create(	3852	try Module.ErrorMsg.create(

...	@@ -524,8 +524,9 @@ pub const DeclGen = struct {	...	@@ -524,8 +524,9 @@ pub const DeclGen = struct {
524		524
525	fn fail(dg: *DeclGen, comptime format: []const u8, args: anytype) error{ AnalysisFail, OutOfMemory } {	525	fn fail(dg: *DeclGen, comptime format: []const u8, args: anytype) error{ AnalysisFail, OutOfMemory } {
526	@setCold(true);	526	@setCold(true);
		527	const mod = dg.module;
527	const src = LazySrcLoc.nodeOffset(0);	528	const src = LazySrcLoc.nodeOffset(0);
528	const src_loc = src.toSrcLoc(dg.decl.?);	529	const src_loc = src.toSrcLoc(dg.decl.?, mod);
529	dg.error_msg = try Module.ErrorMsg.create(dg.gpa, src_loc, format, args);	530	dg.error_msg = try Module.ErrorMsg.create(dg.gpa, src_loc, format, args);
530	return error.AnalysisFail;	531	return error.AnalysisFail;
531	}	532	}
...	@@ -6484,6 +6485,7 @@ fn airGetUnionTag(f: *Function, inst: Air.Inst.Index) !CValue {	...	@@ -6484,6 +6485,7 @@ fn airGetUnionTag(f: *Function, inst: Air.Inst.Index) !CValue {
6484	}	6485	}
6485		6486
6486	fn airTagName(f: *Function, inst: Air.Inst.Index) !CValue {	6487	fn airTagName(f: *Function, inst: Air.Inst.Index) !CValue {
		6488	const mod = f.object.dg.module;
6487	const un_op = f.air.instructions.items(.data)[inst].un_op;	6489	const un_op = f.air.instructions.items(.data)[inst].un_op;
6488		6490
6489	const inst_ty = f.typeOfIndex(inst);	6491	const inst_ty = f.typeOfIndex(inst);
...	@@ -6495,7 +6497,7 @@ fn airTagName(f: *Function, inst: Air.Inst.Index) !CValue {	...	@@ -6495,7 +6497,7 @@ fn airTagName(f: *Function, inst: Air.Inst.Index) !CValue {
6495	const local = try f.allocLocal(inst, inst_ty);	6497	const local = try f.allocLocal(inst, inst_ty);
6496	try f.writeCValue(writer, local, .Other);	6498	try f.writeCValue(writer, local, .Other);
6497	try writer.print(" = {s}(", .{	6499	try writer.print(" = {s}(", .{
6498	try f.getLazyFnName(.{ .tag_name = enum_ty.getOwnerDecl() }, .{ .tag_name = enum_ty }),	6500	try f.getLazyFnName(.{ .tag_name = enum_ty.getOwnerDecl(mod) }, .{ .tag_name = enum_ty }),
6499	});	6501	});
6500	try f.writeCValue(writer, operand, .Other);	6502	try f.writeCValue(writer, operand, .Other);
6501	try writer.writeAll(");\n");	6503	try writer.writeAll(");\n");

...	@@ -1538,7 +1538,7 @@ pub const CType = extern union {	...	@@ -1538,7 +1538,7 @@ pub const CType = extern union {
1538	.forward, .forward_parameter => {	1538	.forward, .forward_parameter => {
1539	self.storage = .{ .fwd = .{	1539	self.storage = .{ .fwd = .{
1540	.base = .{ .tag = if (is_struct) .fwd_struct else .fwd_union },	1540	.base = .{ .tag = if (is_struct) .fwd_struct else .fwd_union },
1541	.data = ty.getOwnerDecl(),	1541	.data = ty.getOwnerDecl(mod),
1542	} };	1542	} };
1543	self.value = .{ .cty = initPayload(&self.storage.fwd) };	1543	self.value = .{ .cty = initPayload(&self.storage.fwd) };
1544	},	1544	},
...	@@ -1985,7 +1985,7 @@ pub const CType = extern union {	...	@@ -1985,7 +1985,7 @@ pub const CType = extern union {
1985	const unnamed_pl = try arena.create(Payload.Unnamed);	1985	const unnamed_pl = try arena.create(Payload.Unnamed);
1986	unnamed_pl.* = .{ .base = .{ .tag = t }, .data = .{	1986	unnamed_pl.* = .{ .base = .{ .tag = t }, .data = .{
1987	.fields = fields_pl,	1987	.fields = fields_pl,
1988	.owner_decl = ty.getOwnerDecl(),	1988	.owner_decl = ty.getOwnerDecl(mod),
1989	.id = if (ty.unionTagTypeSafety()) \|_\| 0 else unreachable,	1989	.id = if (ty.unionTagTypeSafety()) \|_\| 0 else unreachable,
1990	} };	1990	} };
1991	return initPayload(unnamed_pl);	1991	return initPayload(unnamed_pl);
...	@@ -2124,7 +2124,7 @@ pub const CType = extern union {	...	@@ -2124,7 +2124,7 @@ pub const CType = extern union {
2124	.forward, .forward_parameter, .complete, .parameter, .global => unreachable,	2124	.forward, .forward_parameter, .complete, .parameter, .global => unreachable,
2125	.payload => if (ty.unionTagTypeSafety()) \|_\| {	2125	.payload => if (ty.unionTagTypeSafety()) \|_\| {
2126	const data = cty.cast(Payload.Unnamed).?.data;	2126	const data = cty.cast(Payload.Unnamed).?.data;
2127	return ty.getOwnerDecl() == data.owner_decl and data.id == 0;	2127	return ty.getOwnerDecl(mod) == data.owner_decl and data.id == 0;
2128	} else unreachable,	2128	} else unreachable,
2129	},	2129	},
2130		2130
...	@@ -2242,7 +2242,7 @@ pub const CType = extern union {	...	@@ -2242,7 +2242,7 @@ pub const CType = extern union {
2242	=> switch (self.kind) {	2242	=> switch (self.kind) {
2243	.forward, .forward_parameter, .complete, .parameter, .global => unreachable,	2243	.forward, .forward_parameter, .complete, .parameter, .global => unreachable,
2244	.payload => if (ty.unionTagTypeSafety()) \|_\| {	2244	.payload => if (ty.unionTagTypeSafety()) \|_\| {
2245	autoHash(hasher, ty.getOwnerDecl());	2245	autoHash(hasher, ty.getOwnerDecl(mod));
2246	autoHash(hasher, @as(u32, 0));	2246	autoHash(hasher, @as(u32, 0));
2247	} else unreachable,	2247	} else unreachable,
2248	},	2248	},

...	@@ -1177,7 +1177,7 @@ pub const Object = struct {	...	@@ -1177,7 +1177,7 @@ pub const Object = struct {
1177	var di_scope: ?*llvm.DIScope = null;	1177	var di_scope: ?*llvm.DIScope = null;
1178		1178
1179	if (dg.object.di_builder) \|dib\| {	1179	if (dg.object.di_builder) \|dib\| {
1180	di_file = try dg.object.getDIFile(gpa, decl.src_namespace.file_scope);	1180	di_file = try dg.object.getDIFile(gpa, mod.namespacePtr(decl.src_namespace).file_scope);
1181		1181
1182	const line_number = decl.src_line + 1;	1182	const line_number = decl.src_line + 1;
1183	const is_internal_linkage = decl.val.tag() != .extern_fn and	1183	const is_internal_linkage = decl.val.tag() != .extern_fn and
...	@@ -1505,7 +1505,7 @@ pub const Object = struct {	...	@@ -1505,7 +1505,7 @@ pub const Object = struct {
1505	return di_type;	1505	return di_type;
1506	},	1506	},
1507	.Enum => {	1507	.Enum => {
1508	const owner_decl_index = ty.getOwnerDecl();	1508	const owner_decl_index = ty.getOwnerDecl(mod);
1509	const owner_decl = o.module.declPtr(owner_decl_index);	1509	const owner_decl = o.module.declPtr(owner_decl_index);
1510		1510
1511	if (!ty.hasRuntimeBitsIgnoreComptime(mod)) {	1511	if (!ty.hasRuntimeBitsIgnoreComptime(mod)) {
...	@@ -1558,7 +1558,7 @@ pub const Object = struct {	...	@@ -1558,7 +1558,7 @@ pub const Object = struct {
1558	@panic("TODO implement bigint debug enumerators to llvm int for 32-bit compiler builds");	1558	@panic("TODO implement bigint debug enumerators to llvm int for 32-bit compiler builds");
1559	}	1559	}
1560		1560
1561	const di_file = try o.getDIFile(gpa, owner_decl.src_namespace.file_scope);	1561	const di_file = try o.getDIFile(gpa, mod.namespacePtr(owner_decl.src_namespace).file_scope);
1562	const di_scope = try o.namespaceToDebugScope(owner_decl.src_namespace);	1562	const di_scope = try o.namespaceToDebugScope(owner_decl.src_namespace);
1563		1563
1564	const name = try ty.nameAlloc(gpa, o.module);	1564	const name = try ty.nameAlloc(gpa, o.module);
...	@@ -1737,13 +1737,13 @@ pub const Object = struct {	...	@@ -1737,13 +1737,13 @@ pub const Object = struct {
1737	}	1737	}
1738	const name = try ty.nameAlloc(gpa, o.module);	1738	const name = try ty.nameAlloc(gpa, o.module);
1739	defer gpa.free(name);	1739	defer gpa.free(name);
1740	const owner_decl_index = ty.getOwnerDecl();	1740	const owner_decl_index = ty.getOwnerDecl(mod);
1741	const owner_decl = o.module.declPtr(owner_decl_index);	1741	const owner_decl = o.module.declPtr(owner_decl_index);
1742	const opaque_di_ty = dib.createForwardDeclType(	1742	const opaque_di_ty = dib.createForwardDeclType(
1743	DW.TAG.structure_type,	1743	DW.TAG.structure_type,
1744	name,	1744	name,
1745	try o.namespaceToDebugScope(owner_decl.src_namespace),	1745	try o.namespaceToDebugScope(owner_decl.src_namespace),
1746	try o.getDIFile(gpa, owner_decl.src_namespace.file_scope),	1746	try o.getDIFile(gpa, mod.namespacePtr(owner_decl.src_namespace).file_scope),
1747	owner_decl.src_node + 1,	1747	owner_decl.src_node + 1,
1748	);	1748	);
1749	// The recursive call to `lowerDebugType` va `namespaceToDebugScope`	1749	// The recursive call to `lowerDebugType` va `namespaceToDebugScope`
...	@@ -2085,7 +2085,7 @@ pub const Object = struct {	...	@@ -2085,7 +2085,7 @@ pub const Object = struct {
2085	// into. Therefore we can satisfy this by making an empty namespace,	2085	// into. Therefore we can satisfy this by making an empty namespace,
2086	// rather than changing the frontend to unnecessarily resolve the	2086	// rather than changing the frontend to unnecessarily resolve the
2087	// struct field types.	2087	// struct field types.
2088	const owner_decl_index = ty.getOwnerDecl();	2088	const owner_decl_index = ty.getOwnerDecl(mod);
2089	const struct_di_ty = try o.makeEmptyNamespaceDIType(owner_decl_index);	2089	const struct_di_ty = try o.makeEmptyNamespaceDIType(owner_decl_index);
2090	dib.replaceTemporary(fwd_decl, struct_di_ty);	2090	dib.replaceTemporary(fwd_decl, struct_di_ty);
2091	// The recursive call to `lowerDebugType` via `makeEmptyNamespaceDIType`	2091	// The recursive call to `lowerDebugType` via `makeEmptyNamespaceDIType`
...	@@ -2096,7 +2096,7 @@ pub const Object = struct {	...	@@ -2096,7 +2096,7 @@ pub const Object = struct {
2096	}	2096	}
2097		2097
2098	if (!ty.hasRuntimeBitsIgnoreComptime(mod)) {	2098	if (!ty.hasRuntimeBitsIgnoreComptime(mod)) {
2099	const owner_decl_index = ty.getOwnerDecl();	2099	const owner_decl_index = ty.getOwnerDecl(mod);
2100	const struct_di_ty = try o.makeEmptyNamespaceDIType(owner_decl_index);	2100	const struct_di_ty = try o.makeEmptyNamespaceDIType(owner_decl_index);
2101	dib.replaceTemporary(fwd_decl, struct_di_ty);	2101	dib.replaceTemporary(fwd_decl, struct_di_ty);
2102	// The recursive call to `lowerDebugType` via `makeEmptyNamespaceDIType`	2102	// The recursive call to `lowerDebugType` via `makeEmptyNamespaceDIType`
...	@@ -2162,7 +2162,7 @@ pub const Object = struct {	...	@@ -2162,7 +2162,7 @@ pub const Object = struct {
2162	},	2162	},
2163	.Union => {	2163	.Union => {
2164	const compile_unit_scope = o.di_compile_unit.?.toScope();	2164	const compile_unit_scope = o.di_compile_unit.?.toScope();
2165	const owner_decl_index = ty.getOwnerDecl();	2165	const owner_decl_index = ty.getOwnerDecl(mod);
2166		2166
2167	const name = try ty.nameAlloc(gpa, o.module);	2167	const name = try ty.nameAlloc(gpa, o.module);
2168	defer gpa.free(name);	2168	defer gpa.free(name);
...	@@ -2395,8 +2395,10 @@ pub const Object = struct {	...	@@ -2395,8 +2395,10 @@ pub const Object = struct {
2395	}	2395	}
2396	}	2396	}
2397		2397
2398	fn namespaceToDebugScope(o: Object, namespace: const Module.Namespace) !*llvm.DIScope {	2398	fn namespaceToDebugScope(o: Object, namespace_index: Module.Namespace.Index) !llvm.DIScope {
2399	if (namespace.parent == null) {	2399	const mod = o.module;
		2400	const namespace = mod.namespacePtr(namespace_index);
		2401	if (namespace.parent == .none) {
2400	const di_file = try o.getDIFile(o.gpa, namespace.file_scope);	2402	const di_file = try o.getDIFile(o.gpa, namespace.file_scope);
2401	return di_file.toScope();	2403	return di_file.toScope();
2402	}	2404	}
...	@@ -2408,12 +2410,13 @@ pub const Object = struct {	...	@@ -2408,12 +2410,13 @@ pub const Object = struct {
2408	/// Assertion `!isa<DIType>(Scope) && "shouldn't make a namespace scope for a type"'	2410	/// Assertion `!isa<DIType>(Scope) && "shouldn't make a namespace scope for a type"'
2409	/// when targeting CodeView (Windows).	2411	/// when targeting CodeView (Windows).
2410	fn makeEmptyNamespaceDIType(o: Object, decl_index: Module.Decl.Index) !llvm.DIType {	2412	fn makeEmptyNamespaceDIType(o: Object, decl_index: Module.Decl.Index) !llvm.DIType {
2411	const decl = o.module.declPtr(decl_index);	2413	const mod = o.module;
		2414	const decl = mod.declPtr(decl_index);
2412	const fields: [0]*llvm.DIType = .{};	2415	const fields: [0]*llvm.DIType = .{};
2413	return o.di_builder.?.createStructType(	2416	return o.di_builder.?.createStructType(
2414	try o.namespaceToDebugScope(decl.src_namespace),	2417	try o.namespaceToDebugScope(decl.src_namespace),
2415	decl.name, // TODO use fully qualified name	2418	decl.name, // TODO use fully qualified name
2416	try o.getDIFile(o.gpa, decl.src_namespace.file_scope),	2419	try o.getDIFile(o.gpa, mod.namespacePtr(decl.src_namespace).file_scope),
2417	decl.src_line + 1,	2420	decl.src_line + 1,
2418	0, // size in bits	2421	0, // size in bits
2419	0, // align in bits	2422	0, // align in bits
...	@@ -2434,14 +2437,14 @@ pub const Object = struct {	...	@@ -2434,14 +2437,14 @@ pub const Object = struct {
2434	const std_file = (mod.importPkg(std_pkg) catch unreachable).file;	2437	const std_file = (mod.importPkg(std_pkg) catch unreachable).file;
2435		2438
2436	const builtin_str: []const u8 = "builtin";	2439	const builtin_str: []const u8 = "builtin";
2437	const std_namespace = mod.declPtr(std_file.root_decl.unwrap().?).src_namespace;	2440	const std_namespace = mod.namespacePtr(mod.declPtr(std_file.root_decl.unwrap().?).src_namespace);
2438	const builtin_decl = std_namespace.decls	2441	const builtin_decl = std_namespace.decls
2439	.getKeyAdapted(builtin_str, Module.DeclAdapter{ .mod = mod }).?;	2442	.getKeyAdapted(builtin_str, Module.DeclAdapter{ .mod = mod }).?;
2440		2443
2441	const stack_trace_str: []const u8 = "StackTrace";	2444	const stack_trace_str: []const u8 = "StackTrace";
2442	// buffer is only used for int_type, `builtin` is a struct.	2445	// buffer is only used for int_type, `builtin` is a struct.
2443	const builtin_ty = mod.declPtr(builtin_decl).val.toType();	2446	const builtin_ty = mod.declPtr(builtin_decl).val.toType();
2444	const builtin_namespace = builtin_ty.getNamespace().?;	2447	const builtin_namespace = builtin_ty.getNamespace(mod).?;
2445	const stack_trace_decl_index = builtin_namespace.decls	2448	const stack_trace_decl_index = builtin_namespace.decls
2446	.getKeyAdapted(stack_trace_str, Module.DeclAdapter{ .mod = mod }).?;	2449	.getKeyAdapted(stack_trace_str, Module.DeclAdapter{ .mod = mod }).?;
2447	const stack_trace_decl = mod.declPtr(stack_trace_decl_index);	2450	const stack_trace_decl = mod.declPtr(stack_trace_decl_index);
...	@@ -2464,7 +2467,8 @@ pub const DeclGen = struct {	...	@@ -2464,7 +2467,8 @@ pub const DeclGen = struct {
2464	fn todo(self: *DeclGen, comptime format: []const u8, args: anytype) Error {	2467	fn todo(self: *DeclGen, comptime format: []const u8, args: anytype) Error {
2465	@setCold(true);	2468	@setCold(true);
2466	assert(self.err_msg == null);	2469	assert(self.err_msg == null);
2467	const src_loc = LazySrcLoc.nodeOffset(0).toSrcLoc(self.decl);	2470	const mod = self.module;
		2471	const src_loc = LazySrcLoc.nodeOffset(0).toSrcLoc(self.decl, mod);
2468	self.err_msg = try Module.ErrorMsg.create(self.gpa, src_loc, "TODO (LLVM): " ++ format, args);	2472	self.err_msg = try Module.ErrorMsg.create(self.gpa, src_loc, "TODO (LLVM): " ++ format, args);
2469	return error.CodegenFail;	2473	return error.CodegenFail;
2470	}	2474	}
...	@@ -2536,7 +2540,7 @@ pub const DeclGen = struct {	...	@@ -2536,7 +2540,7 @@ pub const DeclGen = struct {
2536	}	2540	}
2537		2541
2538	if (dg.object.di_builder) \|dib\| {	2542	if (dg.object.di_builder) \|dib\| {
2539	const di_file = try dg.object.getDIFile(dg.gpa, decl.src_namespace.file_scope);	2543	const di_file = try dg.object.getDIFile(dg.gpa, mod.namespacePtr(decl.src_namespace).file_scope);
2540		2544
2541	const line_number = decl.src_line + 1;	2545	const line_number = decl.src_line + 1;
2542	const is_internal_linkage = !dg.module.decl_exports.contains(decl_index);	2546	const is_internal_linkage = !dg.module.decl_exports.contains(decl_index);
...	@@ -2837,15 +2841,11 @@ pub const DeclGen = struct {	...	@@ -2837,15 +2841,11 @@ pub const DeclGen = struct {
2837	.Opaque => {	2841	.Opaque => {
2838	if (t.ip_index == .anyopaque_type) return dg.context.intType(8);	2842	if (t.ip_index == .anyopaque_type) return dg.context.intType(8);
2839		2843
2840	const gop = try dg.object.type_map.getOrPutContext(gpa, t, .{ .mod = dg.module });	2844	const gop = try dg.object.type_map.getOrPutContext(gpa, t, .{ .mod = mod });
2841	if (gop.found_existing) return gop.value_ptr.*;	2845	if (gop.found_existing) return gop.value_ptr.*;
2842		2846
2843	// The Type memory is ephemeral; since we want to store a longer-lived	2847	const opaque_type = mod.intern_pool.indexToKey(t.ip_index).opaque_type;
2844	// reference, we need to copy it here.	2848	const name = try mod.opaqueFullyQualifiedName(opaque_type);
2845	gop.key_ptr.* = try t.copy(dg.object.type_map_arena.allocator());
2846
2847	const opaque_obj = t.castTag(.@"opaque").?.data;
2848	const name = try opaque_obj.getFullyQualifiedName(dg.module);
2849	defer gpa.free(name);	2849	defer gpa.free(name);
2850		2850
2851	const llvm_struct_ty = dg.context.structCreateNamed(name);	2851	const llvm_struct_ty = dg.context.structCreateNamed(name);
...	@@ -2931,7 +2931,7 @@ pub const DeclGen = struct {	...	@@ -2931,7 +2931,7 @@ pub const DeclGen = struct {
2931	},	2931	},
2932	.ErrorSet => return dg.context.intType(16),	2932	.ErrorSet => return dg.context.intType(16),
2933	.Struct => {	2933	.Struct => {
2934	const gop = try dg.object.type_map.getOrPutContext(gpa, t, .{ .mod = dg.module });	2934	const gop = try dg.object.type_map.getOrPutContext(gpa, t, .{ .mod = mod });
2935	if (gop.found_existing) return gop.value_ptr.*;	2935	if (gop.found_existing) return gop.value_ptr.*;
2936		2936
2937	// The Type memory is ephemeral; since we want to store a longer-lived	2937	// The Type memory is ephemeral; since we want to store a longer-lived
...	@@ -2999,7 +2999,7 @@ pub const DeclGen = struct {	...	@@ -2999,7 +2999,7 @@ pub const DeclGen = struct {
2999	return int_llvm_ty;	2999	return int_llvm_ty;
3000	}	3000	}
3001		3001
3002	const name = try struct_obj.getFullyQualifiedName(dg.module);	3002	const name = try struct_obj.getFullyQualifiedName(mod);
3003	defer gpa.free(name);	3003	defer gpa.free(name);
3004		3004
3005	const llvm_struct_ty = dg.context.structCreateNamed(name);	3005	const llvm_struct_ty = dg.context.structCreateNamed(name);
...	@@ -3057,7 +3057,7 @@ pub const DeclGen = struct {	...	@@ -3057,7 +3057,7 @@ pub const DeclGen = struct {
3057	return llvm_struct_ty;	3057	return llvm_struct_ty;
3058	},	3058	},
3059	.Union => {	3059	.Union => {
3060	const gop = try dg.object.type_map.getOrPutContext(gpa, t, .{ .mod = dg.module });	3060	const gop = try dg.object.type_map.getOrPutContext(gpa, t, .{ .mod = mod });
3061	if (gop.found_existing) return gop.value_ptr.*;	3061	if (gop.found_existing) return gop.value_ptr.*;
3062		3062
3063	// The Type memory is ephemeral; since we want to store a longer-lived	3063	// The Type memory is ephemeral; since we want to store a longer-lived
...	@@ -3080,7 +3080,7 @@ pub const DeclGen = struct {	...	@@ -3080,7 +3080,7 @@ pub const DeclGen = struct {
3080	return enum_tag_llvm_ty;	3080	return enum_tag_llvm_ty;
3081	}	3081	}
3082		3082
3083	const name = try union_obj.getFullyQualifiedName(dg.module);	3083	const name = try union_obj.getFullyQualifiedName(mod);
3084	defer gpa.free(name);	3084	defer gpa.free(name);
3085		3085
3086	const llvm_union_ty = dg.context.structCreateNamed(name);	3086	const llvm_union_ty = dg.context.structCreateNamed(name);
...	@@ -6131,7 +6131,7 @@ pub const FuncGen = struct {	...	@@ -6131,7 +6131,7 @@ pub const FuncGen = struct {
6131	const func = self.air.values[ty_pl.payload].castTag(.function).?.data;	6131	const func = self.air.values[ty_pl.payload].castTag(.function).?.data;
6132	const decl_index = func.owner_decl;	6132	const decl_index = func.owner_decl;
6133	const decl = mod.declPtr(decl_index);	6133	const decl = mod.declPtr(decl_index);
6134	const di_file = try self.dg.object.getDIFile(self.gpa, decl.src_namespace.file_scope);	6134	const di_file = try self.dg.object.getDIFile(self.gpa, mod.namespacePtr(decl.src_namespace).file_scope);
6135	self.di_file = di_file;	6135	self.di_file = di_file;
6136	const line_number = decl.src_line + 1;	6136	const line_number = decl.src_line + 1;
6137	const cur_debug_location = self.builder.getCurrentDebugLocation2();	6137	const cur_debug_location = self.builder.getCurrentDebugLocation2();
...	@@ -6193,7 +6193,7 @@ pub const FuncGen = struct {	...	@@ -6193,7 +6193,7 @@ pub const FuncGen = struct {
6193	const func = self.air.values[ty_pl.payload].castTag(.function).?.data;	6193	const func = self.air.values[ty_pl.payload].castTag(.function).?.data;
6194	const mod = self.dg.module;	6194	const mod = self.dg.module;
6195	const decl = mod.declPtr(func.owner_decl);	6195	const decl = mod.declPtr(func.owner_decl);
6196	const di_file = try self.dg.object.getDIFile(self.gpa, decl.src_namespace.file_scope);	6196	const di_file = try self.dg.object.getDIFile(self.gpa, mod.namespacePtr(decl.src_namespace).file_scope);
6197	self.di_file = di_file;	6197	self.di_file = di_file;
6198	const old = self.dbg_inlined.pop();	6198	const old = self.dbg_inlined.pop();
6199	self.di_scope = old.scope;	6199	self.di_scope = old.scope;
...	@@ -8853,7 +8853,8 @@ pub const FuncGen = struct {	...	@@ -8853,7 +8853,8 @@ pub const FuncGen = struct {
8853	}	8853	}
8854		8854
8855	fn getIsNamedEnumValueFunction(self: FuncGen, enum_ty: Type) !llvm.Value {	8855	fn getIsNamedEnumValueFunction(self: FuncGen, enum_ty: Type) !llvm.Value {
8856	const enum_decl = enum_ty.getOwnerDecl();	8856	const mod = self.dg.module;
		8857	const enum_decl = enum_ty.getOwnerDecl(mod);
8857		8858
8858	// TODO: detect when the type changes and re-emit this function.	8859	// TODO: detect when the type changes and re-emit this function.
8859	const gop = try self.dg.object.named_enum_map.getOrPut(self.dg.gpa, enum_decl);	8860	const gop = try self.dg.object.named_enum_map.getOrPut(self.dg.gpa, enum_decl);
...	@@ -8864,7 +8865,6 @@ pub const FuncGen = struct {	...	@@ -8864,7 +8865,6 @@ pub const FuncGen = struct {
8864	defer arena_allocator.deinit();	8865	defer arena_allocator.deinit();
8865	const arena = arena_allocator.allocator();	8866	const arena = arena_allocator.allocator();
8866		8867
8867	const mod = self.dg.module;
8868	const fqn = try mod.declPtr(enum_decl).getFullyQualifiedName(mod);	8868	const fqn = try mod.declPtr(enum_decl).getFullyQualifiedName(mod);
8869	defer self.gpa.free(fqn);	8869	defer self.gpa.free(fqn);
8870	const llvm_fn_name = try std.fmt.allocPrintZ(arena, "__zig_is_named_enum_value_{s}", .{fqn});	8870	const llvm_fn_name = try std.fmt.allocPrintZ(arena, "__zig_is_named_enum_value_{s}", .{fqn});
...	@@ -8931,7 +8931,8 @@ pub const FuncGen = struct {	...	@@ -8931,7 +8931,8 @@ pub const FuncGen = struct {
8931	}	8931	}
8932		8932
8933	fn getEnumTagNameFunction(self: FuncGen, enum_ty: Type) !llvm.Value {	8933	fn getEnumTagNameFunction(self: FuncGen, enum_ty: Type) !llvm.Value {
8934	const enum_decl = enum_ty.getOwnerDecl();	8934	const mod = self.dg.module;
		8935	const enum_decl = enum_ty.getOwnerDecl(mod);
8935		8936
8936	// TODO: detect when the type changes and re-emit this function.	8937	// TODO: detect when the type changes and re-emit this function.
8937	const gop = try self.dg.object.decl_map.getOrPut(self.dg.gpa, enum_decl);	8938	const gop = try self.dg.object.decl_map.getOrPut(self.dg.gpa, enum_decl);
...	@@ -8942,7 +8943,6 @@ pub const FuncGen = struct {	...	@@ -8942,7 +8943,6 @@ pub const FuncGen = struct {
8942	defer arena_allocator.deinit();	8943	defer arena_allocator.deinit();
8943	const arena = arena_allocator.allocator();	8944	const arena = arena_allocator.allocator();
8944		8945
8945	const mod = self.dg.module;
8946	const fqn = try mod.declPtr(enum_decl).getFullyQualifiedName(mod);	8946	const fqn = try mod.declPtr(enum_decl).getFullyQualifiedName(mod);
8947	defer self.gpa.free(fqn);	8947	defer self.gpa.free(fqn);
8948	const llvm_fn_name = try std.fmt.allocPrintZ(arena, "__zig_tag_name_{s}", .{fqn});	8948	const llvm_fn_name = try std.fmt.allocPrintZ(arena, "__zig_tag_name_{s}", .{fqn});

...	@@ -218,8 +218,9 @@ pub const DeclGen = struct {	...	@@ -218,8 +218,9 @@ pub const DeclGen = struct {
218		218
219	pub fn fail(self: *DeclGen, comptime format: []const u8, args: anytype) Error {	219	pub fn fail(self: *DeclGen, comptime format: []const u8, args: anytype) Error {
220	@setCold(true);	220	@setCold(true);
		221	const mod = self.module;
221	const src = LazySrcLoc.nodeOffset(0);	222	const src = LazySrcLoc.nodeOffset(0);
222	const src_loc = src.toSrcLoc(self.module.declPtr(self.decl_index));	223	const src_loc = src.toSrcLoc(self.module.declPtr(self.decl_index), mod);
223	assert(self.error_msg == null);	224	assert(self.error_msg == null);
224	self.error_msg = try Module.ErrorMsg.create(self.module.gpa, src_loc, format, args);	225	self.error_msg = try Module.ErrorMsg.create(self.module.gpa, src_loc, format, args);
225	return error.CodegenFail;	226	return error.CodegenFail;
...	@@ -2775,7 +2776,10 @@ pub const DeclGen = struct {	...	@@ -2775,7 +2776,10 @@ pub const DeclGen = struct {
2775		2776
2776	fn airDbgStmt(self: *DeclGen, inst: Air.Inst.Index) !void {	2777	fn airDbgStmt(self: *DeclGen, inst: Air.Inst.Index) !void {
2777	const dbg_stmt = self.air.instructions.items(.data)[inst].dbg_stmt;	2778	const dbg_stmt = self.air.instructions.items(.data)[inst].dbg_stmt;
2778	const src_fname_id = try self.spv.resolveSourceFileName(self.module.declPtr(self.decl_index));	2779	const src_fname_id = try self.spv.resolveSourceFileName(
		2780	self.module,
		2781	self.module.declPtr(self.decl_index),
		2782	);
2779	try self.func.body.emit(self.spv.gpa, .OpLine, .{	2783	try self.func.body.emit(self.spv.gpa, .OpLine, .{
2780	.file = src_fname_id,	2784	.file = src_fname_id,
2781	.line = dbg_stmt.line,	2785	.line = dbg_stmt.line,
...	@@ -3192,6 +3196,7 @@ pub const DeclGen = struct {	...	@@ -3192,6 +3196,7 @@ pub const DeclGen = struct {
3192	}	3196	}
3193		3197
3194	fn airAssembly(self: *DeclGen, inst: Air.Inst.Index) !?IdRef {	3198	fn airAssembly(self: *DeclGen, inst: Air.Inst.Index) !?IdRef {
		3199	const mod = self.module;
3195	const ty_pl = self.air.instructions.items(.data)[inst].ty_pl;	3200	const ty_pl = self.air.instructions.items(.data)[inst].ty_pl;
3196	const extra = self.air.extraData(Air.Asm, ty_pl.payload);	3201	const extra = self.air.extraData(Air.Asm, ty_pl.payload);
3197		3202
...	@@ -3274,7 +3279,7 @@ pub const DeclGen = struct {	...	@@ -3274,7 +3279,7 @@ pub const DeclGen = struct {
3274	assert(as.errors.items.len != 0);	3279	assert(as.errors.items.len != 0);
3275	assert(self.error_msg == null);	3280	assert(self.error_msg == null);
3276	const loc = LazySrcLoc.nodeOffset(0);	3281	const loc = LazySrcLoc.nodeOffset(0);
3277	const src_loc = loc.toSrcLoc(self.module.declPtr(self.decl_index));	3282	const src_loc = loc.toSrcLoc(self.module.declPtr(self.decl_index), mod);
3278	self.error_msg = try Module.ErrorMsg.create(self.module.gpa, src_loc, "failed to assemble SPIR-V inline assembly", .{});	3283	self.error_msg = try Module.ErrorMsg.create(self.module.gpa, src_loc, "failed to assemble SPIR-V inline assembly", .{});
3279	const notes = try self.module.gpa.alloc(Module.ErrorMsg, as.errors.items.len);	3284	const notes = try self.module.gpa.alloc(Module.ErrorMsg, as.errors.items.len);
3280		3285

...	@@ -213,14 +213,14 @@ fn putFn(self: *Plan9, decl_index: Module.Decl.Index, out: FnDeclOutput) !void {	...	@@ -213,14 +213,14 @@ fn putFn(self: *Plan9, decl_index: Module.Decl.Index, out: FnDeclOutput) !void {
213	const gpa = self.base.allocator;	213	const gpa = self.base.allocator;
214	const mod = self.base.options.module.?;	214	const mod = self.base.options.module.?;
215	const decl = mod.declPtr(decl_index);	215	const decl = mod.declPtr(decl_index);
216	const fn_map_res = try self.fn_decl_table.getOrPut(gpa, decl.getFileScope());	216	const fn_map_res = try self.fn_decl_table.getOrPut(gpa, decl.getFileScope(mod));
217	if (fn_map_res.found_existing) {	217	if (fn_map_res.found_existing) {
218	if (try fn_map_res.value_ptr.functions.fetchPut(gpa, decl_index, out)) \|old_entry\| {	218	if (try fn_map_res.value_ptr.functions.fetchPut(gpa, decl_index, out)) \|old_entry\| {
219	gpa.free(old_entry.value.code);	219	gpa.free(old_entry.value.code);
220	gpa.free(old_entry.value.lineinfo);	220	gpa.free(old_entry.value.lineinfo);
221	}	221	}
222	} else {	222	} else {
223	const file = decl.getFileScope();	223	const file = decl.getFileScope(mod);
224	const arena = self.path_arena.allocator();	224	const arena = self.path_arena.allocator();
225	// each file gets a symbol	225	// each file gets a symbol
226	fn_map_res.value_ptr.* = .{	226	fn_map_res.value_ptr.* = .{
...	@@ -276,13 +276,13 @@ fn addPathComponents(self: Plan9, path: []const u8, a: std.ArrayList(u8)) !voi	...	@@ -276,13 +276,13 @@ fn addPathComponents(self: Plan9, path: []const u8, a: std.ArrayList(u8)) !voi
276	}	276	}
277	}	277	}
278		278
279	pub fn updateFunc(self: Plan9, module: Module, func: *Module.Fn, air: Air, liveness: Liveness) !void {	279	pub fn updateFunc(self: Plan9, mod: Module, func: *Module.Fn, air: Air, liveness: Liveness) !void {
280	if (build_options.skip_non_native and builtin.object_format != .plan9) {	280	if (build_options.skip_non_native and builtin.object_format != .plan9) {
281	@panic("Attempted to compile for object format that was disabled by build configuration");	281	@panic("Attempted to compile for object format that was disabled by build configuration");
282	}	282	}
283		283
284	const decl_index = func.owner_decl;	284	const decl_index = func.owner_decl;
285	const decl = module.declPtr(decl_index);	285	const decl = mod.declPtr(decl_index);
286	self.freeUnnamedConsts(decl_index);	286	self.freeUnnamedConsts(decl_index);
287		287
288	_ = try self.seeDecl(decl_index);	288	_ = try self.seeDecl(decl_index);
...	@@ -298,7 +298,7 @@ pub fn updateFunc(self: Plan9, module: Module, func: *Module.Fn, air: Air, liv	...	@@ -298,7 +298,7 @@ pub fn updateFunc(self: Plan9, module: Module, func: *Module.Fn, air: Air, liv
298		298
299	const res = try codegen.generateFunction(	299	const res = try codegen.generateFunction(
300	&self.base,	300	&self.base,
301	decl.srcLoc(),	301	decl.srcLoc(mod),
302	func,	302	func,
303	air,	303	air,
304	liveness,	304	liveness,
...	@@ -316,7 +316,7 @@ pub fn updateFunc(self: Plan9, module: Module, func: *Module.Fn, air: Air, liv	...	@@ -316,7 +316,7 @@ pub fn updateFunc(self: Plan9, module: Module, func: *Module.Fn, air: Air, liv
316	.ok => try code_buffer.toOwnedSlice(),	316	.ok => try code_buffer.toOwnedSlice(),
317	.fail => \|em\| {	317	.fail => \|em\| {
318	decl.analysis = .codegen_failure;	318	decl.analysis = .codegen_failure;
319	try module.failed_decls.put(module.gpa, decl_index, em);	319	try mod.failed_decls.put(mod.gpa, decl_index, em);
320	return;	320	return;
321	},	321	},
322	};	322	};
...	@@ -366,7 +366,7 @@ pub fn lowerUnnamedConst(self: *Plan9, tv: TypedValue, decl_index: Module.Decl.I	...	@@ -366,7 +366,7 @@ pub fn lowerUnnamedConst(self: *Plan9, tv: TypedValue, decl_index: Module.Decl.I
366	};	366	};
367	self.syms.items[info.sym_index.?] = sym;	367	self.syms.items[info.sym_index.?] = sym;
368		368
369	const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), tv, &code_buffer, .{	369	const res = try codegen.generateSymbol(&self.base, decl.srcLoc(mod), tv, &code_buffer, .{
370	.none = {},	370	.none = {},
371	}, .{	371	}, .{
372	.parent_atom_index = @enumToInt(decl_index),	372	.parent_atom_index = @enumToInt(decl_index),
...	@@ -388,8 +388,8 @@ pub fn lowerUnnamedConst(self: *Plan9, tv: TypedValue, decl_index: Module.Decl.I	...	@@ -388,8 +388,8 @@ pub fn lowerUnnamedConst(self: *Plan9, tv: TypedValue, decl_index: Module.Decl.I
388	return @intCast(u32, info.got_index.?);	388	return @intCast(u32, info.got_index.?);
389	}	389	}
390		390
391	pub fn updateDecl(self: Plan9, module: Module, decl_index: Module.Decl.Index) !void {	391	pub fn updateDecl(self: Plan9, mod: Module, decl_index: Module.Decl.Index) !void {
392	const decl = module.declPtr(decl_index);	392	const decl = mod.declPtr(decl_index);
393		393
394	if (decl.val.tag() == .extern_fn) {	394	if (decl.val.tag() == .extern_fn) {
395	return; // TODO Should we do more when front-end analyzed extern decl?	395	return; // TODO Should we do more when front-end analyzed extern decl?
...	@@ -409,7 +409,7 @@ pub fn updateDecl(self: Plan9, module: Module, decl_index: Module.Decl.Index)	...	@@ -409,7 +409,7 @@ pub fn updateDecl(self: Plan9, module: Module, decl_index: Module.Decl.Index)
409	defer code_buffer.deinit();	409	defer code_buffer.deinit();
410	const decl_val = if (decl.val.castTag(.variable)) \|payload\| payload.data.init else decl.val;	410	const decl_val = if (decl.val.castTag(.variable)) \|payload\| payload.data.init else decl.val;
411	// TODO we need the symbol index for symbol in the table of locals for the containing atom	411	// TODO we need the symbol index for symbol in the table of locals for the containing atom
412	const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), .{	412	const res = try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{
413	.ty = decl.ty,	413	.ty = decl.ty,
414	.val = decl_val,	414	.val = decl_val,
415	}, &code_buffer, .{ .none = {} }, .{	415	}, &code_buffer, .{ .none = {} }, .{
...	@@ -419,7 +419,7 @@ pub fn updateDecl(self: Plan9, module: Module, decl_index: Module.Decl.Index)	...	@@ -419,7 +419,7 @@ pub fn updateDecl(self: Plan9, module: Module, decl_index: Module.Decl.Index)
419	.ok => code_buffer.items,	419	.ok => code_buffer.items,
420	.fail => \|em\| {	420	.fail => \|em\| {
421	decl.analysis = .codegen_failure;	421	decl.analysis = .codegen_failure;
422	try module.failed_decls.put(module.gpa, decl_index, em);	422	try mod.failed_decls.put(mod.gpa, decl_index, em);
423	return;	423	return;
424	},	424	},
425	};	425	};
...	@@ -707,7 +707,7 @@ pub fn flushModule(self: Plan9, comp: Compilation, prog_node: *std.Progress.No	...	@@ -707,7 +707,7 @@ pub fn flushModule(self: Plan9, comp: Compilation, prog_node: *std.Progress.No
707	const code = blk: {	707	const code = blk: {
708	const is_fn = source_decl.ty.zigTypeTag(mod) == .Fn;	708	const is_fn = source_decl.ty.zigTypeTag(mod) == .Fn;
709	if (is_fn) {	709	if (is_fn) {
710	const table = self.fn_decl_table.get(source_decl.getFileScope()).?.functions;	710	const table = self.fn_decl_table.get(source_decl.getFileScope(mod)).?.functions;
711	const output = table.get(source_decl_index).?;	711	const output = table.get(source_decl_index).?;
712	break :blk output.code;	712	break :blk output.code;
713	} else {	713	} else {
...	@@ -729,7 +729,7 @@ pub fn flushModule(self: Plan9, comp: Compilation, prog_node: *std.Progress.No	...	@@ -729,7 +729,7 @@ pub fn flushModule(self: Plan9, comp: Compilation, prog_node: *std.Progress.No
729	}	729	}
730	fn addDeclExports(	730	fn addDeclExports(
731	self: *Plan9,	731	self: *Plan9,
732	module: *Module,	732	mod: *Module,
733	decl_index: Module.Decl.Index,	733	decl_index: Module.Decl.Index,
734	exports: []const *Module.Export,	734	exports: []const *Module.Export,
735	) !void {	735	) !void {
...	@@ -740,9 +740,9 @@ fn addDeclExports(	...	@@ -740,9 +740,9 @@ fn addDeclExports(
740	// plan9 does not support custom sections	740	// plan9 does not support custom sections
741	if (exp.options.section) \|section_name\| {	741	if (exp.options.section) \|section_name\| {
742	if (!mem.eql(u8, section_name, ".text") or !mem.eql(u8, section_name, ".data")) {	742	if (!mem.eql(u8, section_name, ".text") or !mem.eql(u8, section_name, ".data")) {
743	try module.failed_exports.put(module.gpa, exp, try Module.ErrorMsg.create(	743	try mod.failed_exports.put(mod.gpa, exp, try Module.ErrorMsg.create(
744	self.base.allocator,	744	self.base.allocator,
745	module.declPtr(decl_index).srcLoc(),	745	mod.declPtr(decl_index).srcLoc(mod),
746	"plan9 does not support extra sections",	746	"plan9 does not support extra sections",
747	.{},	747	.{},
748	));	748	));
...	@@ -773,7 +773,7 @@ pub fn freeDecl(self: *Plan9, decl_index: Module.Decl.Index) void {	...	@@ -773,7 +773,7 @@ pub fn freeDecl(self: *Plan9, decl_index: Module.Decl.Index) void {
773	const decl = mod.declPtr(decl_index);	773	const decl = mod.declPtr(decl_index);
774	const is_fn = (decl.val.tag() == .function);	774	const is_fn = (decl.val.tag() == .function);
775	if (is_fn) {	775	if (is_fn) {
776	var symidx_and_submap = self.fn_decl_table.get(decl.getFileScope()).?;	776	var symidx_and_submap = self.fn_decl_table.get(decl.getFileScope(mod)).?;
777	var submap = symidx_and_submap.functions;	777	var submap = symidx_and_submap.functions;
778	if (submap.fetchSwapRemove(decl_index)) \|removed_entry\| {	778	if (submap.fetchSwapRemove(decl_index)) \|removed_entry\| {
779	self.base.allocator.free(removed_entry.value.code);	779	self.base.allocator.free(removed_entry.value.code);