From 7b37bc771b9a1ed38b06358269bf6a716a38de60 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 26 Feb 2024 20:58:10 -0700
Subject: [PATCH] move Zir to std.zig.Zir

Part of an effort to ship more of the compiler in source form.
---
 CMakeLists.txt               | 2 +-
 lib/std/zig.zig              | 1 +
 {src => lib/std/zig}/Zir.zig | 0
 src/AstGen.zig               | 2 +-
 src/Autodoc.zig              | 2 +-
 src/Compilation.zig          | 2 +-
 src/InternPool.zig           | 2 +-
 src/Module.zig               | 2 +-
 src/Sema.zig                 | 2 +-
 src/codegen.zig              | 2 +-
 src/codegen/spirv.zig        | 1 -
 src/crash_report.zig         | 2 +-
 src/main.zig                 | 6 +++---
 src/print_zir.zig            | 2 +-
 src/reduce.zig               | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)
 rename {src => lib/std/zig}/Zir.zig (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c06d247151f84ce9fdc9c962b783413b9a6e669..7a62cbe9c073e30e006cdceb950007c903fc4424 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -515,6 +515,7 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/lib/std/zig/system/NativePaths.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig/system/x86.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig/tokenizer.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/zig/Zir.zig"
     "${CMAKE_SOURCE_DIR}/src/Air.zig"
     "${CMAKE_SOURCE_DIR}/src/AstGen.zig"
     "${CMAKE_SOURCE_DIR}/src/Compilation.zig"
@@ -527,7 +528,6 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/src/Sema.zig"
     "${CMAKE_SOURCE_DIR}/src/TypedValue.zig"
     "${CMAKE_SOURCE_DIR}/src/Value.zig"
-    "${CMAKE_SOURCE_DIR}/src/Zir.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/aarch64/CodeGen.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/aarch64/Emit.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/aarch64/Mir.zig"
diff --git a/lib/std/zig.zig b/lib/std/zig.zig
index f8782d5c9bce0b980fbc090e99c4cace241cfab7..38cad68c211b5ed35d132a938f7522b776b09905 100644
--- a/lib/std/zig.zig
+++ b/lib/std/zig.zig
@@ -12,6 +12,7 @@ pub const string_literal = @import("zig/string_literal.zig");
 pub const number_literal = @import("zig/number_literal.zig");
 pub const primitives = @import("zig/primitives.zig");
 pub const Ast = @import("zig/Ast.zig");
+pub const Zir = @import("zig/Zir.zig");
 pub const system = @import("zig/system.zig");
 /// Deprecated: use `std.Target.Query`.
 pub const CrossTarget = std.Target.Query;
diff --git a/src/Zir.zig b/lib/std/zig/Zir.zig
similarity index 100%
rename from src/Zir.zig
rename to lib/std/zig/Zir.zig
diff --git a/src/AstGen.zig b/src/AstGen.zig
index 375dafe8801d3db76a5cafb4487a30b3dc4c68a5..20b1077420ffab70d2ba8f4e8c4083204bc97e36 100644
--- a/src/AstGen.zig
+++ b/src/AstGen.zig
@@ -12,7 +12,7 @@ const StringIndexContext = std.hash_map.StringIndexContext;
 
 const isPrimitive = std.zig.primitives.isPrimitive;
 
-const Zir = @import("Zir.zig");
+const Zir = std.zig.Zir;
 const BuiltinFn = std.zig.BuiltinFn;
 const AstRlAnnotate = std.zig.AstRlAnnotate;
 
diff --git a/src/Autodoc.zig b/src/Autodoc.zig
index 6ede3637f8e9b30cdd0db5846dbd2e9d361ed196..f321fadbb79ad89220626b5ea9466ecc286ace00 100644
--- a/src/Autodoc.zig
+++ b/src/Autodoc.zig
@@ -9,7 +9,7 @@ const File = Zcu.File;
 const Module = @import("Package.zig").Module;
 const Tokenizer = std.zig.Tokenizer;
 const InternPool = @import("InternPool.zig");
-const Zir = @import("Zir.zig");
+const Zir = std.zig.Zir;
 const Ref = Zir.Inst.Ref;
 const log = std.log.scoped(.autodoc);
 const renderer = @import("autodoc/render_source.zig");
diff --git a/src/Compilation.zig b/src/Compilation.zig
index 5fa93fa677cb41aa4329d6c8ede80e7301cdb0f9..d4d28268807fb52643f2d4e04a909b00f6e2f674 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -35,7 +35,7 @@ const InternPool = @import("InternPool.zig");
 const Cache = std.Build.Cache;
 const c_codegen = @import("codegen/c.zig");
 const libtsan = @import("libtsan.zig");
-const Zir = @import("Zir.zig");
+const Zir = std.zig.Zir;
 const Autodoc = @import("Autodoc.zig");
 const resinator = @import("resinator.zig");
 const Builtin = @import("Builtin.zig");
diff --git a/src/InternPool.zig b/src/InternPool.zig
index 70c332e9ac0825b201d0d07273a6cd19327fc4ca..5ff179cb74415e563a476d504690e5ba3f7824b8 100644
--- a/src/InternPool.zig
+++ b/src/InternPool.zig
@@ -338,7 +338,7 @@ const Hash = std.hash.Wyhash;
 const InternPool = @This();
 const Module = @import("Module.zig");
 const Zcu = Module;
-const Zir = @import("Zir.zig");
+const Zir = std.zig.Zir;
 
 const KeyAdapter = struct {
     intern_pool: *const InternPool,
diff --git a/src/Module.zig b/src/Module.zig
index aef54be7007fc2a34cce673d85485fbafdc82951..6316979f4cf695d15a791bec9b1ced20571025b3 100644
--- a/src/Module.zig
+++ b/src/Module.zig
@@ -26,7 +26,7 @@ const TypedValue = @import("TypedValue.zig");
 const Package = @import("Package.zig");
 const link = @import("link.zig");
 const Air = @import("Air.zig");
-const Zir = @import("Zir.zig");
+const Zir = std.zig.Zir;
 const trace = @import("tracy.zig").trace;
 const AstGen = @import("AstGen.zig");
 const Sema = @import("Sema.zig");
diff --git a/src/Sema.zig b/src/Sema.zig
index 5c9d7cbb5c1cc4150fac97aa002e879b6ba9cb12..8976848befe6a3e0bfb3cb34f323fa7ed8aedc35 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -148,7 +148,7 @@ const Value = @import("Value.zig");
 const Type = @import("type.zig").Type;
 const TypedValue = @import("TypedValue.zig");
 const Air = @import("Air.zig");
-const Zir = @import("Zir.zig");
+const Zir = std.zig.Zir;
 const Module = @import("Module.zig");
 const trace = @import("tracy.zig").trace;
 const Namespace = Module.Namespace;
diff --git a/src/codegen.zig b/src/codegen.zig
index 7bcba80065446194433c5ae5d54f89dcd1ff41fd..4856eff7d81e50153aef63b3cd44442d8341c657 100644
--- a/src/codegen.zig
+++ b/src/codegen.zig
@@ -21,7 +21,7 @@ const Target = std.Target;
 const Type = @import("type.zig").Type;
 const TypedValue = @import("TypedValue.zig");
 const Value = @import("Value.zig");
-const Zir = @import("Zir.zig");
+const Zir = std.zig.Zir;
 const Alignment = InternPool.Alignment;
 
 pub const Result = union(enum) {
diff --git a/src/codegen/spirv.zig b/src/codegen/spirv.zig
index 7641da4a94226c5b5e1d2f0b099c6b6574782974..fb8d1e1e8ef6d15e6a6d258c392dbb1b44ec17c0 100644
--- a/src/codegen/spirv.zig
+++ b/src/codegen/spirv.zig
@@ -10,7 +10,6 @@ const Type = @import("../type.zig").Type;
 const Value = @import("../Value.zig");
 const LazySrcLoc = std.zig.LazySrcLoc;
 const Air = @import("../Air.zig");
-const Zir = @import("../Zir.zig");
 const Liveness = @import("../Liveness.zig");
 const InternPool = @import("../InternPool.zig");
 
diff --git a/src/crash_report.zig b/src/crash_report.zig
index cedce84d94bbd90e2de137c3bd07328c3dc91df8..0c2354af4e3ddeeec24ffa5ea169f9762c3b9e92 100644
--- a/src/crash_report.zig
+++ b/src/crash_report.zig
@@ -8,7 +8,7 @@ const native_os = builtin.os.tag;
 
 const Module = @import("Module.zig");
 const Sema = @import("Sema.zig");
-const Zir = @import("Zir.zig");
+const Zir = std.zig.Zir;
 const Decl = Module.Decl;
 
 pub const is_enabled = builtin.mode == .Debug;
diff --git a/src/main.zig b/src/main.zig
index bb8b25c60e41afb2a675bb3149ded83df1729409..9522734dea86b1d543da1be23a9a1e3e48793395 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -6655,7 +6655,7 @@ fn cmdAstCheck(
     arena: Allocator,
     args: []const []const u8,
 ) !void {
-    const Zir = @import("Zir.zig");
+    const Zir = std.zig.Zir;
 
     var color: Color = .auto;
     var want_output_text = false;
@@ -6817,7 +6817,7 @@ fn cmdDumpZir(
     args: []const []const u8,
 ) !void {
     _ = arena;
-    const Zir = @import("Zir.zig");
+    const Zir = std.zig.Zir;
 
     const cache_file = args[0];
 
@@ -6877,7 +6877,7 @@ fn cmdChangelist(
     args: []const []const u8,
 ) !void {
     const color: Color = .auto;
-    const Zir = @import("Zir.zig");
+    const Zir = std.zig.Zir;
 
     const old_source_file = args[0];
     const new_source_file = args[1];
diff --git a/src/print_zir.zig b/src/print_zir.zig
index b4c3a7ce24d303deda2e0bd5ac8bda0617890d2f..42c2576ac556823e69c0767818d5d011fffc74c2 100644
--- a/src/print_zir.zig
+++ b/src/print_zir.zig
@@ -5,7 +5,7 @@ const assert = std.debug.assert;
 const Ast = std.zig.Ast;
 const InternPool = @import("InternPool.zig");
 
-const Zir = @import("Zir.zig");
+const Zir = std.zig.Zir;
 const Module = @import("Module.zig");
 const LazySrcLoc = std.zig.LazySrcLoc;
 
diff --git a/src/reduce.zig b/src/reduce.zig
index 027557bea51f32a6e4449a50f7a8e22bdf3f6234..35456fe7c34d5e5a15060b38b5cd118324f1bf56 100644
--- a/src/reduce.zig
+++ b/src/reduce.zig
@@ -6,7 +6,7 @@ const fatal = @import("./main.zig").fatal;
 const Ast = std.zig.Ast;
 const Walk = @import("reduce/Walk.zig");
 const AstGen = @import("AstGen.zig");
-const Zir = @import("Zir.zig");
+const Zir = std.zig.Zir;
 
 const usage =
     \\zig reduce [options] ./checker root_source_file.zig [-- [argv]]
-- 
2.54.0