From 5e63baae8d2dbe4dd523ec9f67d90080686c43ae Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 9 Jun 2021 14:38:27 -0700 Subject: 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 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'src/Compilation.zig') 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, -- cgit v1.2.3