| author |  Andrew Kelley <andrew@ziglang.org> 2023-07-23 19:52:29-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2023-07-24 02:37:25-07:00 |
| log | 575a7cccc0d9da542bd611f73e570d840f261bf5 |
| tree | f548605cf44a47c9fcab5fa29b3ccd17adaf1a06 |
| parent | d21d1d4ba25701410b9ae99921326f8bfc8a44dd |
CLI: delete dead option -femit-analysis
This used to do something with the old autodocs system. Now it does
nothing.3 files changed, 0 insertions(+), 35 deletions(-)
lib- std
- Build
- Step
lib/std/Build/Step/Compile.zig-2
| ... | @@ -46,7 +46,6 @@ framework_dirs: ArrayList(FileSource), | ... | @@ -46,7 +46,6 @@ framework_dirs: ArrayList(FileSource), |
| 46 | frameworks: StringHashMap(FrameworkLinkInfo), | 46 | frameworks: StringHashMap(FrameworkLinkInfo), |
| 47 | verbose_link: bool, | 47 | verbose_link: bool, |
| 48 | verbose_cc: bool, | 48 | verbose_cc: bool, |
| 49 | emit_analysis: EmitOption = .default, | ||
| 50 | emit_asm: EmitOption = .default, | 49 | emit_asm: EmitOption = .default, |
| 51 | emit_bin: EmitOption = .default, | 50 | emit_bin: EmitOption = .default, |
| 52 | emit_implib: EmitOption = .default, | 51 | emit_implib: EmitOption = .default, |
| ... | @@ -1516,7 +1515,6 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void { | ... | @@ -1516,7 +1515,6 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void { |
| 1516 | if (b.verbose_cc or self.verbose_cc) try zig_args.append("--verbose-cc"); | 1515 | if (b.verbose_cc or self.verbose_cc) try zig_args.append("--verbose-cc"); |
| 1517 | if (b.verbose_llvm_cpu_features) try zig_args.append("--verbose-llvm-cpu-features"); | 1516 | if (b.verbose_llvm_cpu_features) try zig_args.append("--verbose-llvm-cpu-features"); |
| 1518 | 1517 | ||
| 1519 | if (self.emit_analysis.getArg(b, "emit-analysis")) |arg| try zig_args.append(arg); | ||
| 1520 | if (self.emit_asm.getArg(b, "emit-asm")) |arg| try zig_args.append(arg); | 1518 | if (self.emit_asm.getArg(b, "emit-asm")) |arg| try zig_args.append(arg); |
| 1521 | if (self.emit_bin.getArg(b, "emit-bin")) |arg| try zig_args.append(arg); | 1519 | if (self.emit_bin.getArg(b, "emit-bin")) |arg| try zig_args.append(arg); |
| 1522 | if (self.generated_docs != null) try zig_args.append("-femit-docs"); | 1520 | if (self.generated_docs != null) try zig_args.append("-femit-docs"); |
src/Compilation.zig-5
| ... | @@ -179,7 +179,6 @@ test_name_prefix: ?[]const u8, | ... | @@ -179,7 +179,6 @@ test_name_prefix: ?[]const u8, |
| 179 | emit_asm: ?EmitLoc, | 179 | emit_asm: ?EmitLoc, |
| 180 | emit_llvm_ir: ?EmitLoc, | 180 | emit_llvm_ir: ?EmitLoc, |
| 181 | emit_llvm_bc: ?EmitLoc, | 181 | emit_llvm_bc: ?EmitLoc, |
| 182 | emit_analysis: ?EmitLoc, | ||
| 183 | 182 | ||
| 184 | work_queue_wait_group: WaitGroup = .{}, | 183 | work_queue_wait_group: WaitGroup = .{}, |
| 185 | astgen_wait_group: WaitGroup = .{}, | 184 | astgen_wait_group: WaitGroup = .{}, |
| ... | @@ -482,8 +481,6 @@ pub const InitOptions = struct { | ... | @@ -482,8 +481,6 @@ pub const InitOptions = struct { |
| 482 | emit_llvm_ir: ?EmitLoc = null, | 481 | emit_llvm_ir: ?EmitLoc = null, |
| 483 | /// `null` means to not emit LLVM module bitcode. | 482 | /// `null` means to not emit LLVM module bitcode. |
| 484 | emit_llvm_bc: ?EmitLoc = null, | 483 | emit_llvm_bc: ?EmitLoc = null, |
| 485 | /// `null` means to not emit semantic analysis JSON. | ||
| 486 | emit_analysis: ?EmitLoc = null, | ||
| 487 | /// `null` means to not emit docs. | 484 | /// `null` means to not emit docs. |
| 488 | emit_docs: ?EmitLoc = null, | 485 | emit_docs: ?EmitLoc = null, |
| 489 | /// `null` means to not emit an import lib. | 486 | /// `null` means to not emit an import lib. |
| ... | @@ -1590,7 +1587,6 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation { | ... | @@ -1590,7 +1587,6 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation { |
| 1590 | .emit_asm = options.emit_asm, | 1587 | .emit_asm = options.emit_asm, |
| 1591 | .emit_llvm_ir = options.emit_llvm_ir, | 1588 | .emit_llvm_ir = options.emit_llvm_ir, |
| 1592 | .emit_llvm_bc = options.emit_llvm_bc, | 1589 | .emit_llvm_bc = options.emit_llvm_bc, |
| 1593 | .emit_analysis = options.emit_analysis, | ||
| 1594 | .work_queue = std.fifo.LinearFifo(Job, .Dynamic).init(gpa), | 1590 | .work_queue = std.fifo.LinearFifo(Job, .Dynamic).init(gpa), |
| 1595 | .anon_work_queue = std.fifo.LinearFifo(Job, .Dynamic).init(gpa), | 1591 | .anon_work_queue = std.fifo.LinearFifo(Job, .Dynamic).init(gpa), |
| 1596 | .c_object_work_queue = std.fifo.LinearFifo(*CObject, .Dynamic).init(gpa), | 1592 | .c_object_work_queue = std.fifo.LinearFifo(*CObject, .Dynamic).init(gpa), |
| ... | @@ -2329,7 +2325,6 @@ fn addNonIncrementalStuffToCacheManifest(comp: *Compilation, man: *Cache.Manifes | ... | @@ -2329,7 +2325,6 @@ fn addNonIncrementalStuffToCacheManifest(comp: *Compilation, man: *Cache.Manifes |
| 2329 | cache_helpers.addOptionalEmitLoc(&man.hash, comp.emit_asm); | 2325 | cache_helpers.addOptionalEmitLoc(&man.hash, comp.emit_asm); |
| 2330 | cache_helpers.addOptionalEmitLoc(&man.hash, comp.emit_llvm_ir); | 2326 | cache_helpers.addOptionalEmitLoc(&man.hash, comp.emit_llvm_ir); |
| 2331 | cache_helpers.addOptionalEmitLoc(&man.hash, comp.emit_llvm_bc); | 2327 | cache_helpers.addOptionalEmitLoc(&man.hash, comp.emit_llvm_bc); |
| 2332 | cache_helpers.addOptionalEmitLoc(&man.hash, comp.emit_analysis); | ||
| 2333 | 2328 | ||
| 2334 | man.hash.addListOfBytes(comp.clang_argv); | 2329 | man.hash.addListOfBytes(comp.clang_argv); |
| 2335 | 2330 |
src/main.zig-28
| ... | @@ -384,8 +384,6 @@ const usage_build_generic = | ... | @@ -384,8 +384,6 @@ const usage_build_generic = |
| 384 | \\ -fno-emit-h (default) Do not generate a C header file (.h) | 384 | \\ -fno-emit-h (default) Do not generate a C header file (.h) |
| 385 | \\ -femit-docs[=path] Create a docs/ dir with html documentation | 385 | \\ -femit-docs[=path] Create a docs/ dir with html documentation |
| 386 | \\ -fno-emit-docs (default) Do not produce docs/ dir with html documentation | 386 | \\ -fno-emit-docs (default) Do not produce docs/ dir with html documentation |
| 387 | \\ -femit-analysis[=path] Write analysis JSON file with type information | ||
| 388 | \\ -fno-emit-analysis (default) Do not write analysis JSON file with type information | ||
| 389 | \\ -femit-implib[=path] (default) Produce an import .lib when building a Windows DLL | 387 | \\ -femit-implib[=path] (default) Produce an import .lib when building a Windows DLL |
| 390 | \\ -fno-emit-implib Do not produce an import .lib when building a Windows DLL | 388 | \\ -fno-emit-implib Do not produce an import .lib when building a Windows DLL |
| 391 | \\ --show-builtin Output the source of @import("builtin") then exit | 389 | \\ --show-builtin Output the source of @import("builtin") then exit |
| ... | @@ -755,7 +753,6 @@ fn buildOutputType( | ... | @@ -755,7 +753,6 @@ fn buildOutputType( |
| 755 | var emit_llvm_ir: Emit = .no; | 753 | var emit_llvm_ir: Emit = .no; |
| 756 | var emit_llvm_bc: Emit = .no; | 754 | var emit_llvm_bc: Emit = .no; |
| 757 | var emit_docs: Emit = .no; | 755 | var emit_docs: Emit = .no; |
| 758 | var emit_analysis: Emit = .no; | ||
| 759 | var emit_implib: Emit = .yes_default_path; | 756 | var emit_implib: Emit = .yes_default_path; |
| 760 | var emit_implib_arg_provided = false; | 757 | var emit_implib_arg_provided = false; |
| 761 | var target_arch_os_abi: []const u8 = "native"; | 758 | var target_arch_os_abi: []const u8 = "native"; |
| ... | @@ -1336,12 +1333,6 @@ fn buildOutputType( | ... | @@ -1336,12 +1333,6 @@ fn buildOutputType( |
| 1336 | emit_docs = .{ .yes = arg["-femit-docs=".len..] }; | 1333 | emit_docs = .{ .yes = arg["-femit-docs=".len..] }; |
| 1337 | } else if (mem.eql(u8, arg, "-fno-emit-docs")) { | 1334 | } else if (mem.eql(u8, arg, "-fno-emit-docs")) { |
| 1338 | emit_docs = .no; | 1335 | emit_docs = .no; |
| 1339 | } else if (mem.eql(u8, arg, "-femit-analysis")) { | ||
| 1340 | emit_analysis = .yes_default_path; | ||
| 1341 | } else if (mem.startsWith(u8, arg, "-femit-analysis=")) { | ||
| 1342 | emit_analysis = .{ .yes = arg["-femit-analysis=".len..] }; | ||
| 1343 | } else if (mem.eql(u8, arg, "-fno-emit-analysis")) { | ||
| 1344 | emit_analysis = .no; | ||
| 1345 | } else if (mem.eql(u8, arg, "-femit-implib")) { | 1336 | } else if (mem.eql(u8, arg, "-femit-implib")) { |
| 1346 | emit_implib = .yes_default_path; | 1337 | emit_implib = .yes_default_path; |
| 1347 | emit_implib_arg_provided = true; | 1338 | emit_implib_arg_provided = true; |
| ... | @@ -2824,24 +2815,6 @@ fn buildOutputType( | ... | @@ -2824,24 +2815,6 @@ fn buildOutputType( |
| 2824 | }; | 2815 | }; |
| 2825 | defer emit_llvm_bc_resolved.deinit(); | 2816 | defer emit_llvm_bc_resolved.deinit(); |
| 2826 | 2817 | ||
| 2827 | const default_analysis_basename = try std.fmt.allocPrint(arena, "{s}-analysis.json", .{root_name}); | ||
| 2828 | var emit_analysis_resolved = emit_analysis.resolve(default_analysis_basename, output_to_cache) catch |err| { | ||
| 2829 | switch (emit_analysis) { | ||
| 2830 | .yes => |p| { | ||
| 2831 | fatal("unable to open directory from argument '-femit-analysis', '{s}': {s}", .{ | ||
| 2832 | p, @errorName(err), | ||
| 2833 | }); | ||
| 2834 | }, | ||
| 2835 | .yes_default_path => { | ||
| 2836 | fatal("unable to open directory from arguments 'name' or 'soname', '{s}': {s}", .{ | ||
| 2837 | default_analysis_basename, @errorName(err), | ||
| 2838 | }); | ||
| 2839 | }, | ||
| 2840 | .no => unreachable, | ||
| 2841 | } | ||
| 2842 | }; | ||
| 2843 | defer emit_analysis_resolved.deinit(); | ||
| 2844 | |||
| 2845 | var emit_docs_resolved = emit_docs.resolve("docs", output_to_cache) catch |err| { | 2818 | var emit_docs_resolved = emit_docs.resolve("docs", output_to_cache) catch |err| { |
| 2846 | switch (emit_docs) { | 2819 | switch (emit_docs) { |
| 2847 | .yes => |p| { | 2820 | .yes => |p| { |
| ... | @@ -3096,7 +3069,6 @@ fn buildOutputType( | ... | @@ -3096,7 +3069,6 @@ fn buildOutputType( |
| 3096 | .emit_llvm_ir = emit_llvm_ir_resolved.data, | 3069 | .emit_llvm_ir = emit_llvm_ir_resolved.data, |
| 3097 | .emit_llvm_bc = emit_llvm_bc_resolved.data, | 3070 | .emit_llvm_bc = emit_llvm_bc_resolved.data, |
| 3098 | .emit_docs = emit_docs_resolved.data, | 3071 | .emit_docs = emit_docs_resolved.data, |
| 3099 | .emit_analysis = emit_analysis_resolved.data, | ||
| 3100 | .emit_implib = emit_implib_resolved.data, | 3072 | .emit_implib = emit_implib_resolved.data, |
| 3101 | .link_mode = link_mode, | 3073 | .link_mode = link_mode, |
| 3102 | .dll_export_fns = dll_export_fns, | 3074 | .dll_export_fns = dll_export_fns, |