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-09 14:38:27-07:00
log5e63baae8d2dbe4dd523ec9f67d90080686c43ae
tree9d39ba11aff8f74b9ca2c610b05bd91eb311782a
parentd128ec39df4c0a701523d7d7161df3808a6939d2

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,...@@ -74,9 +74,7 @@ clang_passthrough_mode: bool,
74clang_preprocessor_mode: ClangPreprocessorMode,74clang_preprocessor_mode: ClangPreprocessorMode,
75/// Whether to print clang argvs to stdout.75/// Whether to print clang argvs to stdout.
76verbose_cc: bool,76verbose_cc: bool,
77verbose_tokenize: bool,77verbose_air: bool,
78verbose_ast: bool,
79verbose_ir: bool,
80verbose_llvm_ir: bool,78verbose_llvm_ir: bool,
81verbose_cimport: bool,79verbose_cimport: bool,
82verbose_llvm_cpu_features: bool,80verbose_llvm_cpu_features: bool,
...@@ -698,9 +696,7 @@ pub const InitOptions = struct {...@@ -698,9 +696,7 @@ pub const InitOptions = struct {
698 clang_passthrough_mode: bool = false,696 clang_passthrough_mode: bool = false,
699 verbose_cc: bool = false,697 verbose_cc: bool = false,
700 verbose_link: bool = false,698 verbose_link: bool = false,
701 verbose_tokenize: bool = false,699 verbose_air: bool = false,
702 verbose_ast: bool = false,
703 verbose_ir: bool = false,
704 verbose_llvm_ir: bool = false,700 verbose_llvm_ir: bool = false,
705 verbose_cimport: bool = false,701 verbose_cimport: bool = false,
706 verbose_llvm_cpu_features: bool = false,702 verbose_llvm_cpu_features: bool = false,
...@@ -1371,9 +1367,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {...@@ -1371,9 +1367,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
1371 .clang_passthrough_mode = options.clang_passthrough_mode,1367 .clang_passthrough_mode = options.clang_passthrough_mode,
1372 .clang_preprocessor_mode = options.clang_preprocessor_mode,1368 .clang_preprocessor_mode = options.clang_preprocessor_mode,
1373 .verbose_cc = options.verbose_cc,1369 .verbose_cc = options.verbose_cc,
1374 .verbose_tokenize = options.verbose_tokenize,1370 .verbose_air = options.verbose_air,
1375 .verbose_ast = options.verbose_ast,
1376 .verbose_ir = options.verbose_ir,
1377 .verbose_llvm_ir = options.verbose_llvm_ir,1371 .verbose_llvm_ir = options.verbose_llvm_ir,
1378 .verbose_cimport = options.verbose_cimport,1372 .verbose_cimport = options.verbose_cimport,
1379 .verbose_llvm_cpu_features = options.verbose_llvm_cpu_features,1373 .verbose_llvm_cpu_features = options.verbose_llvm_cpu_features,
...@@ -1988,7 +1982,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor...@@ -1988,7 +1982,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor
1988 log.debug("analyze liveness of {s}", .{decl.name});1982 log.debug("analyze liveness of {s}", .{decl.name});
1989 try liveness.analyze(module.gpa, &decl_arena.allocator, func.body);1983 try liveness.analyze(module.gpa, &decl_arena.allocator, func.body);
19901984
1991 if (std.builtin.mode == .Debug and self.verbose_ir) {1985 if (std.builtin.mode == .Debug and self.verbose_air) {
1992 func.dump(module.*);1986 func.dump(module.*);
1993 }1987 }
1994 }1988 }
...@@ -3710,9 +3704,7 @@ fn buildOutputFromZig(...@@ -3710,9 +3704,7 @@ fn buildOutputFromZig(
3710 .self_exe_path = comp.self_exe_path,3704 .self_exe_path = comp.self_exe_path,
3711 .verbose_cc = comp.verbose_cc,3705 .verbose_cc = comp.verbose_cc,
3712 .verbose_link = comp.bin_file.options.verbose_link,3706 .verbose_link = comp.bin_file.options.verbose_link,
3713 .verbose_tokenize = comp.verbose_tokenize,3707 .verbose_air = comp.verbose_air,
3714 .verbose_ast = comp.verbose_ast,
3715 .verbose_ir = comp.verbose_ir,
3716 .verbose_llvm_ir = comp.verbose_llvm_ir,3708 .verbose_llvm_ir = comp.verbose_llvm_ir,
3717 .verbose_cimport = comp.verbose_cimport,3709 .verbose_cimport = comp.verbose_cimport,
3718 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,3710 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
...@@ -3970,9 +3962,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node...@@ -3970,9 +3962,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node
3970 .enable_time_report = comp.time_report,3962 .enable_time_report = comp.time_report,
3971 .enable_stack_report = comp.stack_report,3963 .enable_stack_report = comp.stack_report,
3972 .test_is_evented = comp.test_evented_io,3964 .test_is_evented = comp.test_evented_io,
3973 .verbose_tokenize = comp.verbose_tokenize,3965 .verbose_ir = comp.verbose_air,
3974 .verbose_ast = comp.verbose_ast,
3975 .verbose_ir = comp.verbose_ir,
3976 .verbose_llvm_ir = comp.verbose_llvm_ir,3966 .verbose_llvm_ir = comp.verbose_llvm_ir,
3977 .verbose_cimport = comp.verbose_cimport,3967 .verbose_cimport = comp.verbose_cimport,
3978 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,3968 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
...@@ -4128,9 +4118,7 @@ pub fn build_crt_file(...@@ -4128,9 +4118,7 @@ pub fn build_crt_file(
4128 .c_source_files = c_source_files,4118 .c_source_files = c_source_files,
4129 .verbose_cc = comp.verbose_cc,4119 .verbose_cc = comp.verbose_cc,
4130 .verbose_link = comp.bin_file.options.verbose_link,4120 .verbose_link = comp.bin_file.options.verbose_link,
4131 .verbose_tokenize = comp.verbose_tokenize,4121 .verbose_air = comp.verbose_air,
4132 .verbose_ast = comp.verbose_ast,
4133 .verbose_ir = comp.verbose_ir,
4134 .verbose_llvm_ir = comp.verbose_llvm_ir,4122 .verbose_llvm_ir = comp.verbose_llvm_ir,
4135 .verbose_cimport = comp.verbose_cimport,4123 .verbose_cimport = comp.verbose_cimport,
4136 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,4124 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
src/glibc.zig+1-3
...@@ -963,9 +963,7 @@ fn buildSharedLib(...@@ -963,9 +963,7 @@ fn buildSharedLib(
963 .self_exe_path = comp.self_exe_path,963 .self_exe_path = comp.self_exe_path,
964 .verbose_cc = comp.verbose_cc,964 .verbose_cc = comp.verbose_cc,
965 .verbose_link = comp.bin_file.options.verbose_link,965 .verbose_link = comp.bin_file.options.verbose_link,
966 .verbose_tokenize = comp.verbose_tokenize,966 .verbose_air = comp.verbose_air,
967 .verbose_ast = comp.verbose_ast,
968 .verbose_ir = comp.verbose_ir,
969 .verbose_llvm_ir = comp.verbose_llvm_ir,967 .verbose_llvm_ir = comp.verbose_llvm_ir,
970 .verbose_cimport = comp.verbose_cimport,968 .verbose_cimport = comp.verbose_cimport,
971 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,969 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
src/libcxx.zig+2-6
...@@ -186,9 +186,7 @@ pub fn buildLibCXX(comp: *Compilation) !void {...@@ -186,9 +186,7 @@ pub fn buildLibCXX(comp: *Compilation) !void {
186 .c_source_files = c_source_files.items,186 .c_source_files = c_source_files.items,
187 .verbose_cc = comp.verbose_cc,187 .verbose_cc = comp.verbose_cc,
188 .verbose_link = comp.bin_file.options.verbose_link,188 .verbose_link = comp.bin_file.options.verbose_link,
189 .verbose_tokenize = comp.verbose_tokenize,189 .verbose_air = comp.verbose_air,
190 .verbose_ast = comp.verbose_ast,
191 .verbose_ir = comp.verbose_ir,
192 .verbose_llvm_ir = comp.verbose_llvm_ir,190 .verbose_llvm_ir = comp.verbose_llvm_ir,
193 .verbose_cimport = comp.verbose_cimport,191 .verbose_cimport = comp.verbose_cimport,
194 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,192 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
...@@ -308,9 +306,7 @@ pub fn buildLibCXXABI(comp: *Compilation) !void {...@@ -308,9 +306,7 @@ pub fn buildLibCXXABI(comp: *Compilation) !void {
308 .c_source_files = &c_source_files,306 .c_source_files = &c_source_files,
309 .verbose_cc = comp.verbose_cc,307 .verbose_cc = comp.verbose_cc,
310 .verbose_link = comp.bin_file.options.verbose_link,308 .verbose_link = comp.bin_file.options.verbose_link,
311 .verbose_tokenize = comp.verbose_tokenize,309 .verbose_air = comp.verbose_air,
312 .verbose_ast = comp.verbose_ast,
313 .verbose_ir = comp.verbose_ir,
314 .verbose_llvm_ir = comp.verbose_llvm_ir,310 .verbose_llvm_ir = comp.verbose_llvm_ir,
315 .verbose_cimport = comp.verbose_cimport,311 .verbose_cimport = comp.verbose_cimport,
316 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,312 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
src/libtsan.zig+1-3
...@@ -222,9 +222,7 @@ pub fn buildTsan(comp: *Compilation) !void {...@@ -222,9 +222,7 @@ pub fn buildTsan(comp: *Compilation) !void {
222 .c_source_files = c_source_files.items,222 .c_source_files = c_source_files.items,
223 .verbose_cc = comp.verbose_cc,223 .verbose_cc = comp.verbose_cc,
224 .verbose_link = comp.bin_file.options.verbose_link,224 .verbose_link = comp.bin_file.options.verbose_link,
225 .verbose_tokenize = comp.verbose_tokenize,225 .verbose_air = comp.verbose_air,
226 .verbose_ast = comp.verbose_ast,
227 .verbose_ir = comp.verbose_ir,
228 .verbose_llvm_ir = comp.verbose_llvm_ir,226 .verbose_llvm_ir = comp.verbose_llvm_ir,
229 .verbose_cimport = comp.verbose_cimport,227 .verbose_cimport = comp.verbose_cimport,
230 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,228 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
src/libunwind.zig+1-3
...@@ -125,9 +125,7 @@ pub fn buildStaticLib(comp: *Compilation) !void {...@@ -125,9 +125,7 @@ pub fn buildStaticLib(comp: *Compilation) !void {
125 .c_source_files = &c_source_files,125 .c_source_files = &c_source_files,
126 .verbose_cc = comp.verbose_cc,126 .verbose_cc = comp.verbose_cc,
127 .verbose_link = comp.bin_file.options.verbose_link,127 .verbose_link = comp.bin_file.options.verbose_link,
128 .verbose_tokenize = comp.verbose_tokenize,128 .verbose_air = comp.verbose_air,
129 .verbose_ast = comp.verbose_ast,
130 .verbose_ir = comp.verbose_ir,
131 .verbose_llvm_ir = comp.verbose_llvm_ir,129 .verbose_llvm_ir = comp.verbose_llvm_ir,
132 .verbose_cimport = comp.verbose_cimport,130 .verbose_cimport = comp.verbose_cimport,
133 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,131 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
src/main.zig+5-15
...@@ -408,9 +408,7 @@ const usage_build_generic =...@@ -408,9 +408,7 @@ const usage_build_generic =
408 \\ -fstack-report Print stack size diagnostics408 \\ -fstack-report Print stack size diagnostics
409 \\ --verbose-link Display linker invocations409 \\ --verbose-link Display linker invocations
410 \\ --verbose-cc Display C compiler invocations410 \\ --verbose-cc Display C compiler invocations
411 \\ --verbose-tokenize Enable compiler debug output for tokenization411 \\ --verbose-air Enable compiler debug output for Zig AIR
412 \\ --verbose-ast Enable compiler debug output for AST parsing
413 \\ --verbose-ir Enable compiler debug output for Zig IR
414 \\ --verbose-llvm-ir Enable compiler debug output for LLVM IR412 \\ --verbose-llvm-ir Enable compiler debug output for LLVM IR
415 \\ --verbose-cimport Enable compiler debug output for C imports413 \\ --verbose-cimport Enable compiler debug output for C imports
416 \\ --verbose-llvm-cpu-features Enable compiler debug output for LLVM CPU features414 \\ --verbose-llvm-cpu-features Enable compiler debug output for LLVM CPU features
...@@ -542,9 +540,7 @@ fn buildOutputType(...@@ -542,9 +540,7 @@ fn buildOutputType(
542 var watch = false;540 var watch = false;
543 var verbose_link = try optionalBoolEnvVar(arena, "ZIG_VERBOSE_LINK");541 var verbose_link = try optionalBoolEnvVar(arena, "ZIG_VERBOSE_LINK");
544 var verbose_cc = try optionalBoolEnvVar(arena, "ZIG_VERBOSE_CC");542 var verbose_cc = try optionalBoolEnvVar(arena, "ZIG_VERBOSE_CC");
545 var verbose_tokenize = false;543 var verbose_air = false;
546 var verbose_ast = false;
547 var verbose_ir = false;
548 var verbose_llvm_ir = false;544 var verbose_llvm_ir = false;
549 var verbose_cimport = false;545 var verbose_cimport = false;
550 var verbose_llvm_cpu_features = false;546 var verbose_llvm_cpu_features = false;
...@@ -1036,12 +1032,8 @@ fn buildOutputType(...@@ -1036,12 +1032,8 @@ fn buildOutputType(
1036 verbose_link = true;1032 verbose_link = true;
1037 } else if (mem.eql(u8, arg, "--verbose-cc")) {1033 } else if (mem.eql(u8, arg, "--verbose-cc")) {
1038 verbose_cc = true;1034 verbose_cc = true;
1039 } else if (mem.eql(u8, arg, "--verbose-tokenize")) {1035 } else if (mem.eql(u8, arg, "--verbose-air")) {
1040 verbose_tokenize = true;1036 verbose_air = true;
1041 } else if (mem.eql(u8, arg, "--verbose-ast")) {
1042 verbose_ast = true;
1043 } else if (mem.eql(u8, arg, "--verbose-ir")) {
1044 verbose_ir = true;
1045 } else if (mem.eql(u8, arg, "--verbose-llvm-ir")) {1037 } else if (mem.eql(u8, arg, "--verbose-llvm-ir")) {
1046 verbose_llvm_ir = true;1038 verbose_llvm_ir = true;
1047 } else if (mem.eql(u8, arg, "--verbose-cimport")) {1039 } else if (mem.eql(u8, arg, "--verbose-cimport")) {
...@@ -1960,9 +1952,7 @@ fn buildOutputType(...@@ -1960,9 +1952,7 @@ fn buildOutputType(
1960 .libc_installation = if (libc_installation) |*lci| lci else null,1952 .libc_installation = if (libc_installation) |*lci| lci else null,
1961 .verbose_cc = verbose_cc,1953 .verbose_cc = verbose_cc,
1962 .verbose_link = verbose_link,1954 .verbose_link = verbose_link,
1963 .verbose_tokenize = verbose_tokenize,1955 .verbose_air = verbose_air,
1964 .verbose_ast = verbose_ast,
1965 .verbose_ir = verbose_ir,
1966 .verbose_llvm_ir = verbose_llvm_ir,1956 .verbose_llvm_ir = verbose_llvm_ir,
1967 .verbose_cimport = verbose_cimport,1957 .verbose_cimport = verbose_cimport,
1968 .verbose_llvm_cpu_features = verbose_llvm_cpu_features,1958 .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 {...@@ -217,9 +217,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {
217 .self_exe_path = comp.self_exe_path,217 .self_exe_path = comp.self_exe_path,
218 .verbose_cc = comp.verbose_cc,218 .verbose_cc = comp.verbose_cc,
219 .verbose_link = comp.bin_file.options.verbose_link,219 .verbose_link = comp.bin_file.options.verbose_link,
220 .verbose_tokenize = comp.verbose_tokenize,220 .verbose_air = comp.verbose_air,
221 .verbose_ast = comp.verbose_ast,
222 .verbose_ir = comp.verbose_ir,
223 .verbose_llvm_ir = comp.verbose_llvm_ir,221 .verbose_llvm_ir = comp.verbose_llvm_ir,
224 .verbose_cimport = comp.verbose_cimport,222 .verbose_cimport = comp.verbose_cimport,
225 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,223 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
src/stage1.zig-2
...@@ -124,8 +124,6 @@ pub const Module = extern struct {...@@ -124,8 +124,6 @@ pub const Module = extern struct {
124 enable_time_report: bool,124 enable_time_report: bool,
125 enable_stack_report: bool,125 enable_stack_report: bool,
126 test_is_evented: bool,126 test_is_evented: bool,
127 verbose_tokenize: bool,
128 verbose_ast: bool,
129 verbose_ir: bool,127 verbose_ir: bool,
130 verbose_llvm_ir: bool,128 verbose_llvm_ir: bool,
131 verbose_cimport: bool,129 verbose_cimport: bool,
src/stage1/all_types.hpp-2
...@@ -2121,8 +2121,6 @@ struct CodeGen {...@@ -2121,8 +2121,6 @@ struct CodeGen {
2121 unsigned pointer_size_bytes;2121 unsigned pointer_size_bytes;
2122 bool is_big_endian;2122 bool is_big_endian;
2123 bool have_err_ret_tracing;2123 bool have_err_ret_tracing;
2124 bool verbose_tokenize;
2125 bool verbose_ast;
2126 bool verbose_ir;2124 bool verbose_ir;
2127 bool verbose_llvm_ir;2125 bool verbose_llvm_ir;
2128 bool verbose_cimport;2126 bool verbose_cimport;
src/stage1/stage1.cpp-2
...@@ -106,8 +106,6 @@ void zig_stage1_build_object(struct ZigStage1 *stage1) {...@@ -106,8 +106,6 @@ void zig_stage1_build_object(struct ZigStage1 *stage1) {
106 g->enable_stack_report = stage1->enable_stack_report;106 g->enable_stack_report = stage1->enable_stack_report;
107 g->test_is_evented = stage1->test_is_evented;107 g->test_is_evented = stage1->test_is_evented;
108108
109 g->verbose_tokenize = stage1->verbose_tokenize;
110 g->verbose_ast = stage1->verbose_ast;
111 g->verbose_ir = stage1->verbose_ir;109 g->verbose_ir = stage1->verbose_ir;
112 g->verbose_llvm_ir = stage1->verbose_llvm_ir;110 g->verbose_llvm_ir = stage1->verbose_llvm_ir;
113 g->verbose_cimport = stage1->verbose_cimport;111 g->verbose_cimport = stage1->verbose_cimport;
src/stage1/stage1.h-2
...@@ -196,8 +196,6 @@ struct ZigStage1 {...@@ -196,8 +196,6 @@ struct ZigStage1 {
196 bool enable_time_report;196 bool enable_time_report;
197 bool enable_stack_report;197 bool enable_stack_report;
198 bool test_is_evented;198 bool test_is_evented;
199 bool verbose_tokenize;
200 bool verbose_ast;
201 bool verbose_ir;199 bool verbose_ir;
202 bool verbose_llvm_ir;200 bool verbose_llvm_ir;
203 bool verbose_cimport;201 bool verbose_cimport;
src/stage1/zig0.cpp-8
...@@ -250,8 +250,6 @@ int main(int argc, char **argv) {...@@ -250,8 +250,6 @@ int main(int argc, char **argv) {
250 const char *emit_bin_path = nullptr;250 const char *emit_bin_path = nullptr;
251 bool strip = false;251 bool strip = false;
252 const char *out_name = nullptr;252 const char *out_name = nullptr;
253 bool verbose_tokenize = false;
254 bool verbose_ast = false;
255 bool verbose_ir = false;253 bool verbose_ir = false;
256 bool verbose_llvm_ir = false;254 bool verbose_llvm_ir = false;
257 bool verbose_cimport = false;255 bool verbose_cimport = false;
...@@ -288,10 +286,6 @@ int main(int argc, char **argv) {...@@ -288,10 +286,6 @@ int main(int argc, char **argv) {
288 return print_full_usage(arg0, stdout, EXIT_SUCCESS);286 return print_full_usage(arg0, stdout, EXIT_SUCCESS);
289 } else if (strcmp(arg, "--strip") == 0) {287 } else if (strcmp(arg, "--strip") == 0) {
290 strip = true;288 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;
295 } else if (strcmp(arg, "--verbose-ir") == 0) {289 } else if (strcmp(arg, "--verbose-ir") == 0) {
296 verbose_ir = true;290 verbose_ir = true;
297 } else if (strcmp(arg, "--verbose-llvm-ir") == 0) {291 } else if (strcmp(arg, "--verbose-llvm-ir") == 0) {
...@@ -458,8 +452,6 @@ int main(int argc, char **argv) {...@@ -458,8 +452,6 @@ int main(int argc, char **argv) {
458 stage1->root_name_ptr = out_name;452 stage1->root_name_ptr = out_name;
459 stage1->root_name_len = strlen(out_name);453 stage1->root_name_len = strlen(out_name);
460 stage1->strip = strip;454 stage1->strip = strip;
461 stage1->verbose_tokenize = verbose_tokenize;
462 stage1->verbose_ast = verbose_ast;
463 stage1->verbose_ir = verbose_ir;455 stage1->verbose_ir = verbose_ir;
464 stage1->verbose_llvm_ir = verbose_llvm_ir;456 stage1->verbose_llvm_ir = verbose_llvm_ir;
465 stage1->verbose_cimport = verbose_cimport;457 stage1->verbose_cimport = verbose_cimport;