From 0fcd59eadae468284943895f50bc9fc6d1924154 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 22 Jun 2024 16:10:17 -0700 Subject: [PATCH] rename src/Module.zig to src/Zcu.zig This patch is a pure rename plus only changing the file path in `@import` sites, so it is expected to not create version control conflicts, even when rebasing. --- CMakeLists.txt | 2 +- src/Air.zig | 4 +++- src/Builtin.zig | 2 +- src/Compilation.zig | 2 +- src/InternPool.zig | 5 +++-- src/Package/Module.zig | 4 +--- src/RangeSet.zig | 6 ++++-- src/Sema.zig | 2 +- src/Sema/bitcast.zig | 2 +- src/Sema/comptime_ptr_access.zig | 2 +- src/Value.zig | 3 ++- src/{Module.zig => Zcu.zig} | 0 src/arch/aarch64/CodeGen.zig | 4 +++- src/arch/aarch64/Emit.zig | 4 +++- src/arch/aarch64/abi.zig | 4 +++- src/arch/arm/CodeGen.zig | 4 +++- src/arch/arm/Emit.zig | 4 +++- src/arch/arm/abi.zig | 4 +++- src/arch/riscv64/CodeGen.zig | 4 +++- src/arch/riscv64/Lower.zig | 4 +++- src/arch/riscv64/abi.zig | 4 +++- src/arch/riscv64/bits.zig | 4 +++- src/arch/sparc64/CodeGen.zig | 4 +++- src/arch/sparc64/Emit.zig | 4 +++- src/arch/wasm/CodeGen.zig | 4 +++- src/arch/wasm/Emit.zig | 4 +++- src/arch/wasm/abi.zig | 4 +++- src/arch/x86_64/CodeGen.zig | 5 +++-- src/arch/x86_64/Lower.zig | 4 +++- src/arch/x86_64/abi.zig | 2 +- src/codegen.zig | 3 ++- src/codegen/c.zig | 2 +- src/codegen/c/Type.zig | 2 +- src/codegen/llvm.zig | 5 +++-- src/codegen/spirv.zig | 4 +++- src/crash_report.zig | 10 +++++----- src/link.zig | 4 +++- src/link/C.zig | 2 +- src/link/Coff.zig | 4 +++- src/link/Dwarf.zig | 4 +++- src/link/Elf.zig | 4 +++- src/link/Elf/ZigObject.zig | 4 +++- src/link/MachO.zig | 4 +++- src/link/MachO/ZigObject.zig | 4 +++- src/link/NvPtx.zig | 4 +++- src/link/Plan9.zig | 6 +++--- src/link/SpirV.zig | 4 +++- src/link/Wasm.zig | 4 +++- src/link/Wasm/ZigObject.zig | 4 +++- src/main.zig | 4 +++- src/mutable_value.zig | 2 +- src/print_air.zig | 12 ++++++------ src/print_value.zig | 3 ++- src/print_zir.zig | 2 +- src/register_manager.zig | 4 +++- src/target.zig | 2 +- src/type.zig | 5 +++-- 57 files changed, 143 insertions(+), 74 deletions(-) rename src/{Module.zig => Zcu.zig} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c80443e3f..33cdb66b5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -513,7 +513,6 @@ set(ZIG_STAGE2_SOURCES src/InternPool.zig src/Liveness.zig src/Liveness/Verify.zig - src/Module.zig src/Package.zig src/Package/Fetch.zig src/Package/Fetch/git.zig @@ -524,6 +523,7 @@ set(ZIG_STAGE2_SOURCES src/Sema/bitcast.zig src/Sema/comptime_ptr_access.zig src/Value.zig + src/Zcu.zig src/arch/aarch64/CodeGen.zig src/arch/aarch64/Emit.zig src/arch/aarch64/Mir.zig diff --git a/src/Air.zig b/src/Air.zig index 9d7016155e..e70f73432f 100644 --- a/src/Air.zig +++ b/src/Air.zig @@ -11,7 +11,9 @@ const Air = @This(); const Value = @import("Value.zig"); const Type = @import("type.zig").Type; const InternPool = @import("InternPool.zig"); -const Module = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); +/// Deprecated. +const Module = Zcu; instructions: std.MultiArrayList(Inst).Slice, /// The meaning of this data is determined by `Inst.Tag` value. diff --git a/src/Builtin.zig b/src/Builtin.zig index 46f958875a..dbdd746bcd 100644 --- a/src/Builtin.zig +++ b/src/Builtin.zig @@ -296,6 +296,6 @@ const build_options = @import("build_options"); const Module = @import("Package/Module.zig"); const assert = std.debug.assert; const AstGen = std.zig.AstGen; -const File = @import("Module.zig").File; +const File = @import("Zcu.zig").File; const Compilation = @import("Compilation.zig"); const log = std.log.scoped(.builtin); diff --git a/src/Compilation.zig b/src/Compilation.zig index 32243daf69..de8f5542e3 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -28,7 +28,7 @@ const libcxx = @import("libcxx.zig"); const wasi_libc = @import("wasi_libc.zig"); const fatal = @import("main.zig").fatal; const clangMain = @import("main.zig").clangMain; -const Zcu = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); /// Deprecated; use `Zcu`. const Module = Zcu; const InternPool = @import("InternPool.zig"); diff --git a/src/InternPool.zig b/src/InternPool.zig index 3669ab59d1..e297a8ea78 100644 --- a/src/InternPool.zig +++ b/src/InternPool.zig @@ -344,8 +344,9 @@ const Limb = std.math.big.Limb; const Hash = std.hash.Wyhash; const InternPool = @This(); -const Module = @import("Module.zig"); -const Zcu = Module; +const Zcu = @import("Zcu.zig"); +/// Deprecated. +const Module = Zcu; const Zir = std.zig.Zir; const KeyAdapter = struct { diff --git a/src/Package/Module.zig b/src/Package/Module.zig index f9cb4475ad..80d7015610 100644 --- a/src/Package/Module.zig +++ b/src/Package/Module.zig @@ -1,6 +1,4 @@ //! Corresponds to something that Zig source code can `@import`. -//! Not to be confused with src/Module.zig which will be renamed -//! to Zcu. https://github.com/ziglang/zig/issues/14307 /// Only files inside this directory can be imported. root: Cache.Path, @@ -518,4 +516,4 @@ const Cache = std.Build.Cache; const Builtin = @import("../Builtin.zig"); const assert = std.debug.assert; const Compilation = @import("../Compilation.zig"); -const File = @import("../Module.zig").File; +const File = @import("../Zcu.zig").File; diff --git a/src/RangeSet.zig b/src/RangeSet.zig index 4e2eaa633a..30b8c273cd 100644 --- a/src/RangeSet.zig +++ b/src/RangeSet.zig @@ -5,9 +5,11 @@ const Order = std.math.Order; const InternPool = @import("InternPool.zig"); const Type = @import("type.zig").Type; const Value = @import("Value.zig"); -const Module = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); +/// Deprecated. +const Module = Zcu; const RangeSet = @This(); -const LazySrcLoc = @import("Module.zig").LazySrcLoc; +const LazySrcLoc = Zcu.LazySrcLoc; ranges: std.ArrayList(Range), module: *Module, diff --git a/src/Sema.zig b/src/Sema.zig index 26696328f7..a59768686b 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -170,7 +170,7 @@ const MutableValue = @import("mutable_value.zig").MutableValue; const Type = @import("type.zig").Type; const Air = @import("Air.zig"); const Zir = std.zig.Zir; -const Zcu = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); const Module = Zcu; const trace = @import("tracy.zig").trace; const Namespace = Module.Namespace; diff --git a/src/Sema/bitcast.zig b/src/Sema/bitcast.zig index 8781009137..62a0122fa1 100644 --- a/src/Sema/bitcast.zig +++ b/src/Sema/bitcast.zig @@ -765,7 +765,7 @@ const Allocator = std.mem.Allocator; const assert = std.debug.assert; const Sema = @import("../Sema.zig"); -const Zcu = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); const InternPool = @import("../InternPool.zig"); const Type = @import("../type.zig").Type; const Value = @import("../Value.zig"); diff --git a/src/Sema/comptime_ptr_access.zig b/src/Sema/comptime_ptr_access.zig index de0afc4b85..59c4c9507d 100644 --- a/src/Sema/comptime_ptr_access.zig +++ b/src/Sema/comptime_ptr_access.zig @@ -1056,5 +1056,5 @@ const Block = Sema.Block; const MutableValue = @import("../mutable_value.zig").MutableValue; const Type = @import("../type.zig").Type; const Value = @import("../Value.zig"); -const Zcu = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); const LazySrcLoc = Zcu.LazySrcLoc; diff --git a/src/Value.zig b/src/Value.zig index 0eb0364986..5719ed3689 100644 --- a/src/Value.zig +++ b/src/Value.zig @@ -6,7 +6,8 @@ const BigIntConst = std.math.big.int.Const; const BigIntMutable = std.math.big.int.Mutable; const Target = std.Target; const Allocator = std.mem.Allocator; -const Zcu = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); +/// Deprecated. const Module = Zcu; const Sema = @import("Sema.zig"); const InternPool = @import("InternPool.zig"); diff --git a/src/Module.zig b/src/Zcu.zig similarity index 100% rename from src/Module.zig rename to src/Zcu.zig diff --git a/src/arch/aarch64/CodeGen.zig b/src/arch/aarch64/CodeGen.zig index ddde72345e..48908db51b 100644 --- a/src/arch/aarch64/CodeGen.zig +++ b/src/arch/aarch64/CodeGen.zig @@ -11,7 +11,9 @@ const Liveness = @import("../../Liveness.zig"); const Type = @import("../../type.zig").Type; const Value = @import("../../Value.zig"); const link = @import("../../link.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../../InternPool.zig"); const Compilation = @import("../../Compilation.zig"); const ErrorMsg = Module.ErrorMsg; diff --git a/src/arch/aarch64/Emit.zig b/src/arch/aarch64/Emit.zig index d14c0c8aad..a783137a54 100644 --- a/src/arch/aarch64/Emit.zig +++ b/src/arch/aarch64/Emit.zig @@ -7,7 +7,9 @@ const math = std.math; const Mir = @import("Mir.zig"); const bits = @import("bits.zig"); const link = @import("../../link.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const ErrorMsg = Module.ErrorMsg; const assert = std.debug.assert; const Instruction = bits.Instruction; diff --git a/src/arch/aarch64/abi.zig b/src/arch/aarch64/abi.zig index 5bc452a493..2a25dbf1be 100644 --- a/src/arch/aarch64/abi.zig +++ b/src/arch/aarch64/abi.zig @@ -4,7 +4,9 @@ const bits = @import("bits.zig"); const Register = bits.Register; const RegisterManagerFn = @import("../../register_manager.zig").RegisterManager; const Type = @import("../../type.zig").Type; -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; pub const Class = union(enum) { memory, diff --git a/src/arch/arm/CodeGen.zig b/src/arch/arm/CodeGen.zig index 86d4e8f7fd..60453cebe2 100644 --- a/src/arch/arm/CodeGen.zig +++ b/src/arch/arm/CodeGen.zig @@ -11,7 +11,9 @@ const Liveness = @import("../../Liveness.zig"); const Type = @import("../../type.zig").Type; const Value = @import("../../Value.zig"); const link = @import("../../link.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../../InternPool.zig"); const Compilation = @import("../../Compilation.zig"); const ErrorMsg = Module.ErrorMsg; diff --git a/src/arch/arm/Emit.zig b/src/arch/arm/Emit.zig index 2ab3b60ee6..3a9bfcf4b6 100644 --- a/src/arch/arm/Emit.zig +++ b/src/arch/arm/Emit.zig @@ -8,7 +8,9 @@ const math = std.math; const Mir = @import("Mir.zig"); const bits = @import("bits.zig"); const link = @import("../../link.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const Type = @import("../../type.zig").Type; const ErrorMsg = Module.ErrorMsg; const Target = std.Target; diff --git a/src/arch/arm/abi.zig b/src/arch/arm/abi.zig index a6581c8dd8..1a434b3b8c 100644 --- a/src/arch/arm/abi.zig +++ b/src/arch/arm/abi.zig @@ -4,7 +4,9 @@ const bits = @import("bits.zig"); const Register = bits.Register; const RegisterManagerFn = @import("../../register_manager.zig").RegisterManager; const Type = @import("../../type.zig").Type; -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; pub const Class = union(enum) { memory, diff --git a/src/arch/riscv64/CodeGen.zig b/src/arch/riscv64/CodeGen.zig index 115d5697a5..6029925e20 100644 --- a/src/arch/riscv64/CodeGen.zig +++ b/src/arch/riscv64/CodeGen.zig @@ -10,7 +10,9 @@ const Liveness = @import("../../Liveness.zig"); const Type = @import("../../type.zig").Type; const Value = @import("../../Value.zig"); const link = @import("../../link.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const Package = @import("../../Package.zig"); const InternPool = @import("../../InternPool.zig"); const Compilation = @import("../../Compilation.zig"); diff --git a/src/arch/riscv64/Lower.zig b/src/arch/riscv64/Lower.zig index 247cf64647..311156119e 100644 --- a/src/arch/riscv64/Lower.zig +++ b/src/arch/riscv64/Lower.zig @@ -522,6 +522,8 @@ const Air = @import("../../Air.zig"); const Allocator = std.mem.Allocator; const ErrorMsg = Module.ErrorMsg; const Mir = @import("Mir.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const Instruction = encoder.Instruction; const Immediate = bits.Immediate; diff --git a/src/arch/riscv64/abi.zig b/src/arch/riscv64/abi.zig index a5b54f0a1b..a5f820c70e 100644 --- a/src/arch/riscv64/abi.zig +++ b/src/arch/riscv64/abi.zig @@ -4,7 +4,9 @@ const Register = bits.Register; const RegisterManagerFn = @import("../../register_manager.zig").RegisterManager; const Type = @import("../../type.zig").Type; const InternPool = @import("../../InternPool.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const assert = std.debug.assert; pub const Class = enum { memory, byval, integer, double_integer, fields }; diff --git a/src/arch/riscv64/bits.zig b/src/arch/riscv64/bits.zig index cb398ef620..4870327ac0 100644 --- a/src/arch/riscv64/bits.zig +++ b/src/arch/riscv64/bits.zig @@ -4,7 +4,9 @@ const assert = std.debug.assert; const testing = std.testing; const Target = std.Target; -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const Encoding = @import("Encoding.zig"); const Mir = @import("Mir.zig"); const abi = @import("abi.zig"); diff --git a/src/arch/sparc64/CodeGen.zig b/src/arch/sparc64/CodeGen.zig index 19c18ec4a6..14500ed329 100644 --- a/src/arch/sparc64/CodeGen.zig +++ b/src/arch/sparc64/CodeGen.zig @@ -10,7 +10,9 @@ const mem = std.mem; const Allocator = mem.Allocator; const builtin = @import("builtin"); const link = @import("../../link.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../../InternPool.zig"); const Value = @import("../../Value.zig"); const ErrorMsg = Module.ErrorMsg; diff --git a/src/arch/sparc64/Emit.zig b/src/arch/sparc64/Emit.zig index b2f2e6f79d..acd605eebc 100644 --- a/src/arch/sparc64/Emit.zig +++ b/src/arch/sparc64/Emit.zig @@ -5,7 +5,9 @@ const std = @import("std"); const Endian = std.builtin.Endian; const assert = std.debug.assert; const link = @import("../../link.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const ErrorMsg = Module.ErrorMsg; const Liveness = @import("../../Liveness.zig"); const log = std.log.scoped(.sparcv9_emit); diff --git a/src/arch/wasm/CodeGen.zig b/src/arch/wasm/CodeGen.zig index b33f5052e7..bb19cde588 100644 --- a/src/arch/wasm/CodeGen.zig +++ b/src/arch/wasm/CodeGen.zig @@ -10,7 +10,9 @@ const wasm = std.wasm; const log = std.log.scoped(.codegen); const codegen = @import("../../codegen.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../../InternPool.zig"); const Decl = Module.Decl; const Type = @import("../../type.zig").Type; diff --git a/src/arch/wasm/Emit.zig b/src/arch/wasm/Emit.zig index 957100ee34..df7a9d9d90 100644 --- a/src/arch/wasm/Emit.zig +++ b/src/arch/wasm/Emit.zig @@ -5,7 +5,9 @@ const Emit = @This(); const std = @import("std"); const Mir = @import("Mir.zig"); const link = @import("../../link.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../../InternPool.zig"); const codegen = @import("../../codegen.zig"); const leb128 = std.leb; diff --git a/src/arch/wasm/abi.zig b/src/arch/wasm/abi.zig index 7ca0f9f245..c4d49d51b5 100644 --- a/src/arch/wasm/abi.zig +++ b/src/arch/wasm/abi.zig @@ -9,7 +9,9 @@ const Target = std.Target; const assert = std.debug.assert; const Type = @import("../../type.zig").Type; -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; /// Defines how to pass a type as part of a function signature, /// both for parameters as well as return values. diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index b733f2b245..ea6f0f8a4e 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -26,8 +26,9 @@ const Liveness = @import("../../Liveness.zig"); const Lower = @import("Lower.zig"); const Mir = @import("Mir.zig"); const Package = @import("../../Package.zig"); -const Module = @import("../../Module.zig"); -const Zcu = Module; +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../../InternPool.zig"); const Alignment = InternPool.Alignment; const Target = std.Target; diff --git a/src/arch/x86_64/Lower.zig b/src/arch/x86_64/Lower.zig index 578fc022a0..058a0550d9 100644 --- a/src/arch/x86_64/Lower.zig +++ b/src/arch/x86_64/Lower.zig @@ -664,7 +664,9 @@ const Lower = @This(); const Memory = Instruction.Memory; const Mir = @import("Mir.zig"); const Mnemonic = Instruction.Mnemonic; -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const Operand = Instruction.Operand; const Prefix = Instruction.Prefix; const Register = bits.Register; diff --git a/src/arch/x86_64/abi.zig b/src/arch/x86_64/abi.zig index 0371e84497..f1117f16c1 100644 --- a/src/arch/x86_64/abi.zig +++ b/src/arch/x86_64/abi.zig @@ -539,4 +539,4 @@ const Register = @import("bits.zig").Register; const RegisterManagerFn = @import("../../register_manager.zig").RegisterManager; const Type = @import("../../type.zig").Type; const Value = @import("../../Value.zig"); -const Zcu = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); diff --git a/src/codegen.zig b/src/codegen.zig index 72fd975899..b8662ed15b 100644 --- a/src/codegen.zig +++ b/src/codegen.zig @@ -16,7 +16,8 @@ const Compilation = @import("Compilation.zig"); const ErrorMsg = Module.ErrorMsg; const InternPool = @import("InternPool.zig"); const Liveness = @import("Liveness.zig"); -const Zcu = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); +/// Deprecated. const Module = Zcu; const Target = std.Target; const Type = @import("type.zig").Type; diff --git a/src/codegen/c.zig b/src/codegen/c.zig index b3a381b278..94f8faa441 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -5,7 +5,7 @@ const mem = std.mem; const log = std.log.scoped(.c); const link = @import("../link.zig"); -const Zcu = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); const Module = @import("../Package/Module.zig"); const Compilation = @import("../Compilation.zig"); const Value = @import("../Value.zig"); diff --git a/src/codegen/c/Type.zig b/src/codegen/c/Type.zig index 3a0e3b42f8..e316d7a154 100644 --- a/src/codegen/c/Type.zig +++ b/src/codegen/c/Type.zig @@ -2584,5 +2584,5 @@ const CType = @This(); const Module = @import("../../Package/Module.zig"); const std = @import("std"); const Type = @import("../../type.zig").Type; -const Zcu = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); const DeclIndex = @import("../../InternPool.zig").DeclIndex; diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index f61c817f07..1e29d2cbe5 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -14,8 +14,9 @@ else const link = @import("../link.zig"); const Compilation = @import("../Compilation.zig"); const build_options = @import("build_options"); -const Module = @import("../Module.zig"); -const Zcu = Module; +const Zcu = @import("../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../InternPool.zig"); const Package = @import("../Package.zig"); const Air = @import("../Air.zig"); diff --git a/src/codegen/spirv.zig b/src/codegen/spirv.zig index 4f4a227048..8168cce996 100644 --- a/src/codegen/spirv.zig +++ b/src/codegen/spirv.zig @@ -5,7 +5,9 @@ const log = std.log.scoped(.codegen); const assert = std.debug.assert; const Signedness = std.builtin.Signedness; -const Module = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const Decl = Module.Decl; const Type = @import("../type.zig").Type; const Value = @import("../Value.zig"); diff --git a/src/crash_report.zig b/src/crash_report.zig index db1d4846e9..453d5441d4 100644 --- a/src/crash_report.zig +++ b/src/crash_report.zig @@ -8,11 +8,11 @@ const windows = std.os.windows; const posix = std.posix; const native_os = builtin.os.tag; -const Module = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); const Sema = @import("Sema.zig"); const InternPool = @import("InternPool.zig"); const Zir = std.zig.Zir; -const Decl = Module.Decl; +const Decl = Zcu.Decl; /// To use these crash report diagnostics, publish this panic in your main file /// and add `pub const enable_segfault_handler = false;` to your `std_options`. @@ -78,7 +78,7 @@ fn dumpStatusReport() !void { const block: *Sema.Block = anal.block; const mod = anal.sema.mod; - const file, const src_base_node = Module.LazySrcLoc.resolveBaseNode(block.src_base_inst, mod); + const file, const src_base_node = Zcu.LazySrcLoc.resolveBaseNode(block.src_base_inst, mod); try stderr.writeAll("Analyzing "); try writeFilePath(file, stderr); @@ -104,7 +104,7 @@ fn dumpStatusReport() !void { while (parent) |curr| { fba.reset(); try stderr.writeAll(" in "); - const cur_block_file, const cur_block_src_base_node = Module.LazySrcLoc.resolveBaseNode(curr.block.src_base_inst, mod); + const cur_block_file, const cur_block_src_base_node = Zcu.LazySrcLoc.resolveBaseNode(curr.block.src_base_inst, mod); try writeFilePath(cur_block_file, stderr); try stderr.writeAll("\n > "); print_zir.renderSingleInstruction( @@ -128,7 +128,7 @@ fn dumpStatusReport() !void { var crash_heap: [16 * 4096]u8 = undefined; -fn writeFilePath(file: *Module.File, writer: anytype) !void { +fn writeFilePath(file: *Zcu.File, writer: anytype) !void { if (file.mod.root.root_dir.path) |path| { try writer.writeAll(path); try writer.writeAll(std.fs.path.sep_str); diff --git a/src/link.zig b/src/link.zig index ef09639dcf..75a9723f1c 100644 --- a/src/link.zig +++ b/src/link.zig @@ -14,7 +14,9 @@ const Cache = std.Build.Cache; const Compilation = @import("Compilation.zig"); const LibCInstallation = std.zig.LibCInstallation; const Liveness = @import("Liveness.zig"); -const Module = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("InternPool.zig"); const Type = @import("type.zig").Type; const Value = @import("Value.zig"); diff --git a/src/link/C.zig b/src/link/C.zig index 305af40156..e6830eac8c 100644 --- a/src/link/C.zig +++ b/src/link/C.zig @@ -6,7 +6,7 @@ const fs = std.fs; const C = @This(); const build_options = @import("build_options"); -const Zcu = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); const Module = @import("../Package/Module.zig"); const InternPool = @import("../InternPool.zig"); const Alignment = InternPool.Alignment; diff --git a/src/link/Coff.zig b/src/link/Coff.zig index 4a58e970c1..4524441f3b 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -2740,7 +2740,9 @@ const Compilation = @import("../Compilation.zig"); const ImportTable = @import("Coff/ImportTable.zig"); const Liveness = @import("../Liveness.zig"); const LlvmObject = @import("../codegen/llvm.zig").Object; -const Module = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../InternPool.zig"); const Object = @import("Coff/Object.zig"); const Relocation = @import("Coff/Relocation.zig"); diff --git a/src/link/Dwarf.zig b/src/link/Dwarf.zig index 8b29bfd99b..88d2d13e19 100644 --- a/src/link/Dwarf.zig +++ b/src/link/Dwarf.zig @@ -2964,7 +2964,9 @@ const File = link.File; const LinkBlock = File.LinkBlock; const LinkFn = File.LinkFn; const LinkerLoad = @import("../codegen.zig").LinkerLoad; -const Module = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../InternPool.zig"); const StringTable = @import("StringTable.zig"); const Type = @import("../type.zig").Type; diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 75d41a2813..5a14a544e8 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -6466,7 +6466,9 @@ const Liveness = @import("../Liveness.zig"); const LlvmObject = @import("../codegen/llvm.zig").Object; const MergeSection = merge_section.MergeSection; const MergeSubsection = merge_section.MergeSubsection; -const Module = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const Object = @import("Elf/Object.zig"); const InternPool = @import("../InternPool.zig"); const PltSection = synthetic_sections.PltSection; diff --git a/src/link/Elf/ZigObject.zig b/src/link/Elf/ZigObject.zig index 0ee141ec4c..c2c5e879cb 100644 --- a/src/link/Elf/ZigObject.zig +++ b/src/link/Elf/ZigObject.zig @@ -1648,7 +1648,9 @@ const Elf = @import("../Elf.zig"); const File = @import("file.zig").File; const InternPool = @import("../../InternPool.zig"); const Liveness = @import("../../Liveness.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const Object = @import("Object.zig"); const Symbol = @import("Symbol.zig"); const StringTable = @import("../StringTable.zig"); diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 273c3d8c25..9cec01c437 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -4861,7 +4861,9 @@ const LibStub = tapi.LibStub; const Liveness = @import("../Liveness.zig"); const LlvmObject = @import("../codegen/llvm.zig").Object; const Md5 = std.crypto.hash.Md5; -const Module = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../InternPool.zig"); const RebaseSection = synthetic.RebaseSection; pub const Relocation = @import("MachO/Relocation.zig"); diff --git a/src/link/MachO/ZigObject.zig b/src/link/MachO/ZigObject.zig index cf92503f5a..e2202d11fc 100644 --- a/src/link/MachO/ZigObject.zig +++ b/src/link/MachO/ZigObject.zig @@ -1587,7 +1587,9 @@ const InternPool = @import("../../InternPool.zig"); const Liveness = @import("../../Liveness.zig"); const MachO = @import("../MachO.zig"); const Nlist = Object.Nlist; -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const Object = @import("Object.zig"); const Relocation = @import("Relocation.zig"); const Symbol = @import("Symbol.zig"); diff --git a/src/link/NvPtx.zig b/src/link/NvPtx.zig index 8e1ebc9726..3d059acbb5 100644 --- a/src/link/NvPtx.zig +++ b/src/link/NvPtx.zig @@ -12,7 +12,9 @@ const Allocator = std.mem.Allocator; const assert = std.debug.assert; const log = std.log.scoped(.link); -const Module = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../InternPool.zig"); const Compilation = @import("../Compilation.zig"); const link = @import("../link.zig"); diff --git a/src/link/Plan9.zig b/src/link/Plan9.zig index ac6ae6752c..b15ec87815 100644 --- a/src/link/Plan9.zig +++ b/src/link/Plan9.zig @@ -3,7 +3,9 @@ const Plan9 = @This(); const link = @import("../link.zig"); -const Module = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../InternPool.zig"); const Compilation = @import("../Compilation.zig"); const aout = @import("Plan9/aout.zig"); @@ -1046,8 +1048,6 @@ pub fn freeDecl(self: *Plan9, decl_index: InternPool.DeclIndex) void { const gpa = self.base.comp.gpa; // TODO audit the lifetimes of decls table entries. It's possible to get // freeDecl without any updateDecl in between. - // However that is planned to change, see the TODO comment in Module.zig - // in the deleteUnusedDecl function. const mod = self.base.comp.module.?; const decl = mod.declPtr(decl_index); const is_fn = decl.val.isFuncBody(mod); diff --git a/src/link/SpirV.zig b/src/link/SpirV.zig index 6577b0df51..099d58bfa0 100644 --- a/src/link/SpirV.zig +++ b/src/link/SpirV.zig @@ -27,7 +27,9 @@ const Allocator = std.mem.Allocator; const assert = std.debug.assert; const log = std.log.scoped(.link); -const Module = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const InternPool = @import("../InternPool.zig"); const Compilation = @import("../Compilation.zig"); const link = @import("../link.zig"); diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig index da6425326b..217c95a705 100644 --- a/src/link/Wasm.zig +++ b/src/link/Wasm.zig @@ -28,7 +28,9 @@ const File = @import("Wasm/file.zig").File; const InternPool = @import("../InternPool.zig"); const Liveness = @import("../Liveness.zig"); const LlvmObject = @import("../codegen/llvm.zig").Object; -const Module = @import("../Module.zig"); +const Zcu = @import("../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const Object = @import("Wasm/Object.zig"); const Symbol = @import("Wasm/Symbol.zig"); const Type = @import("../type.zig").Type; diff --git a/src/link/Wasm/ZigObject.zig b/src/link/Wasm/ZigObject.zig index cced85f800..1accf81c02 100644 --- a/src/link/Wasm/ZigObject.zig +++ b/src/link/Wasm/ZigObject.zig @@ -1242,7 +1242,9 @@ const Dwarf = @import("../Dwarf.zig"); const File = @import("file.zig").File; const InternPool = @import("../../InternPool.zig"); const Liveness = @import("../../Liveness.zig"); -const Module = @import("../../Module.zig"); +const Zcu = @import("../../Zcu.zig"); +/// Deprecated. +const Module = Zcu; const StringTable = @import("../StringTable.zig"); const Symbol = @import("Symbol.zig"); const Type = @import("../../type.zig").Type; diff --git a/src/main.zig b/src/main.zig index ba3085b72d..d9084686c8 100644 --- a/src/main.zig +++ b/src/main.zig @@ -26,7 +26,9 @@ const wasi_libc = @import("wasi_libc.zig"); const Cache = std.Build.Cache; const target_util = @import("target.zig"); const crash_report = @import("crash_report.zig"); -const Module = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); +/// Deprecated. +const Module = Zcu; const AstGen = std.zig.AstGen; const mingw = @import("mingw.zig"); const Server = std.zig.Server; diff --git a/src/mutable_value.zig b/src/mutable_value.zig index e9f19e6596..77c0827691 100644 --- a/src/mutable_value.zig +++ b/src/mutable_value.zig @@ -1,7 +1,7 @@ const std = @import("std"); const assert = std.debug.assert; const Allocator = std.mem.Allocator; -const Zcu = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); const InternPool = @import("InternPool.zig"); const Type = @import("type.zig").Type; const Value = @import("Value.zig"); diff --git a/src/print_air.zig b/src/print_air.zig index e61ae9fff0..2dbaf3069f 100644 --- a/src/print_air.zig +++ b/src/print_air.zig @@ -2,14 +2,14 @@ const std = @import("std"); const Allocator = std.mem.Allocator; const fmtIntSizeBin = std.fmt.fmtIntSizeBin; -const Module = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); const Value = @import("Value.zig"); const Type = @import("type.zig").Type; const Air = @import("Air.zig"); const Liveness = @import("Liveness.zig"); const InternPool = @import("InternPool.zig"); -pub fn write(stream: anytype, module: *Module, air: Air, liveness: ?Liveness) void { +pub fn write(stream: anytype, module: *Zcu, air: Air, liveness: ?Liveness) void { const instruction_bytes = air.instructions.len * // Here we don't use @sizeOf(Air.Inst.Data) because it would include // the debug safety tag but we want to measure release size. @@ -55,7 +55,7 @@ pub fn write(stream: anytype, module: *Module, air: Air, liveness: ?Liveness) vo pub fn writeInst( stream: anytype, inst: Air.Inst.Index, - module: *Module, + module: *Zcu, air: Air, liveness: ?Liveness, ) void { @@ -70,16 +70,16 @@ pub fn writeInst( writer.writeInst(stream, inst) catch return; } -pub fn dump(module: *Module, air: Air, liveness: ?Liveness) void { +pub fn dump(module: *Zcu, air: Air, liveness: ?Liveness) void { write(std.io.getStdErr().writer(), module, air, liveness); } -pub fn dumpInst(inst: Air.Inst.Index, module: *Module, air: Air, liveness: ?Liveness) void { +pub fn dumpInst(inst: Air.Inst.Index, module: *Zcu, air: Air, liveness: ?Liveness) void { writeInst(std.io.getStdErr().writer(), inst, module, air, liveness); } const Writer = struct { - module: *Module, + module: *Zcu, gpa: Allocator, air: Air, liveness: ?Liveness, diff --git a/src/print_value.zig b/src/print_value.zig index e1a63e5b6a..7f75b05606 100644 --- a/src/print_value.zig +++ b/src/print_value.zig @@ -4,7 +4,8 @@ const std = @import("std"); const Type = @import("type.zig").Type; const Value = @import("Value.zig"); -const Zcu = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); +/// Deprecated. const Module = Zcu; const Sema = @import("Sema.zig"); const InternPool = @import("InternPool.zig"); diff --git a/src/print_zir.zig b/src/print_zir.zig index b32ea5ffe9..6caf6a5d91 100644 --- a/src/print_zir.zig +++ b/src/print_zir.zig @@ -6,7 +6,7 @@ const Ast = std.zig.Ast; const InternPool = @import("InternPool.zig"); const Zir = std.zig.Zir; -const Zcu = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); const Module = Zcu; const LazySrcLoc = Zcu.LazySrcLoc; diff --git a/src/register_manager.zig b/src/register_manager.zig index bd596f5658..e1bc4d52fa 100644 --- a/src/register_manager.zig +++ b/src/register_manager.zig @@ -6,7 +6,9 @@ const Allocator = std.mem.Allocator; const Air = @import("Air.zig"); const StaticBitSet = std.bit_set.StaticBitSet; const Type = @import("type.zig").Type; -const Module = @import("Module.zig"); +const Zcu = @import("Zcu.zig"); +/// Deprecated. +const Module = Zcu; const expect = std.testing.expect; const expectEqual = std.testing.expectEqual; const expectEqualSlices = std.testing.expectEqualSlices; diff --git a/src/target.zig b/src/target.zig index 1a12d741ed..08ccfbaaca 100644 --- a/src/target.zig +++ b/src/target.zig @@ -2,7 +2,7 @@ const std = @import("std"); const Type = @import("type.zig").Type; const AddressSpace = std.builtin.AddressSpace; const Alignment = @import("InternPool.zig").Alignment; -const Feature = @import("Module.zig").Feature; +const Feature = @import("Zcu.zig").Feature; pub const default_stack_protector_buffer_size = 4; diff --git a/src/type.zig b/src/type.zig index 215320ad79..480db4e5b7 100644 --- a/src/type.zig +++ b/src/type.zig @@ -3,8 +3,9 @@ const builtin = @import("builtin"); const Value = @import("Value.zig"); const assert = std.debug.assert; const Target = std.Target; -const Module = @import("Module.zig"); -const Zcu = Module; +const Zcu = @import("Zcu.zig"); +/// Deprecated. +const Module = Zcu; const log = std.log.scoped(.Type); const target_util = @import("target.zig"); const Sema = @import("Sema.zig");