authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-06-09 14:38:27-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-06-10 10:20:59-07:00
log6afdc3cc790a2d587898e268ba3d1d7f38042da9
tree6ec7168b44ac4448e500fb928365f28aa7ff762a
parentc230258d9b53e98d49017588b839de5635ab7640

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.

12 files changed, 18 insertions(+), 68 deletions(-)

src/Compilation.zig+7-19
......@@ -74,9 +74,7 @@ clang_passthrough_mode: bool,
7474clang_preprocessor_mode: ClangPreprocessorMode,
7575/// Whether to print clang argvs to stdout.
7676verbose_cc: bool,
77verbose_tokenize: bool,
78verbose_ast: bool,
79verbose_ir: bool,
77verbose_air: bool,
8078verbose_llvm_ir: bool,
8179verbose_cimport: bool,
8280verbose_llvm_cpu_features: bool,
......@@ -692,9 +690,7 @@ pub const InitOptions = struct {
692690 clang_passthrough_mode: bool = false,
693691 verbose_cc: bool = false,
694692 verbose_link: bool = false,
695 verbose_tokenize: bool = false,
696 verbose_ast: bool = false,
697 verbose_ir: bool = false,
693 verbose_air: bool = false,
698694 verbose_llvm_ir: bool = false,
699695 verbose_cimport: bool = false,
700696 verbose_llvm_cpu_features: bool = false,
......@@ -1361,9 +1357,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
13611357 .clang_passthrough_mode = options.clang_passthrough_mode,
13621358 .clang_preprocessor_mode = options.clang_preprocessor_mode,
13631359 .verbose_cc = options.verbose_cc,
1364 .verbose_tokenize = options.verbose_tokenize,
1365 .verbose_ast = options.verbose_ast,
1366 .verbose_ir = options.verbose_ir,
1360 .verbose_air = options.verbose_air,
13671361 .verbose_llvm_ir = options.verbose_llvm_ir,
13681362 .verbose_cimport = options.verbose_cimport,
13691363 .verbose_llvm_cpu_features = options.verbose_llvm_cpu_features,
......@@ -1968,7 +1962,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor
19681962 log.debug("analyze liveness of {s}", .{decl.name});
19691963 try liveness.analyze(module.gpa, &decl_arena.allocator, func.body);
19701964
1971 if (std.builtin.mode == .Debug and self.verbose_ir) {
1965 if (std.builtin.mode == .Debug and self.verbose_air) {
19721966 func.dump(module.*);
19731967 }
19741968 }
......@@ -3689,9 +3683,7 @@ fn buildOutputFromZig(
36893683 .self_exe_path = comp.self_exe_path,
36903684 .verbose_cc = comp.verbose_cc,
36913685 .verbose_link = comp.bin_file.options.verbose_link,
3692 .verbose_tokenize = comp.verbose_tokenize,
3693 .verbose_ast = comp.verbose_ast,
3694 .verbose_ir = comp.verbose_ir,
3686 .verbose_air = comp.verbose_air,
36953687 .verbose_llvm_ir = comp.verbose_llvm_ir,
36963688 .verbose_cimport = comp.verbose_cimport,
36973689 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
......@@ -3949,9 +3941,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node
39493941 .enable_time_report = comp.time_report,
39503942 .enable_stack_report = comp.stack_report,
39513943 .test_is_evented = comp.test_evented_io,
3952 .verbose_tokenize = comp.verbose_tokenize,
3953 .verbose_ast = comp.verbose_ast,
3954 .verbose_ir = comp.verbose_ir,
3944 .verbose_ir = comp.verbose_air,
39553945 .verbose_llvm_ir = comp.verbose_llvm_ir,
39563946 .verbose_cimport = comp.verbose_cimport,
39573947 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
......@@ -4107,9 +4097,7 @@ pub fn build_crt_file(
41074097 .c_source_files = c_source_files,
41084098 .verbose_cc = comp.verbose_cc,
41094099 .verbose_link = comp.bin_file.options.verbose_link,
4110 .verbose_tokenize = comp.verbose_tokenize,
4111 .verbose_ast = comp.verbose_ast,
4112 .verbose_ir = comp.verbose_ir,
4100 .verbose_air = comp.verbose_air,
41134101 .verbose_llvm_ir = comp.verbose_llvm_ir,
41144102 .verbose_cimport = comp.verbose_cimport,
41154103 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
src/glibc.zig+1-3
......@@ -963,9 +963,7 @@ fn buildSharedLib(
963963 .self_exe_path = comp.self_exe_path,
964964 .verbose_cc = comp.verbose_cc,
965965 .verbose_link = comp.bin_file.options.verbose_link,
966 .verbose_tokenize = comp.verbose_tokenize,
967 .verbose_ast = comp.verbose_ast,
968 .verbose_ir = comp.verbose_ir,
966 .verbose_air = comp.verbose_air,
969967 .verbose_llvm_ir = comp.verbose_llvm_ir,
970968 .verbose_cimport = comp.verbose_cimport,
971969 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
src/libcxx.zig+2-6
......@@ -186,9 +186,7 @@ pub fn buildLibCXX(comp: *Compilation) !void {
186186 .c_source_files = c_source_files.items,
187187 .verbose_cc = comp.verbose_cc,
188188 .verbose_link = comp.bin_file.options.verbose_link,
189 .verbose_tokenize = comp.verbose_tokenize,
190 .verbose_ast = comp.verbose_ast,
191 .verbose_ir = comp.verbose_ir,
189 .verbose_air = comp.verbose_air,
192190 .verbose_llvm_ir = comp.verbose_llvm_ir,
193191 .verbose_cimport = comp.verbose_cimport,
194192 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
......@@ -308,9 +306,7 @@ pub fn buildLibCXXABI(comp: *Compilation) !void {
308306 .c_source_files = &c_source_files,
309307 .verbose_cc = comp.verbose_cc,
310308 .verbose_link = comp.bin_file.options.verbose_link,
311 .verbose_tokenize = comp.verbose_tokenize,
312 .verbose_ast = comp.verbose_ast,
313 .verbose_ir = comp.verbose_ir,
309 .verbose_air = comp.verbose_air,
314310 .verbose_llvm_ir = comp.verbose_llvm_ir,
315311 .verbose_cimport = comp.verbose_cimport,
316312 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
src/libtsan.zig+1-3
......@@ -222,9 +222,7 @@ pub fn buildTsan(comp: *Compilation) !void {
222222 .c_source_files = c_source_files.items,
223223 .verbose_cc = comp.verbose_cc,
224224 .verbose_link = comp.bin_file.options.verbose_link,
225 .verbose_tokenize = comp.verbose_tokenize,
226 .verbose_ast = comp.verbose_ast,
227 .verbose_ir = comp.verbose_ir,
225 .verbose_air = comp.verbose_air,
228226 .verbose_llvm_ir = comp.verbose_llvm_ir,
229227 .verbose_cimport = comp.verbose_cimport,
230228 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
src/libunwind.zig+1-3
......@@ -125,9 +125,7 @@ pub fn buildStaticLib(comp: *Compilation) !void {
125125 .c_source_files = &c_source_files,
126126 .verbose_cc = comp.verbose_cc,
127127 .verbose_link = comp.bin_file.options.verbose_link,
128 .verbose_tokenize = comp.verbose_tokenize,
129 .verbose_ast = comp.verbose_ast,
130 .verbose_ir = comp.verbose_ir,
128 .verbose_air = comp.verbose_air,
131129 .verbose_llvm_ir = comp.verbose_llvm_ir,
132130 .verbose_cimport = comp.verbose_cimport,
133131 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
src/main.zig+5-15
......@@ -407,9 +407,7 @@ const usage_build_generic =
407407 \\ -fstack-report Print stack size diagnostics
408408 \\ --verbose-link Display linker invocations
409409 \\ --verbose-cc Display C compiler invocations
410 \\ --verbose-tokenize Enable compiler debug output for tokenization
411 \\ --verbose-ast Enable compiler debug output for AST parsing
412 \\ --verbose-ir Enable compiler debug output for Zig IR
410 \\ --verbose-air Enable compiler debug output for Zig AIR
413411 \\ --verbose-llvm-ir Enable compiler debug output for LLVM IR
414412 \\ --verbose-cimport Enable compiler debug output for C imports
415413 \\ --verbose-llvm-cpu-features Enable compiler debug output for LLVM CPU features
......@@ -541,9 +539,7 @@ fn buildOutputType(
541539 var watch = false;
542540 var verbose_link = try optionalBoolEnvVar(arena, "ZIG_VERBOSE_LINK");
543541 var verbose_cc = try optionalBoolEnvVar(arena, "ZIG_VERBOSE_CC");
544 var verbose_tokenize = false;
545 var verbose_ast = false;
546 var verbose_ir = false;
542 var verbose_air = false;
547543 var verbose_llvm_ir = false;
548544 var verbose_cimport = false;
549545 var verbose_llvm_cpu_features = false;
......@@ -1031,12 +1027,8 @@ fn buildOutputType(
10311027 verbose_link = true;
10321028 } else if (mem.eql(u8, arg, "--verbose-cc")) {
10331029 verbose_cc = true;
1034 } else if (mem.eql(u8, arg, "--verbose-tokenize")) {
1035 verbose_tokenize = true;
1036 } else if (mem.eql(u8, arg, "--verbose-ast")) {
1037 verbose_ast = true;
1038 } else if (mem.eql(u8, arg, "--verbose-ir")) {
1039 verbose_ir = true;
1030 } else if (mem.eql(u8, arg, "--verbose-air")) {
1031 verbose_air = true;
10401032 } else if (mem.eql(u8, arg, "--verbose-llvm-ir")) {
10411033 verbose_llvm_ir = true;
10421034 } else if (mem.eql(u8, arg, "--verbose-cimport")) {
......@@ -1940,9 +1932,7 @@ fn buildOutputType(
19401932 .libc_installation = if (libc_installation) |*lci| lci else null,
19411933 .verbose_cc = verbose_cc,
19421934 .verbose_link = verbose_link,
1943 .verbose_tokenize = verbose_tokenize,
1944 .verbose_ast = verbose_ast,
1945 .verbose_ir = verbose_ir,
1935 .verbose_air = verbose_air,
19461936 .verbose_llvm_ir = verbose_llvm_ir,
19471937 .verbose_cimport = verbose_cimport,
19481938 .verbose_llvm_cpu_features = verbose_llvm_cpu_features,
src/musl.zig+1-3
......@@ -217,9 +217,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {
217217 .self_exe_path = comp.self_exe_path,
218218 .verbose_cc = comp.verbose_cc,
219219 .verbose_link = comp.bin_file.options.verbose_link,
220 .verbose_tokenize = comp.verbose_tokenize,
221 .verbose_ast = comp.verbose_ast,
222 .verbose_ir = comp.verbose_ir,
220 .verbose_air = comp.verbose_air,
223221 .verbose_llvm_ir = comp.verbose_llvm_ir,
224222 .verbose_cimport = comp.verbose_cimport,
225223 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
src/stage1.zig-2
......@@ -124,8 +124,6 @@ pub const Module = extern struct {
124124 enable_time_report: bool,
125125 enable_stack_report: bool,
126126 test_is_evented: bool,
127 verbose_tokenize: bool,
128 verbose_ast: bool,
129127 verbose_ir: bool,
130128 verbose_llvm_ir: bool,
131129 verbose_cimport: bool,
src/stage1/all_types.hpp-2
......@@ -2121,8 +2121,6 @@ struct CodeGen {
21212121 unsigned pointer_size_bytes;
21222122 bool is_big_endian;
21232123 bool have_err_ret_tracing;
2124 bool verbose_tokenize;
2125 bool verbose_ast;
21262124 bool verbose_ir;
21272125 bool verbose_llvm_ir;
21282126 bool verbose_cimport;
src/stage1/stage1.cpp-2
......@@ -106,8 +106,6 @@ void zig_stage1_build_object(struct ZigStage1 *stage1) {
106106 g->enable_stack_report = stage1->enable_stack_report;
107107 g->test_is_evented = stage1->test_is_evented;
108108
109 g->verbose_tokenize = stage1->verbose_tokenize;
110 g->verbose_ast = stage1->verbose_ast;
111109 g->verbose_ir = stage1->verbose_ir;
112110 g->verbose_llvm_ir = stage1->verbose_llvm_ir;
113111 g->verbose_cimport = stage1->verbose_cimport;
src/stage1/stage1.h-2
......@@ -196,8 +196,6 @@ struct ZigStage1 {
196196 bool enable_time_report;
197197 bool enable_stack_report;
198198 bool test_is_evented;
199 bool verbose_tokenize;
200 bool verbose_ast;
201199 bool verbose_ir;
202200 bool verbose_llvm_ir;
203201 bool verbose_cimport;
src/stage1/zig0.cpp-8
......@@ -250,8 +250,6 @@ int main(int argc, char **argv) {
250250 const char *emit_bin_path = nullptr;
251251 bool strip = false;
252252 const char *out_name = nullptr;
253 bool verbose_tokenize = false;
254 bool verbose_ast = false;
255253 bool verbose_ir = false;
256254 bool verbose_llvm_ir = false;
257255 bool verbose_cimport = false;
......@@ -288,10 +286,6 @@ int main(int argc, char **argv) {
288286 return print_full_usage(arg0, stdout, EXIT_SUCCESS);
289287 } else if (strcmp(arg, "--strip") == 0) {
290288 strip = true;
291 } else if (strcmp(arg, "--verbose-tokenize") == 0) {
292 verbose_tokenize = true;
293 } else if (strcmp(arg, "--verbose-ast") == 0) {
294 verbose_ast = true;
295289 } else if (strcmp(arg, "--verbose-ir") == 0) {
296290 verbose_ir = true;
297291 } else if (strcmp(arg, "--verbose-llvm-ir") == 0) {
......@@ -458,8 +452,6 @@ int main(int argc, char **argv) {
458452 stage1->root_name_ptr = out_name;
459453 stage1->root_name_len = strlen(out_name);
460454 stage1->strip = strip;
461 stage1->verbose_tokenize = verbose_tokenize;
462 stage1->verbose_ast = verbose_ast;
463455 stage1->verbose_ir = verbose_ir;
464456 stage1->verbose_llvm_ir = verbose_llvm_ir;
465457 stage1->verbose_cimport = verbose_cimport;