From b384a7f85859678657f0ee91041be27078dfd346 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 24 Jun 2026 00:08:53 -0700 Subject: [PATCH] compiler: import Module instead of Package it's almost like all these references to Package actually wanted to be references to Module instead... --- src/Builtin.zig | 2 +- src/Compilation.zig | 48 ++++++++++++++++----------------- src/Compilation/Config.zig | 2 +- src/Module.zig | 8 +++--- src/Sema.zig | 4 +-- src/Zcu.zig | 30 ++++++++++----------- src/Zcu/PerThread.zig | 2 +- src/codegen/aarch64/Select.zig | 4 +-- src/codegen/c.zig | 2 +- src/codegen/llvm.zig | 4 +-- src/codegen/llvm/FuncGen.zig | 4 +-- src/codegen/riscv64/CodeGen.zig | 4 +-- src/codegen/x86_64/CodeGen.zig | 2 +- src/libs/freebsd.zig | 2 +- src/libs/glibc.zig | 2 +- src/libs/libcxx.zig | 2 +- src/libs/libtsan.zig | 2 +- src/libs/libunwind.zig | 2 +- src/libs/musl.zig | 2 +- src/libs/netbsd.zig | 2 +- src/libs/openbsd.zig | 2 +- src/link.zig | 1 - src/link/C.zig | 2 +- src/link/Dwarf.zig | 2 +- src/main.zig | 29 ++++++++++---------- 25 files changed, 82 insertions(+), 84 deletions(-) diff --git a/src/Builtin.zig b/src/Builtin.zig index b45841d152aab73e281e3e7865b106a8539e6ce2..2117aae11b1ef834cfdb594dfc1f7ea2711e5406 100644 --- a/src/Builtin.zig +++ b/src/Builtin.zig @@ -370,7 +370,7 @@ const std = @import("std"); const Allocator = std.mem.Allocator; const Cache = std.Build.Cache; const build_options = @import("build_options"); -const Module = @import("Package/Module.zig"); +const Module = @import("Module.zig"); const assert = std.debug.assert; const AstGen = std.zig.AstGen; const File = @import("Zcu.zig").File; diff --git a/src/Compilation.zig b/src/Compilation.zig index 55593959ab44b807ed69fa2f3cecfcbfe76542d5..da8844e0de453dd86ee07e2f2156d64cfaaf231f 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -16,7 +16,6 @@ const fatal = std.process.fatal; const Value = @import("Value.zig"); const Type = @import("Type.zig"); const target_util = @import("target.zig"); -const Package = @import("Package.zig"); const link = @import("link.zig"); const tracy = @import("tracy.zig"); const trace = tracy.trace; @@ -43,6 +42,7 @@ const Air = @import("Air.zig"); const Builtin = @import("Builtin.zig"); const LlvmObject = @import("codegen/llvm.zig").Object; const dev = @import("dev.zig"); +const Module = @import("Module.zig"); pub const Config = @import("Compilation/Config.zig"); @@ -63,7 +63,7 @@ cache_use: CacheUse, /// All compilations have a root module because this is where some important /// settings are stored, such as target and optimization mode. This module /// might not have any .zig code associated with it, however. -root_mod: *Package.Module, +root_mod: *Module, /// User-specified settings that have all the defaults resolved into concrete values. config: Config, @@ -766,7 +766,7 @@ pub const CrtFile = struct { /// For passing to a C compiler. pub const CSourceFile = struct { /// Many C compiler flags are determined by settings contained in the owning Module. - owner: *Package.Module, + owner: *Module, src_path: []const u8, extra_flags: []const []const u8 = &.{}, /// Same as extra_flags except they are not added to the Cache hash. @@ -778,7 +778,7 @@ pub const CSourceFile = struct { /// For passing to resinator. pub const RcSourceFile = struct { - owner: *Package.Module, + owner: *Module, src_path: []const u8, extra_flags: []const []const u8 = &.{}, }; @@ -1216,7 +1216,7 @@ pub const MiscError = struct { }; pub const cache_helpers = struct { - pub fn addModule(hh: *Cache.HashHelper, mod: *const Package.Module) void { + pub fn addModule(hh: *Cache.HashHelper, mod: *const Module) void { addResolvedTarget(hh, mod.resolved_target); hh.add(mod.optimize_mode); hh.add(mod.code_model); @@ -1239,7 +1239,7 @@ pub const cache_helpers = struct { pub fn addResolvedTarget( hh: *Cache.HashHelper, - resolved_target: Package.Module.ResolvedTarget, + resolved_target: Module.ResolvedTarget, ) void { const target = &resolved_target.result; hh.add(target.cpu.arch); @@ -1412,16 +1412,16 @@ pub const CreateOptions = struct { /// Options that have been resolved by calling `resolveDefaults`. config: Compilation.Config, - root_mod: *Package.Module, + root_mod: *Module, /// Normally, `main_mod` and `root_mod` are the same. The exception is `zig /// test`, in which `root_mod` is the test runner, and `main_mod` is the /// user's source file which has the tests. - main_mod: ?*Package.Module = null, + main_mod: ?*Module = null, /// This is provided so that the API user has a chance to tweak the /// per-module settings of the standard library. /// When this is null, a default configuration of the std lib is created /// based on the settings of root_mod. - std_mod: ?*Package.Module = null, + std_mod: ?*Module = null, root_name: []const u8, sysroot: ?[]const u8 = null, cache_mode: CacheMode, @@ -1763,7 +1763,7 @@ pub fn create(gpa: Allocator, arena: Allocator, io: Io, diag: *CreateDiagnostic, if (compiler_rt_strat == .zcu) { // For objects, this mechanism relies on essentially `_ = @import("compiler-rt");` // injected into the object. - const compiler_rt_mod = Package.Module.create(arena, .{ + const compiler_rt_mod = Module.create(arena, .{ .paths = .{ .root = .zig_lib_root, .root_src_path = "compiler_rt.zig", @@ -1825,7 +1825,7 @@ pub fn create(gpa: Allocator, arena: Allocator, io: Io, diag: *CreateDiagnostic, }; if (ubsan_rt_strat == .zcu) { - const ubsan_rt_mod = Package.Module.create(arena, .{ + const ubsan_rt_mod = Module.create(arena, .{ .paths = .{ .root = .zig_lib_root, .root_src_path = "ubsan_rt.zig", @@ -1866,7 +1866,7 @@ pub fn create(gpa: Allocator, arena: Allocator, io: Io, diag: *CreateDiagnostic, }; if (zigc_strat == .zcu) { - const zigc_mod = Package.Module.create(arena, .{ + const zigc_mod = Module.create(arena, .{ .paths = .{ .root = .zig_lib_root, .root_src_path = "c.zig", @@ -1996,7 +1996,7 @@ pub fn create(gpa: Allocator, arena: Allocator, io: Io, diag: *CreateDiagnostic, .path = try options.dirs.global_cache.join(arena, &.{zir_sub_dir}), }; - const std_mod = options.std_mod orelse Package.Module.create(arena, .{ + const std_mod = options.std_mod orelse Module.create(arena, .{ .paths = .{ .root = try .fromRoot(arena, options.dirs, .zig_lib, "std"), .root_src_path = "std.zig", @@ -4639,7 +4639,7 @@ fn docsCopyFallible(comp: *Compilation) anyerror!void { var buffer: [1024]u8 = undefined; var tar_file_writer = tar_file.writer(io, &buffer); - var seen_table: std.array_hash_map.Auto(*Package.Module, []const u8) = .empty; + var seen_table: std.array_hash_map.Auto(*Module, []const u8) = .empty; defer seen_table.deinit(comp.gpa); try seen_table.put(comp.gpa, zcu.main_mod, comp.root_name); @@ -4666,7 +4666,7 @@ fn docsCopyFallible(comp: *Compilation) anyerror!void { fn docsCopyModule( comp: *Compilation, - module: *Package.Module, + module: *Module, name: []const u8, tar_file_writer: *Io.File.Writer, ) !void { @@ -4746,7 +4746,7 @@ fn workerDocsWasmFallible(comp: *Compilation, prog_node: std.Progress.Node) SubU const optimize_mode = std.lang.OptimizeMode.ReleaseSmall; const output_mode = std.lang.OutputMode.Exe; - const resolved_target: Package.Module.ResolvedTarget = .{ + const resolved_target: Module.ResolvedTarget = .{ .result = std.zig.system.resolveTargetQuery(io, .{ .cpu_arch = .wasm32, .os_tag = .freestanding, @@ -4786,7 +4786,7 @@ fn workerDocsWasmFallible(comp: *Compilation, prog_node: std.Progress.Node) SubU const dirs = comp.dirs.withoutLocalCache(); - const root_mod = Package.Module.create(arena, .{ + const root_mod = Module.create(arena, .{ .paths = .{ .root = try .fromRoot(arena, dirs, .zig_lib, "docs/wasm"), .root_src_path = src_basename, @@ -4803,7 +4803,7 @@ fn workerDocsWasmFallible(comp: *Compilation, prog_node: std.Progress.Node) SubU comp.lockAndSetMiscFailure(.docs_wasm, "sub-compilation of docs_wasm failed: failed to create root module: {t}", .{err}); return error.AlreadyReported; }; - const walk_mod = Package.Module.create(arena, .{ + const walk_mod = Module.create(arena, .{ .paths = .{ .root = try .fromRoot(arena, dirs, .zig_lib, "docs/wasm"), .root_src_path = "Walk.zig", @@ -4888,7 +4888,7 @@ fn workerDocsWasmFallible(comp: *Compilation, prog_node: std.Progress.Node) SubU pub fn obtainCObjectCacheManifest( comp: *const Compilation, - owner_mod: *Package.Module, + owner_mod: *Module, ) Cache.Manifest { var man = comp.cache_parent.obtain(); @@ -4936,7 +4936,7 @@ pub fn translateC( ext: FileExt, source_path: []const u8, translated_basename: []const u8, - owner_mod: *Package.Module, + owner_mod: *Module, prog_node: std.Progress.Node, environ_map: *const std.process.Environ.Map, ) !TranslateCResult { @@ -6092,7 +6092,7 @@ fn addCommonCCArgs( argv: *std.array_list.Managed([]const u8), ext: FileExt, out_dep_path: ?[]const u8, - mod: *Package.Module, + mod: *Module, c_frontend: Config.CFrontend, ) !void { const target = &mod.resolved_target.result; @@ -6446,7 +6446,7 @@ pub fn addCCArgs( argv: *std.array_list.Managed([]const u8), ext: FileExt, out_dep_path: ?[]const u8, - mod: *Package.Module, + mod: *Module, ) !void { const target = &mod.resolved_target.result; @@ -7237,7 +7237,7 @@ fn buildOutputFromZig( return error.AlreadyReported; }; - const root_mod = Package.Module.create(arena, .{ + const root_mod = Module.create(arena, .{ .paths = .{ .root = .zig_lib_root, .root_src_path = src_basename, @@ -7384,7 +7384,7 @@ pub fn build_crt_file( comp.lockAndSetMiscFailure(misc_task_tag, "sub-compilation of {t} failed: failed to resolve compilation config: {t}", .{ misc_task_tag, err }); return error.AlreadyReported; }; - const root_mod = Package.Module.create(arena, .{ + const root_mod = Module.create(arena, .{ .paths = .{ .root = .zig_lib_root, .root_src_path = "", diff --git a/src/Compilation/Config.zig b/src/Compilation/Config.zig index ce180f9ead8c4f545f4e5e8ea2a6ecc3c7b33179..9dd28b3e37b3cfbfa247dde25368b5b59ed530e2 100644 --- a/src/Compilation/Config.zig +++ b/src/Compilation/Config.zig @@ -577,7 +577,7 @@ pub fn resolve(options: Options) ResolveError!Config { } const std = @import("std"); -const Module = @import("../Package.zig").Module; +const Module = @import("../Module.zig"); const Config = @This(); const target_util = @import("../target.zig"); const build_options = @import("build_options"); diff --git a/src/Module.zig b/src/Module.zig index 02c65b09fcb13eb9ead45c4e9ce925d01b627e43..ff821831ef72aead6ea30c27b6f826e74875e507 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -6,10 +6,10 @@ const Allocator = std.mem.Allocator; const Cache = std.Build.Cache; const assert = std.debug.assert; -const target_util = @import("../target.zig"); -const Builtin = @import("../Builtin.zig"); -const Compilation = @import("../Compilation.zig"); -const File = @import("../Zcu.zig").File; +const target_util = @import("target.zig"); +const Builtin = @import("Builtin.zig"); +const Compilation = @import("Compilation.zig"); +const File = @import("Zcu.zig").File; /// The root directory of the module. Only files inside this directory can be imported. root: Compilation.Path, diff --git a/src/Sema.zig b/src/Sema.zig index 2469444831e1037c7e526a33a0f4c2f39b26474a..2c1d69b23e071c3c2bdaff4a19ed9f5ba0684daa 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -25,7 +25,6 @@ const SemaError = Zcu.SemaError; const LazySrcLoc = Zcu.LazySrcLoc; const RangeSet = @import("RangeSet.zig"); const target_util = @import("target.zig"); -const Package = @import("Package.zig"); const crash_report = @import("crash_report.zig"); const build_options = @import("build_options"); const Compilation = @import("Compilation.zig"); @@ -36,6 +35,7 @@ const ComptimeAllocIndex = InternPool.ComptimeAllocIndex; const Cache = std.Build.Cache; const LowerZon = @import("Sema/LowerZon.zig"); const arith = @import("Sema/arith.zig"); +const Module = @import("Module.zig"); pt: Zcu.PerThread, /// Alias to `zcu.gpa`. @@ -839,7 +839,7 @@ pub const Block = struct { return result_index; } - pub fn ownerModule(block: Block) *Package.Module { + pub fn ownerModule(block: Block) *Module { const zcu = block.sema.pt.zcu; return zcu.namespacePtr(block.namespace).fileScope(zcu).mod.?; } diff --git a/src/Zcu.zig b/src/Zcu.zig index 41758eaf3c3b2ae6ef9ce3adfef9ccb734bda5f4..d36c96c07dab3f38df7abfff2a67003529a80201 100644 --- a/src/Zcu.zig +++ b/src/Zcu.zig @@ -25,7 +25,7 @@ const Compilation = @import("Compilation.zig"); const Cache = std.Build.Cache; pub const Value = @import("Value.zig"); pub const Type = @import("Type.zig"); -const Package = @import("Package.zig"); +const Module = @import("Module.zig"); const link = @import("link.zig"); const Air = @import("Air.zig"); const Zir = std.zig.Zir; @@ -64,11 +64,11 @@ comp: *Compilation, llvm_object: ?LlvmObject.Ptr, /// Pointer to externally managed resource. -root_mod: *Package.Module, +root_mod: *Module, /// Normally, `main_mod` and `root_mod` are the same. The exception is `zig test`, in which /// `root_mod` is the test runner, and `main_mod` is the user's source file which has the tests. -main_mod: *Package.Module, -std_mod: *Package.Module, +main_mod: *Module, +std_mod: *Module, sema_prog_node: std.Progress.Node = .none, codegen_prog_node: std.Progress.Node = .none, /// The number of codegen jobs which are pending or in-progress. Whichever thread drops this value @@ -105,11 +105,11 @@ multi_exports: std.array_hash_map.Auto(AnalUnit, extern struct { }) = .{}, /// Key is the digest returned by `Builtin.hash`; value is the corresponding module. -builtin_modules: std.array_hash_map.Auto(Cache.BinDigest, *Package.Module) = .empty, +builtin_modules: std.array_hash_map.Auto(Cache.BinDigest, *Module) = .empty, /// Populated as soon as the `Compilation` is created. Guaranteed to contain all modules, even builtin ones. /// Modules whose root file is not a Zig or ZON file have the value `.none`. -module_roots: std.array_hash_map.Auto(*Package.Module, File.Index.Optional) = .empty, +module_roots: std.array_hash_map.Auto(*Module, File.Index.Optional) = .empty, /// The set of all the Zig source files in the Zig Compilation Unit. Tracked in /// order to iterate over it and check which source files have been modified on @@ -148,7 +148,7 @@ alive_files: std.array_hash_map.Auto(File.Index, File.Reference) = .empty, /// Cleared and recomputed every update, after AstGen and before Sema. multi_module_err: ?struct { file: File.Index, - modules: [2]*Package.Module, + modules: [2]*Module, refs: [2]File.Reference, } = null, @@ -292,7 +292,7 @@ retryable_failures: std.ArrayList(AnalUnit) = .empty, /// These are the modules which we initially queue for analysis in `Compilation.update`. /// `resolveReferences` will use these as the root of its reachability traversal. -analysis_roots_buffer: [5]*Package.Module, +analysis_roots_buffer: [5]*Module, analysis_roots_len: usize = 0, /// This is the cached result of `Zcu.resolveReferences`. It is computed on-demand, and /// reset to `null` when any semantic analysis occurs (since this invalidates the data). @@ -985,7 +985,7 @@ pub const File = struct { /// tell, and invalidate dependencies as needed (see `module_changed`). /// During semantic analysis, this is always non-`null` for alive files (i.e. those which /// have imports targeting them). - mod: ?*Package.Module, + mod: ?*Module, /// Relative to the root directory of `mod`. If `mod == null`, this field is `undefined`. /// This memory is managed externally and must not be directly freed. /// Its lifetime is at least equal to that of this `File`. @@ -1028,13 +1028,13 @@ pub const File = struct { /// A single reference to a file. pub const Reference = union(enum) { - analysis_root: *Package.Module, + analysis_root: *Module, import: struct { importer: Zcu.File.Index, tok: Ast.TokenIndex, /// If the file is imported as the root of a module, this is that module. /// `null` means the file was imported directly by path. - module: ?*Package.Module, + module: ?*Module, }, }; @@ -3709,7 +3709,7 @@ pub const ImportResult = struct { /// If this import was a simple file path, this is `null`; the imported file should exist within /// the importer's module. Otherwise, it's the module which the import resolved to. This module /// could match the module of `cur_file`, since a module can depend on itself. - module: ?*Package.Module, + module: ?*Module, }; /// Prepares `unit` for re-analysis by clearing all of the following state: @@ -4406,7 +4406,7 @@ fn resolveReferencesInner(zcu: *Zcu) Allocator.Error!std.array_hash_map.Auto(Ana return units.move(); } -pub fn analysisRoots(zcu: *Zcu) []*Package.Module { +pub fn analysisRoots(zcu: *Zcu) []*Module { return zcu.analysis_roots_buffer[0..zcu.analysis_roots_len]; } @@ -4820,7 +4820,7 @@ fn explainWhyFileIsInModule( eb: *std.zig.ErrorBundle.Wip, notes_out: *std.ArrayList(std.zig.ErrorBundle.MessageIndex), file: File.Index, - in_module: *Package.Module, + in_module: *Module, ref: File.Reference, ) Allocator.Error!void { const gpa = zcu.gpa; @@ -4866,7 +4866,7 @@ fn explainWhyFileIsInModule( const import_src = try importer_file.errorBundleTokenSrc(import.tok, zcu, eb); const importer_ref = zcu.alive_files.get(import.importer).?; - const importer_root: ?*Package.Module = switch (importer_ref) { + const importer_root: ?*Module = switch (importer_ref) { .analysis_root => |mod| mod, .import => |i| i.module, }; diff --git a/src/Zcu/PerThread.zig b/src/Zcu/PerThread.zig index f9aede4f72b4c0a4e32b06f02ac509ef62d30d09..c6c665655cf1ae7a792fabb44b5433efa6664bef 100644 --- a/src/Zcu/PerThread.zig +++ b/src/Zcu/PerThread.zig @@ -23,7 +23,7 @@ const builtin = @import("builtin"); const dev = @import("../dev.zig"); const InternPool = @import("../InternPool.zig"); const AnalUnit = InternPool.AnalUnit; -const Module = @import("../Package.zig").Module; +const Module = @import("../Module.zig"); const Sema = @import("../Sema.zig"); const target_util = @import("../target.zig"); const tracy = @import("../tracy.zig"); diff --git a/src/codegen/aarch64/Select.zig b/src/codegen/aarch64/Select.zig index c8cfd0aeda8a5a51594d278926e3dd8666e57e83..ba8cde4e9c45bbdca010d1d87eb1e8a2b3ef2f52 100644 --- a/src/codegen/aarch64/Select.zig +++ b/src/codegen/aarch64/Select.zig @@ -7592,7 +7592,7 @@ pub fn layout( is_sysv_var_args: bool, saved_gra_len: u7, saved_vra_len: u7, - mod: *const Package.Module, + mod: *const Module, ) !usize { const zcu = isel.pt.zcu; const ip = &zcu.intern_pool; @@ -12513,7 +12513,7 @@ const assert = std.debug.assert; const codegen = @import("../../codegen.zig"); const Constant = @import("../../Value.zig"); const InternPool = @import("../../InternPool.zig"); -const Package = @import("../../Package.zig"); +const Module = @import("../../Module.zig"); const Register = codegen.aarch64.encoding.Register; const Select = @This(); const std = @import("std"); diff --git a/src/codegen/c.zig b/src/codegen/c.zig index 84744bf3cc55e62603b2f01cff265539979f23f0..b814fe55c16b3c96ab7f6caee7b4e1119ae73257 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -9,7 +9,7 @@ const Writer = std.Io.Writer; const dev = @import("../dev.zig"); const link = @import("../link.zig"); const Zcu = @import("../Zcu.zig"); -const Module = @import("../Package/Module.zig"); +const Module = @import("../Module.zig"); const Compilation = @import("../Compilation.zig"); const Value = @import("../Value.zig"); const Type = @import("../Type.zig"); diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index 6361963ab4d898bcf84a08fed641c7390e476e4a..2e79acc1e3e930b8c437099650329117a61e5428 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -13,7 +13,7 @@ const Compilation = @import("../Compilation.zig"); const dev = @import("../dev.zig"); const InternPool = @import("../InternPool.zig"); const link = @import("../link.zig"); -const Package = @import("../Package.zig"); +const Module = @import("../Module.zig"); const target_util = @import("../target.zig"); const Type = @import("../Type.zig"); const Value = @import("../Value.zig"); @@ -2772,7 +2772,7 @@ pub const Object = struct { fn addCommonFnAttributes( o: *Object, attributes: *Builder.FunctionAttributes.Wip, - owner_mod: *Package.Module, + owner_mod: *Module, omit_frame_pointer: bool, ) Allocator.Error!void { if (!owner_mod.red_zone) { diff --git a/src/codegen/llvm/FuncGen.zig b/src/codegen/llvm/FuncGen.zig index 25572de79a872b0d2f5fa51ef4ca16ca762514e4..bad4b1461b1c01274d481c984a752bb6704d4615 100644 --- a/src/codegen/llvm/FuncGen.zig +++ b/src/codegen/llvm/FuncGen.zig @@ -80,7 +80,7 @@ fn todo(fg: *FuncGen, comptime format: []const u8, args: anytype) TodoError { ); } -fn ownerModule(fg: *const FuncGen) *Package.Module { +fn ownerModule(fg: *const FuncGen) *Module { return fg.object.zcu.navFileScope(fg.nav_index).mod.?; } @@ -7739,7 +7739,7 @@ const mips_c_abi = @import("../mips/abi.zig"); const Zcu = @import("../../Zcu.zig"); const Air = @import("../../Air.zig"); -const Package = @import("../../Package.zig"); +const Module = @import("../../Module.zig"); const InternPool = @import("../../InternPool.zig"); const Value = @import("../../Value.zig"); const Type = @import("../../Type.zig"); diff --git a/src/codegen/riscv64/CodeGen.zig b/src/codegen/riscv64/CodeGen.zig index 08df78513efa32c24a4dab639d2d3f9878689153..4bd30651254a7582d1d49a82562526a9c3e44735 100644 --- a/src/codegen/riscv64/CodeGen.zig +++ b/src/codegen/riscv64/CodeGen.zig @@ -14,7 +14,7 @@ const Type = @import("../../Type.zig"); const Value = @import("../../Value.zig"); const link = @import("../../link.zig"); const Zcu = @import("../../Zcu.zig"); -const Package = @import("../../Package.zig"); +const Module = @import("../../Module.zig"); const InternPool = @import("../../InternPool.zig"); const Compilation = @import("../../Compilation.zig"); const target_util = @import("../../target.zig"); @@ -66,7 +66,7 @@ liveness: Air.Liveness, bin_file: *link.File, gpa: Allocator, -mod: *Package.Module, +mod: *Module, target: *const std.Target, args: []MCValue, ret_mcv: InstTracking, diff --git a/src/codegen/x86_64/CodeGen.zig b/src/codegen/x86_64/CodeGen.zig index 5ff7a45954737fdaf651d1073212ec27fa08ddb5..74fb9b4f87725574506a14178d989a66b5ae5731 100644 --- a/src/codegen/x86_64/CodeGen.zig +++ b/src/codegen/x86_64/CodeGen.zig @@ -14,7 +14,7 @@ const Emit = @import("Emit.zig"); const Lower = @import("Lower.zig"); const Mir = @import("Mir.zig"); const Zcu = @import("../../Zcu.zig"); -const Module = @import("../../Package/Module.zig"); +const Module = @import("../../Module.zig"); const InternPool = @import("../../InternPool.zig"); const Type = @import("../../Type.zig"); const Value = @import("../../Value.zig"); diff --git a/src/libs/freebsd.zig b/src/libs/freebsd.zig index 2270de6d60fd38aa527c9bd78ee21823e2b89554..ecc15e0dab899e21093c047e58a7b02467a29ac6 100644 --- a/src/libs/freebsd.zig +++ b/src/libs/freebsd.zig @@ -12,7 +12,7 @@ const Compilation = @import("../Compilation.zig"); const build_options = @import("build_options"); const trace = @import("../tracy.zig").trace; const Cache = std.Build.Cache; -const Module = @import("../Package/Module.zig"); +const Module = @import("../Module.zig"); const link = @import("../link.zig"); pub const CrtFile = enum { diff --git a/src/libs/glibc.zig b/src/libs/glibc.zig index 9d07149dfc867f68640a73f34e3e9d19656fff26..af80133d3332e33b69334b6c2b3dcc1b3f075979 100644 --- a/src/libs/glibc.zig +++ b/src/libs/glibc.zig @@ -12,7 +12,7 @@ const Compilation = @import("../Compilation.zig"); const build_options = @import("build_options"); const trace = @import("../tracy.zig").trace; const Cache = std.Build.Cache; -const Module = @import("../Package/Module.zig"); +const Module = @import("../Module.zig"); const link = @import("../link.zig"); pub const Lib = struct { diff --git a/src/libs/libcxx.zig b/src/libs/libcxx.zig index 3eb4161235382c9b63dab07edf88c27e74dc1a08..cc91db8333dde6f83f32e7f964742d36e692cc92 100644 --- a/src/libs/libcxx.zig +++ b/src/libs/libcxx.zig @@ -6,7 +6,7 @@ const target_util = @import("../target.zig"); const Compilation = @import("../Compilation.zig"); const build_options = @import("build_options"); const trace = @import("../tracy.zig").trace; -const Module = @import("../Package/Module.zig"); +const Module = @import("../Module.zig"); const libcxxabi_files = [_][]const u8{ "src/cxa_aux_runtime.cpp", diff --git a/src/libs/libtsan.zig b/src/libs/libtsan.zig index 6f83d106455905eb17d0c19adff84b295fb5e8ed..af8830699ca5d240ea379d98cb9382d67fe0d984 100644 --- a/src/libs/libtsan.zig +++ b/src/libs/libtsan.zig @@ -4,7 +4,7 @@ const assert = std.debug.assert; const Compilation = @import("../Compilation.zig"); const build_options = @import("build_options"); const trace = @import("../tracy.zig").trace; -const Module = @import("../Package/Module.zig"); +const Module = @import("../Module.zig"); pub const BuildError = error{ OutOfMemory, diff --git a/src/libs/libunwind.zig b/src/libs/libunwind.zig index e4c1096efd5d37368d485100be96304d77be2846..82ef9c34bc3d76b5cdbf2306ff8faf2526f54cbb 100644 --- a/src/libs/libunwind.zig +++ b/src/libs/libunwind.zig @@ -4,7 +4,7 @@ const assert = std.debug.assert; const target_util = @import("../target.zig"); const Compilation = @import("../Compilation.zig"); -const Module = @import("../Package/Module.zig"); +const Module = @import("../Module.zig"); const build_options = @import("build_options"); const trace = @import("../tracy.zig").trace; diff --git a/src/libs/musl.zig b/src/libs/musl.zig index fcf179894c6d6f0d542f04fb925788c76f82ca1a..e3613d020b203a9dc9858bb8c48d1316a2338509 100644 --- a/src/libs/musl.zig +++ b/src/libs/musl.zig @@ -3,7 +3,7 @@ const Allocator = std.mem.Allocator; const mem = std.mem; const path = std.fs.path; const assert = std.debug.assert; -const Module = @import("../Package/Module.zig"); +const Module = @import("../Module.zig"); const Compilation = @import("../Compilation.zig"); const build_options = @import("build_options"); diff --git a/src/libs/netbsd.zig b/src/libs/netbsd.zig index 15462afd3db224ee6fde38ce6737014a72d89c3c..c3e0a38ffb6cd6cb98cfd51bb0cc74151c627bd4 100644 --- a/src/libs/netbsd.zig +++ b/src/libs/netbsd.zig @@ -12,7 +12,7 @@ const Compilation = @import("../Compilation.zig"); const build_options = @import("build_options"); const trace = @import("../tracy.zig").trace; const Cache = std.Build.Cache; -const Module = @import("../Package/Module.zig"); +const Module = @import("../Module.zig"); const link = @import("../link.zig"); pub const CrtFile = enum { diff --git a/src/libs/openbsd.zig b/src/libs/openbsd.zig index 05d30e53edf9130ea13e32d6f42e40870c00198d..ee50196c8169bcb52f0a1bbd455f4b14c20f93e8 100644 --- a/src/libs/openbsd.zig +++ b/src/libs/openbsd.zig @@ -13,7 +13,7 @@ const Compilation = @import("../Compilation.zig"); const build_options = @import("build_options"); const trace = @import("../tracy.zig").trace; const Cache = std.Build.Cache; -const Module = @import("../Package/Module.zig"); +const Module = @import("../Module.zig"); const link = @import("../link.zig"); pub const CrtFile = enum { diff --git a/src/link.zig b/src/link.zig index 4764e0c291f4c048812f5f30dc94d1f948c9b442..5307868ddf691e8df3f9b1912ddb63649897d0d4 100644 --- a/src/link.zig +++ b/src/link.zig @@ -21,7 +21,6 @@ const Zcu = @import("Zcu.zig"); const InternPool = @import("InternPool.zig"); const Type = @import("Type.zig"); const Value = @import("Value.zig"); -const Package = @import("Package.zig"); const dev = @import("dev.zig"); const target_util = @import("target.zig"); const codegen = @import("codegen.zig"); diff --git a/src/link/C.zig b/src/link/C.zig index 127485171314adc352096f6e13b448b28d12e173..a5862d87eeba5b8833abcc92021e6f1ee74318a1 100644 --- a/src/link/C.zig +++ b/src/link/C.zig @@ -13,7 +13,7 @@ const Path = std.Build.Cache.Path; const build_options = @import("build_options"); const Zcu = @import("../Zcu.zig"); -const Module = @import("../Package/Module.zig"); +const Module = @import("../Module.zig"); const InternPool = @import("../InternPool.zig"); const Alignment = InternPool.Alignment; const Compilation = @import("../Compilation.zig"); diff --git a/src/link/Dwarf.zig b/src/link/Dwarf.zig index 96fb3d10c9191de8a2acaf7acaf799f5b9832fc5..d51c59ed23941283b2de8258db0ad865adf8aa33 100644 --- a/src/link/Dwarf.zig +++ b/src/link/Dwarf.zig @@ -10,7 +10,7 @@ const log = std.log.scoped(.dwarf); const Writer = std.Io.Writer; const InternPool = @import("../InternPool.zig"); -const Module = @import("../Package.zig").Module; +const Module = @import("../Module.zig"); const Type = @import("../Type.zig"); const Value = @import("../Value.zig"); const Zcu = @import("../Zcu.zig"); diff --git a/src/main.zig b/src/main.zig index 9d088946bcfeb147da456cb983953935a1c3c0aa..72d652ee3b8daccbe534f5856d4bdedd98615cd3 100644 --- a/src/main.zig +++ b/src/main.zig @@ -26,7 +26,6 @@ const allocPrint = std.fmt.allocPrint; pub const tracy = @import("tracy.zig"); const Compilation = @import("Compilation.zig"); const link = @import("link.zig"); -const Package = @import("Package.zig"); const build_options = @import("build_options"); const wasi_libc = @import("libs/wasi_libc.zig"); const target_util = @import("target.zig"); @@ -34,9 +33,9 @@ const crash_report = @import("crash_report.zig"); const Zcu = @import("Zcu.zig"); const mingw = @import("libs/mingw.zig"); const dev = @import("dev.zig"); +const Module = @import("Module.zig"); test { - _ = Package; _ = @import("codegen.zig"); } @@ -878,13 +877,13 @@ const CliModule = struct { root_path: []const u8, root_src_path: []const u8, cc_argv: []const []const u8, - inherited: Package.Module.CreateOptions.Inherited, + inherited: Module.CreateOptions.Inherited, target_arch_os_abi: ?[]const u8, target_mcpu: ?[]const u8, dynamic_linker: ?[]const u8, deps: []const Dep, - resolved: ?*Package.Module, + resolved: ?*Module, c_source_files_start: usize, c_source_files_end: usize, @@ -1035,7 +1034,7 @@ fn buildOutputType( // These get set by CLI flags and then snapshotted when a `-M` flag is // encountered. - var mod_opts: Package.Module.CreateOptions.Inherited = .{}; + var mod_opts: Module.CreateOptions.Inherited = .{}; // These get appended to by CLI flags and then slurped when a `-M` flag // is encountered. @@ -3266,7 +3265,7 @@ fn buildOutputType( const root_mod = switch (arg_mode) { .zig_test, .zig_test_obj => root_mod: { const test_mod = if (test_runner_path) |test_runner| test_mod: { - const test_mod = try Package.Module.create(arena, .{ + const test_mod = try Module.create(arena, .{ .paths = .{ .root = try .fromUnresolved(arena, dirs, &.{fs.path.dirname(test_runner) orelse "."}), .root_src_path = fs.path.basename(test_runner), @@ -3279,7 +3278,7 @@ fn buildOutputType( }); test_mod.deps = try main_mod.deps.clone(arena); break :test_mod test_mod; - } else try Package.Module.create(arena, .{ + } else try Module.create(arena, .{ .paths = .{ .root = try .fromRoot(arena, dirs, .zig_lib, "compiler"), .root_src_path = "test_runner.zig", @@ -3973,10 +3972,10 @@ fn createModule( io: Io, create_module: *CreateModule, index: usize, - parent: ?*Package.Module, + parent: ?*Module, color: std.zig.Color, environ_map: *process.Environ.Map, -) Allocator.Error!*Package.Module { +) Allocator.Error!*Module { const cli_mod = &create_module.modules.values()[index]; if (cli_mod.resolved) |m| return m; @@ -4252,7 +4251,7 @@ fn createModule( const root: Compilation.Path = try .fromUnresolved(arena, create_module.dirs, &.{cli_mod.root_path}); - const mod = Package.Module.create(arena, .{ + const mod = Module.create(arena, .{ .paths = .{ .root = root, .root_src_path = cli_mod.root_src_path, @@ -4919,7 +4918,7 @@ fn jitCmdInner( options: JitCmdOptions, ) !void { const target_query: std.Target.Query = .{}; - const resolved_target: Package.Module.ResolvedTarget = .{ + const resolved_target: Module.ResolvedTarget = .{ .result = std.zig.resolveTargetQueryOrFatal(io, target_query), .is_native_os = true, .is_native_abi = true, @@ -4959,7 +4958,7 @@ fn jitCmdInner( // We want to release all the locks before executing the child process, so we make a nice // big block here to ensure the cleanup gets run when we extract out our argv. { - const main_mod_paths: Package.Module.CreateOptions.Paths = .{ + const main_mod_paths: Module.CreateOptions.Paths = .{ .root = try .fromRoot(arena, dirs, .zig_lib, "compiler"), .root_src_path = options.root_src_path, }; @@ -4974,7 +4973,7 @@ fn jitCmdInner( .is_test = false, }); - const root_mod = try Package.Module.create(arena, .{ + const root_mod = try Module.create(arena, .{ .paths = main_mod_paths, .fully_qualified_name = "root", .cc_argv = &.{}, @@ -4988,7 +4987,7 @@ fn jitCmdInner( }); if (options.depend_on_aro) { - const aro_mod = try Package.Module.create(arena, .{ + const aro_mod = try Module.create(arena, .{ .paths = .{ .root = try .fromRoot(arena, dirs, .zig_lib, "compiler/aro"), .root_src_path = "aro.zig", @@ -6023,7 +6022,7 @@ fn handleModArg( mod_name: []const u8, opt_root_src_orig: ?[]const u8, create_module: *CreateModule, - mod_opts: *Package.Module.CreateOptions.Inherited, + mod_opts: *Module.CreateOptions.Inherited, cc_argv: *std.ArrayList([]const u8), target_arch_os_abi: *?[]const u8, target_mcpu: *?[]const u8, -- 2.54.0