From 6afdc3cc790a2d587898e268ba3d1d7f38042da9 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 4c015cb58fbade0650f0d7dc43f3ff92493ac2c5..7654fc085c2dc72d32a2f49a4c9b5050dc0f4260 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, @@ -692,9 +690,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, @@ -1361,9 +1357,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, @@ -1968,7 +1962,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.*); } } @@ -3689,9 +3683,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, @@ -3949,9 +3941,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, @@ -4107,9 +4097,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 04673e639bc3114d4104f68957cd1db3ca2cbbc5..30bc021cedf72b2dade91ac975417809b235a947 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 742474ef3c32c2491d037ee6ba7115cffe5b7c7d..16fad9f498aa16dac73158c5ae23a10db719442f 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 d126d7313ab1e400dd3aba40cf89ba6e32007883..a4b651d648711d9645dcf680f3d6f933b33e5584 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 d918249544861e5d2594768bbc399c79ea45a004..84800ded5f43d0cab93a9a6893f06b4e94c4310d 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 9245f5fd8a09d6ff286a2de307f7d2808a17d6fc..d73f29964deb60697a519e4401d48815f66f5c54 100644 --- a/src/main.zig +++ b/src/main.zig @@ -407,9 +407,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 @@ -541,9 +539,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; @@ -1031,12 +1027,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")) { @@ -1940,9 +1932,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 4246313eb50ff8d212d27eaaca0de1596b7b343e..4f641a4c7c2c6e68b8b047c7661b361bea2e0277 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 f7cc6e2890338c847995c3add243e6fb0a333373..2a304816b6b1b49e2f3407cadf7e8ffcf7d52c35 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 27a609a1e44c01adff37a688bab2164599ceff9a..b07275eca7ff36a048c8dded0954af00aee67b61 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 39e3bad1a58233cc445e1f18c43b2c3d91e9c685..5193c4b436e37b1e44fdebf02dfe91deb5d0619b 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 6413914f6edb1f27013b1b167da0b9122aa0ae85..c0b04b80cc13fcc299ff0a54bfbbb64cee7602ea 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 e16f79455a44d824fe95f1e9d92ef8a9e4b0825b..642fb56503bd10e8bbabd471f526406055d24bde 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; -- 2.54.0