Debug: Move Compilation.Config.DebugFormat to std.builtin for bro…

…ader usage
ziglang · Jan 7, 2025 · eef344f · eef344f
1 parent 67afb86
commit eef344f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig
@@ -160,6 +160,14 @@ pub const OptimizeMode = enum {
 /// Deprecated; use OptimizeMode.
 pub const Mode = OptimizeMode;
 
+/// DebugFormat specifies which type of debug information to generate:
+pub const DebugFormat = union(enum) {
+    /// No debug information.
+    strip,
+    dwarf: std.dwarf.Format,
+    code_view,
+};
+
 /// The calling convention of a function defines how arguments and return values are passed, as well
 /// as any other requirements which callers and callees must respect, such as register preservation
 /// and stack alignment.

diff --git a/src/Compilation.zig b/src/Compilation.zig
@@ -883,13 +883,13 @@ pub const cache_helpers = struct {
         addEmitLoc(hh, optional_emit_loc orelse return);
     }
 
-    pub fn addOptionalDebugFormat(hh: *Cache.HashHelper, x: ?Config.DebugFormat) void {
+    pub fn addOptionalDebugFormat(hh: *Cache.HashHelper, x: ?std.builtin.DebugFormat) void {
         hh.add(x != null);
         addDebugFormat(hh, x orelse return);
     }
 
-    pub fn addDebugFormat(hh: *Cache.HashHelper, x: Config.DebugFormat) void {
-        const tag: @typeInfo(Config.DebugFormat).@"union".tag_type.? = x;
+    pub fn addDebugFormat(hh: *Cache.HashHelper, x: std.builtin.DebugFormat) void {
+        const tag: @typeInfo(std.builtin.DebugFormat).@"union".tag_type.? = x;
         hh.add(tag);
         switch (x) {
             .strip, .code_view => {},

diff --git a/src/Compilation/Config.zig b/src/Compilation/Config.zig
@@ -56,7 +56,7 @@ import_memory: bool,
 export_memory: bool,
 shared_memory: bool,
 is_test: bool,
-debug_format: DebugFormat,
+debug_format: std.builtin.DebugFormat,
 root_strip: bool,
 root_error_tracing: bool,
 dll_export_fns: bool,
@@ -67,11 +67,6 @@ pub const CFrontend = enum { clang, aro };
 
 pub const LtoMode = enum { none, full, thin };
 
-pub const DebugFormat = union(enum) {
-    strip,
-    dwarf: std.dwarf.Format,
-    code_view,
-};
 
 pub const Options = struct {
     output_mode: std.builtin.OutputMode,
@@ -109,7 +104,7 @@ pub const Options = struct {
     import_memory: ?bool = null,
     export_memory: ?bool = null,
     shared_memory: ?bool = null,
-    debug_format: ?DebugFormat = null,
+    debug_format: ?std.builtin.DebugFormat = null,
     dll_export_fns: ?bool = null,
     rdynamic: ?bool = null,
     san_cov_trace_pc_guard: bool = false,
@@ -441,7 +436,7 @@ pub fn resolve(options: Options) ResolveError!Config {
         break :b false;
     };
 
-    const debug_format: DebugFormat = b: {
+    const debug_format: std.builtin.DebugFormat = b: {
         if (root_strip and !options.any_non_stripped) break :b .strip;
         if (options.debug_format) |x| break :b x;
         break :b switch (target.ofmt) {