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,...@@ -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,
...@@ -692,9 +690,7 @@ pub const InitOptions = struct {...@@ -692,9 +690,7 @@ pub const InitOptions = struct {
692 clang_passthrough_mode: bool = false,690 clang_passthrough_mode: bool = false,
693 verbose_cc: bool = false,691 verbose_cc: bool = false,
694 verbose_link: bool = false,692 verbose_link: bool = false,
695 verbose_tokenize: bool = false,693 verbose_air: bool = false,
696 verbose_ast: bool = false,
697 verbose_ir: bool = false,
698 verbose_llvm_ir: bool = false,694 verbose_llvm_ir: bool = false,
699 verbose_cimport: bool = false,695 verbose_cimport: bool = false,
700 verbose_llvm_cpu_features: bool = false,696 verbose_llvm_cpu_features: bool = false,
...@@ -1361,9 +1357,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {...@@ -1361,9 +1357,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
1361 .clang_passthrough_mode = options.clang_passthrough_mode,1357 .clang_passthrough_mode = options.clang_passthrough_mode,
1362 .clang_preprocessor_mode = options.clang_preprocessor_mode,1358 .clang_preprocessor_mode = options.clang_preprocessor_mode,
1363 .verbose_cc = options.verbose_cc,1359 .verbose_cc = options.verbose_cc,
1364 .verbose_tokenize = options.verbose_tokenize,1360 .verbose_air = options.verbose_air,
1365 .verbose_ast = options.verbose_ast,
1366 .verbose_ir = options.verbose_ir,
1367 .verbose_llvm_ir = options.verbose_llvm_ir,1361 .verbose_llvm_ir = options.verbose_llvm_ir,
1368 .verbose_cimport = options.verbose_cimport,1362 .verbose_cimport = options.verbose_cimport,
1369 .verbose_llvm_cpu_features = options.verbose_llvm_cpu_features,1363 .verbose_llvm_cpu_features = options.verbose_llvm_cpu_features,
...@@ -1968,7 +1962,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor...@@ -1968,7 +1962,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor
1968 log.debug("analyze liveness of {s}", .{decl.name});1962 log.debug("analyze liveness of {s}", .{decl.name});
1969 try liveness.analyze(module.gpa, &decl_arena.allocator, func.body);1963 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) {
1972 func.dump(module.*);1966 func.dump(module.*);
1973 }1967 }
1974 }1968 }
...@@ -3689,9 +3683,7 @@ fn buildOutputFromZig(...@@ -3689,9 +3683,7 @@ fn buildOutputFromZig(
3689 .self_exe_path = comp.self_exe_path,3683 .self_exe_path = comp.self_exe_path,
3690 .verbose_cc = comp.verbose_cc,3684 .verbose_cc = comp.verbose_cc,
3691 .verbose_link = comp.bin_file.options.verbose_link,3685 .verbose_link = comp.bin_file.options.verbose_link,
3692 .verbose_tokenize = comp.verbose_tokenize,3686 .verbose_air = comp.verbose_air,
3693 .verbose_ast = comp.verbose_ast,
3694 .verbose_ir = comp.verbose_ir,
3695 .verbose_llvm_ir = comp.verbose_llvm_ir,3687 .verbose_llvm_ir = comp.verbose_llvm_ir,
3696 .verbose_cimport = comp.verbose_cimport,3688 .verbose_cimport = comp.verbose_cimport,
3697 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,3689 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
...@@ -3949,9 +3941,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node...@@ -3949,9 +3941,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node
3949 .enable_time_report = comp.time_report,3941 .enable_time_report = comp.time_report,
3950 .enable_stack_report = comp.stack_report,3942 .enable_stack_report = comp.stack_report,
3951 .test_is_evented = comp.test_evented_io,3943 .test_is_evented = comp.test_evented_io,
3952 .verbose_tokenize = comp.verbose_tokenize,3944 .verbose_ir = comp.verbose_air,
3953 .verbose_ast = comp.verbose_ast,
3954 .verbose_ir = comp.verbose_ir,
3955 .verbose_llvm_ir = comp.verbose_llvm_ir,3945 .verbose_llvm_ir = comp.verbose_llvm_ir,
3956 .verbose_cimport = comp.verbose_cimport,3946 .verbose_cimport = comp.verbose_cimport,
3957 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,3947 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
...@@ -4107,9 +4097,7 @@ pub fn build_crt_file(...@@ -4107,9 +4097,7 @@ pub fn build_crt_file(
4107 .c_source_files = c_source_files,4097 .c_source_files = c_source_files,
4108 .verbose_cc = comp.verbose_cc,4098 .verbose_cc = comp.verbose_cc,
4109 .verbose_link = comp.bin_file.options.verbose_link,4099 .verbose_link = comp.bin_file.options.verbose_link,
4110 .verbose_tokenize = comp.verbose_tokenize,4100 .verbose_air = comp.verbose_air,
4111 .verbose_ast = comp.verbose_ast,
4112 .verbose_ir = comp.verbose_ir,
4113 .verbose_llvm_ir = comp.verbose_llvm_ir,4101 .verbose_llvm_ir = comp.verbose_llvm_ir,
4114 .verbose_cimport = comp.verbose_cimport,4102 .verbose_cimport = comp.verbose_cimport,
4115 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,4103 .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
...@@ -407,9 +407,7 @@ const usage_build_generic =...@@ -407,9 +407,7 @@ const usage_build_generic =
407 \\ -fstack-report Print stack size diagnostics407 \\ -fstack-report Print stack size diagnostics
408 \\ --verbose-link Display linker invocations408 \\ --verbose-link Display linker invocations
409 \\ --verbose-cc Display C compiler invocations409 \\ --verbose-cc Display C compiler invocations
410 \\ --verbose-tokenize Enable compiler debug output for tokenization410 \\ --verbose-air Enable compiler debug output for Zig AIR
411 \\ --verbose-ast Enable compiler debug output for AST parsing
412 \\ --verbose-ir Enable compiler debug output for Zig IR
413 \\ --verbose-llvm-ir Enable compiler debug output for LLVM IR411 \\ --verbose-llvm-ir Enable compiler debug output for LLVM IR
414 \\ --verbose-cimport Enable compiler debug output for C imports412 \\ --verbose-cimport Enable compiler debug output for C imports
415 \\ --verbose-llvm-cpu-features Enable compiler debug output for LLVM CPU features413 \\ --verbose-llvm-cpu-features Enable compiler debug output for LLVM CPU features
...@@ -541,9 +539,7 @@ fn buildOutputType(...@@ -541,9 +539,7 @@ fn buildOutputType(
541 var watch = false;539 var watch = false;
542 var verbose_link = try optionalBoolEnvVar(arena, "ZIG_VERBOSE_LINK");540 var verbose_link = try optionalBoolEnvVar(arena, "ZIG_VERBOSE_LINK");
543 var verbose_cc = try optionalBoolEnvVar(arena, "ZIG_VERBOSE_CC");541 var verbose_cc = try optionalBoolEnvVar(arena, "ZIG_VERBOSE_CC");
544 var verbose_tokenize = false;542 var verbose_air = false;
545 var verbose_ast = false;
546 var verbose_ir = false;
547 var verbose_llvm_ir = false;543 var verbose_llvm_ir = false;
548 var verbose_cimport = false;544 var verbose_cimport = false;
549 var verbose_llvm_cpu_features = false;545 var verbose_llvm_cpu_features = false;
...@@ -1031,12 +1027,8 @@ fn buildOutputType(...@@ -1031,12 +1027,8 @@ fn buildOutputType(
1031 verbose_link = true;1027 verbose_link = true;
1032 } else if (mem.eql(u8, arg, "--verbose-cc")) {1028 } else if (mem.eql(u8, arg, "--verbose-cc")) {
1033 verbose_cc = true;1029 verbose_cc = true;
1034 } else if (mem.eql(u8, arg, "--verbose-tokenize")) {1030 } else if (mem.eql(u8, arg, "--verbose-air")) {
1035 verbose_tokenize = true;1031 verbose_air = 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;
1040 } else if (mem.eql(u8, arg, "--verbose-llvm-ir")) {1032 } else if (mem.eql(u8, arg, "--verbose-llvm-ir")) {
1041 verbose_llvm_ir = true;1033 verbose_llvm_ir = true;
1042 } else if (mem.eql(u8, arg, "--verbose-cimport")) {1034 } else if (mem.eql(u8, arg, "--verbose-cimport")) {
...@@ -1940,9 +1932,7 @@ fn buildOutputType(...@@ -1940,9 +1932,7 @@ fn buildOutputType(
1940 .libc_installation = if (libc_installation) |*lci| lci else null,1932 .libc_installation = if (libc_installation) |*lci| lci else null,
1941 .verbose_cc = verbose_cc,1933 .verbose_cc = verbose_cc,
1942 .verbose_link = verbose_link,1934 .verbose_link = verbose_link,
1943 .verbose_tokenize = verbose_tokenize,1935 .verbose_air = verbose_air,
1944 .verbose_ast = verbose_ast,
1945 .verbose_ir = verbose_ir,
1946 .verbose_llvm_ir = verbose_llvm_ir,1936 .verbose_llvm_ir = verbose_llvm_ir,
1947 .verbose_cimport = verbose_cimport,1937 .verbose_cimport = verbose_cimport,
1948 .verbose_llvm_cpu_features = verbose_llvm_cpu_features,1938 .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;