From 5e63baae8d2dbe4dd523ec9f67d90080686c43ae Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 9 Jun 2021 14:38:27 -0700 Subject: [PATCH] CLI: remove --verbose-ast and --verbose-tokenize closes #9034 These options were listed under the "Debug Options (Zig Compiler Development)" heading. Anything in this section should be considered unstable and can be modified at any time at any developer's discretion. --- src/Compilation.zig | 26 +++++++------------------- src/glibc.zig | 4 +--- src/libcxx.zig | 8 ++------ src/libtsan.zig | 4 +--- src/libunwind.zig | 4 +--- src/main.zig | 20 +++++--------------- src/musl.zig | 4 +--- src/stage1.zig | 2 -- src/stage1/all_types.hpp | 2 -- src/stage1/stage1.cpp | 2 -- src/stage1/stage1.h | 2 -- src/stage1/zig0.cpp | 8 -------- 12 files changed, 18 insertions(+), 68 deletions(-) diff --git a/src/Compilation.zig b/src/Compilation.zig index 5c75caa598..8b9878ddc3 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -74,9 +74,7 @@ clang_passthrough_mode: bool, clang_preprocessor_mode: ClangPreprocessorMode, /// Whether to print clang argvs to stdout. verbose_cc: bool, -verbose_tokenize: bool, -verbose_ast: bool, -verbose_ir: bool, +verbose_air: bool, verbose_llvm_ir: bool, verbose_cimport: bool, verbose_llvm_cpu_features: bool, @@ -698,9 +696,7 @@ pub const InitOptions = struct { clang_passthrough_mode: bool = false, verbose_cc: bool = false, verbose_link: bool = false, - verbose_tokenize: bool = false, - verbose_ast: bool = false, - verbose_ir: bool = false, + verbose_air: bool = false, verbose_llvm_ir: bool = false, verbose_cimport: bool = false, verbose_llvm_cpu_features: bool = false, @@ -1371,9 +1367,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation { .clang_passthrough_mode = options.clang_passthrough_mode, .clang_preprocessor_mode = options.clang_preprocessor_mode, .verbose_cc = options.verbose_cc, - .verbose_tokenize = options.verbose_tokenize, - .verbose_ast = options.verbose_ast, - .verbose_ir = options.verbose_ir, + .verbose_air = options.verbose_air, .verbose_llvm_ir = options.verbose_llvm_ir, .verbose_cimport = options.verbose_cimport, .verbose_llvm_cpu_features = options.verbose_llvm_cpu_features, @@ -1988,7 +1982,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor log.debug("analyze liveness of {s}", .{decl.name}); try liveness.analyze(module.gpa, &decl_arena.allocator, func.body); - if (std.builtin.mode == .Debug and self.verbose_ir) { + if (std.builtin.mode == .Debug and self.verbose_air) { func.dump(module.*); } } @@ -3710,9 +3704,7 @@ fn buildOutputFromZig( .self_exe_path = comp.self_exe_path, .verbose_cc = comp.verbose_cc, .verbose_link = comp.bin_file.options.verbose_link, - .verbose_tokenize = comp.verbose_tokenize, - .verbose_ast = comp.verbose_ast, - .verbose_ir = comp.verbose_ir, + .verbose_air = comp.verbose_air, .verbose_llvm_ir = comp.verbose_llvm_ir, .verbose_cimport = comp.verbose_cimport, .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features, @@ -3970,9 +3962,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node .enable_time_report = comp.time_report, .enable_stack_report = comp.stack_report, .test_is_evented = comp.test_evented_io, - .verbose_tokenize = comp.verbose_tokenize, - .verbose_ast = comp.verbose_ast, - .verbose_ir = comp.verbose_ir, + .verbose_ir = comp.verbose_air, .verbose_llvm_ir = comp.verbose_llvm_ir, .verbose_cimport = comp.verbose_cimport, .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features, @@ -4128,9 +4118,7 @@ pub fn build_crt_file( .c_source_files = c_source_files, .verbose_cc = comp.verbose_cc, .verbose_link = comp.bin_file.options.verbose_link, - .verbose_tokenize = comp.verbose_tokenize, - .verbose_ast = comp.verbose_ast, - .verbose_ir = comp.verbose_ir, + .verbose_air = comp.verbose_air, .verbose_llvm_ir = comp.verbose_llvm_ir, .verbose_cimport = comp.verbose_cimport, .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features, diff --git a/src/glibc.zig b/src/glibc.zig index 04673e639b..30bc021ced 100644 --- a/src/glibc.zig +++ b/src/glibc.zig @@ -963,9 +963,7 @@ fn buildSharedLib( .self_exe_path = comp.self_exe_path, .verbose_cc = comp.verbose_cc, .verbose_link = comp.bin_file.options.verbose_link, - .verbose_tokenize = comp.verbose_tokenize, - .verbose_ast = comp.verbose_ast, - .verbose_ir = comp.verbose_ir, + .verbose_air = comp.verbose_air, .verbose_llvm_ir = comp.verbose_llvm_ir, .verbose_cimport = comp.verbose_cimport, .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features, diff --git a/src/libcxx.zig b/src/libcxx.zig index 742474ef3c..16fad9f498 100644 --- a/src/libcxx.zig +++ b/src/libcxx.zig @@ -186,9 +186,7 @@ pub fn buildLibCXX(comp: *Compilation) !void { .c_source_files = c_source_files.items, .verbose_cc = comp.verbose_cc, .verbose_link = comp.bin_file.options.verbose_link, - .verbose_tokenize = comp.verbose_tokenize, - .verbose_ast = comp.verbose_ast, - .verbose_ir = comp.verbose_ir, + .verbose_air = comp.verbose_air, .verbose_llvm_ir = comp.verbose_llvm_ir, .verbose_cimport = comp.verbose_cimport, .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features, @@ -308,9 +306,7 @@ pub fn buildLibCXXABI(comp: *Compilation) !void { .c_source_files = &c_source_files, .verbose_cc = comp.verbose_cc, .verbose_link = comp.bin_file.options.verbose_link, - .verbose_tokenize = comp.verbose_tokenize, - .verbose_ast = comp.verbose_ast, - .verbose_ir = comp.verbose_ir, + .verbose_air = comp.verbose_air, .verbose_llvm_ir = comp.verbose_llvm_ir, .verbose_cimport = comp.verbose_cimport, .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features, diff --git a/src/libtsan.zig b/src/libtsan.zig index d126d7313a..a4b651d648 100644 --- a/src/libtsan.zig +++ b/src/libtsan.zig @@ -222,9 +222,7 @@ pub fn buildTsan(comp: *Compilation) !void { .c_source_files = c_source_files.items, .verbose_cc = comp.verbose_cc, .verbose_link = comp.bin_file.options.verbose_link, - .verbose_tokenize = comp.verbose_tokenize, - .verbose_ast = comp.verbose_ast, - .verbose_ir = comp.verbose_ir, + .verbose_air = comp.verbose_air, .verbose_llvm_ir = comp.verbose_llvm_ir, .verbose_cimport = comp.verbose_cimport, .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features, diff --git a/src/libunwind.zig b/src/libunwind.zig index d918249544..84800ded5f 100644 --- a/src/libunwind.zig +++ b/src/libunwind.zig @@ -125,9 +125,7 @@ pub fn buildStaticLib(comp: *Compilation) !void { .c_source_files = &c_source_files, .verbose_cc = comp.verbose_cc, .verbose_link = comp.bin_file.options.verbose_link, - .verbose_tokenize = comp.verbose_tokenize, - .verbose_ast = comp.verbose_ast, - .verbose_ir = comp.verbose_ir, + .verbose_air = comp.verbose_air, .verbose_llvm_ir = comp.verbose_llvm_ir, .verbose_cimport = comp.verbose_cimport, .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features, diff --git a/src/main.zig b/src/main.zig index 149a94dbd0..fd02ba9480 100644 --- a/src/main.zig +++ b/src/main.zig @@ -408,9 +408,7 @@ const usage_build_generic = \\ -fstack-report Print stack size diagnostics \\ --verbose-link Display linker invocations \\ --verbose-cc Display C compiler invocations - \\ --verbose-tokenize Enable compiler debug output for tokenization - \\ --verbose-ast Enable compiler debug output for AST parsing - \\ --verbose-ir Enable compiler debug output for Zig IR + \\ --verbose-air Enable compiler debug output for Zig AIR \\ --verbose-llvm-ir Enable compiler debug output for LLVM IR \\ --verbose-cimport Enable compiler debug output for C imports \\ --verbose-llvm-cpu-features Enable compiler debug output for LLVM CPU features @@ -542,9 +540,7 @@ fn buildOutputType( var watch = false; var verbose_link = try optionalBoolEnvVar(arena, "ZIG_VERBOSE_LINK"); var verbose_cc = try optionalBoolEnvVar(arena, "ZIG_VERBOSE_CC"); - var verbose_tokenize = false; - var verbose_ast = false; - var verbose_ir = false; + var verbose_air = false; var verbose_llvm_ir = false; var verbose_cimport = false; var verbose_llvm_cpu_features = false; @@ -1036,12 +1032,8 @@ fn buildOutputType( verbose_link = true; } else if (mem.eql(u8, arg, "--verbose-cc")) { verbose_cc = true; - } else if (mem.eql(u8, arg, "--verbose-tokenize")) { - verbose_tokenize = true; - } else if (mem.eql(u8, arg, "--verbose-ast")) { - verbose_ast = true; - } else if (mem.eql(u8, arg, "--verbose-ir")) { - verbose_ir = true; + } else if (mem.eql(u8, arg, "--verbose-air")) { + verbose_air = true; } else if (mem.eql(u8, arg, "--verbose-llvm-ir")) { verbose_llvm_ir = true; } else if (mem.eql(u8, arg, "--verbose-cimport")) { @@ -1960,9 +1952,7 @@ fn buildOutputType( .libc_installation = if (libc_installation) |*lci| lci else null, .verbose_cc = verbose_cc, .verbose_link = verbose_link, - .verbose_tokenize = verbose_tokenize, - .verbose_ast = verbose_ast, - .verbose_ir = verbose_ir, + .verbose_air = verbose_air, .verbose_llvm_ir = verbose_llvm_ir, .verbose_cimport = verbose_cimport, .verbose_llvm_cpu_features = verbose_llvm_cpu_features, diff --git a/src/musl.zig b/src/musl.zig index 4246313eb5..4f641a4c7c 100644 --- a/src/musl.zig +++ b/src/musl.zig @@ -217,9 +217,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void { .self_exe_path = comp.self_exe_path, .verbose_cc = comp.verbose_cc, .verbose_link = comp.bin_file.options.verbose_link, - .verbose_tokenize = comp.verbose_tokenize, - .verbose_ast = comp.verbose_ast, - .verbose_ir = comp.verbose_ir, + .verbose_air = comp.verbose_air, .verbose_llvm_ir = comp.verbose_llvm_ir, .verbose_cimport = comp.verbose_cimport, .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features, diff --git a/src/stage1.zig b/src/stage1.zig index f7cc6e2890..2a304816b6 100644 --- a/src/stage1.zig +++ b/src/stage1.zig @@ -124,8 +124,6 @@ pub const Module = extern struct { enable_time_report: bool, enable_stack_report: bool, test_is_evented: bool, - verbose_tokenize: bool, - verbose_ast: bool, verbose_ir: bool, verbose_llvm_ir: bool, verbose_cimport: bool, diff --git a/src/stage1/all_types.hpp b/src/stage1/all_types.hpp index 27a609a1e4..b07275eca7 100644 --- a/src/stage1/all_types.hpp +++ b/src/stage1/all_types.hpp @@ -2121,8 +2121,6 @@ struct CodeGen { unsigned pointer_size_bytes; bool is_big_endian; bool have_err_ret_tracing; - bool verbose_tokenize; - bool verbose_ast; bool verbose_ir; bool verbose_llvm_ir; bool verbose_cimport; diff --git a/src/stage1/stage1.cpp b/src/stage1/stage1.cpp index 39e3bad1a5..5193c4b436 100644 --- a/src/stage1/stage1.cpp +++ b/src/stage1/stage1.cpp @@ -106,8 +106,6 @@ void zig_stage1_build_object(struct ZigStage1 *stage1) { g->enable_stack_report = stage1->enable_stack_report; g->test_is_evented = stage1->test_is_evented; - g->verbose_tokenize = stage1->verbose_tokenize; - g->verbose_ast = stage1->verbose_ast; g->verbose_ir = stage1->verbose_ir; g->verbose_llvm_ir = stage1->verbose_llvm_ir; g->verbose_cimport = stage1->verbose_cimport; diff --git a/src/stage1/stage1.h b/src/stage1/stage1.h index 6413914f6e..c0b04b80cc 100644 --- a/src/stage1/stage1.h +++ b/src/stage1/stage1.h @@ -196,8 +196,6 @@ struct ZigStage1 { bool enable_time_report; bool enable_stack_report; bool test_is_evented; - bool verbose_tokenize; - bool verbose_ast; bool verbose_ir; bool verbose_llvm_ir; bool verbose_cimport; diff --git a/src/stage1/zig0.cpp b/src/stage1/zig0.cpp index e16f79455a..642fb56503 100644 --- a/src/stage1/zig0.cpp +++ b/src/stage1/zig0.cpp @@ -250,8 +250,6 @@ int main(int argc, char **argv) { const char *emit_bin_path = nullptr; bool strip = false; const char *out_name = nullptr; - bool verbose_tokenize = false; - bool verbose_ast = false; bool verbose_ir = false; bool verbose_llvm_ir = false; bool verbose_cimport = false; @@ -288,10 +286,6 @@ int main(int argc, char **argv) { return print_full_usage(arg0, stdout, EXIT_SUCCESS); } else if (strcmp(arg, "--strip") == 0) { strip = true; - } else if (strcmp(arg, "--verbose-tokenize") == 0) { - verbose_tokenize = true; - } else if (strcmp(arg, "--verbose-ast") == 0) { - verbose_ast = true; } else if (strcmp(arg, "--verbose-ir") == 0) { verbose_ir = true; } else if (strcmp(arg, "--verbose-llvm-ir") == 0) { @@ -458,8 +452,6 @@ int main(int argc, char **argv) { stage1->root_name_ptr = out_name; stage1->root_name_len = strlen(out_name); stage1->strip = strip; - stage1->verbose_tokenize = verbose_tokenize; - stage1->verbose_ast = verbose_ast; stage1->verbose_ir = verbose_ir; stage1->verbose_llvm_ir = verbose_llvm_ir; stage1->verbose_cimport = verbose_cimport;