mirror of
https://github.com/ziglang/zig.git
synced 2024-12-12 14:16:59 +00:00
Module: fix early exit conditions during compilation
* `--verbose-llvm-ir` should trigger analysis and codegen * `-femit-asm` etc should trigger codegen even with `-fno-emit-bin` Closes #12588
This commit is contained in:
parent
cb0e22db4e
commit
c7f9833238
@ -4319,10 +4319,9 @@ pub fn ensureFuncBodyAnalyzed(mod: *Module, func: *Fn) SemaError!void {
|
||||
comp.emit_llvm_bc == null);
|
||||
|
||||
const dump_air = builtin.mode == .Debug and comp.verbose_air;
|
||||
const dump_llvm_ir = builtin.mode == .Debug and comp.verbose_llvm_ir;
|
||||
|
||||
if (no_bin_file and !dump_air) {
|
||||
return;
|
||||
}
|
||||
if (no_bin_file and !dump_air and !dump_llvm_ir) return;
|
||||
|
||||
log.debug("analyze liveness of {s}", .{decl.name});
|
||||
var liveness = try Liveness.analyze(gpa, air);
|
||||
@ -4337,9 +4336,7 @@ pub fn ensureFuncBodyAnalyzed(mod: *Module, func: *Fn) SemaError!void {
|
||||
std.debug.print("# End Function AIR: {s}\n\n", .{fqn});
|
||||
}
|
||||
|
||||
if (no_bin_file) {
|
||||
return;
|
||||
}
|
||||
if (no_bin_file and !dump_llvm_ir) return;
|
||||
|
||||
comp.bin_file.updateFunc(mod, func, air, liveness) catch |err| switch (err) {
|
||||
error.OutOfMemory => return error.OutOfMemory,
|
||||
@ -6484,7 +6481,14 @@ pub fn populateTestFunctions(mod: *Module) !void {
|
||||
pub fn linkerUpdateDecl(mod: *Module, decl_index: Decl.Index) !void {
|
||||
const comp = mod.comp;
|
||||
|
||||
if (comp.bin_file.options.emit == null) return;
|
||||
const no_bin_file = (comp.bin_file.options.emit == null and
|
||||
comp.emit_asm == null and
|
||||
comp.emit_llvm_ir == null and
|
||||
comp.emit_llvm_bc == null);
|
||||
|
||||
const dump_llvm_ir = builtin.mode == .Debug and comp.verbose_llvm_ir;
|
||||
|
||||
if (no_bin_file and !dump_llvm_ir) return;
|
||||
|
||||
const decl = mod.declPtr(decl_index);
|
||||
|
||||
|
@ -103,4 +103,5 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
|
||||
|
||||
cases.addBuildFile("test/standalone/issue_13030/build.zig", .{ .build_modes = true });
|
||||
cases.addBuildFile("test/standalone/emit_asm_and_bin/build.zig", .{});
|
||||
cases.addBuildFile("test/standalone/issue_12588/build.zig", .{});
|
||||
}
|
||||
|
18
test/standalone/issue_12588/build.zig
Normal file
18
test/standalone/issue_12588/build.zig
Normal file
@ -0,0 +1,18 @@
|
||||
const std = @import("std");
|
||||
const Builder = std.build.Builder;
|
||||
|
||||
pub fn build(b: *Builder) void {
|
||||
const mode = b.standardReleaseOptions();
|
||||
const target = b.standardTargetOptions(.{});
|
||||
|
||||
const obj = b.addObject("main", "main.zig");
|
||||
obj.setBuildMode(mode);
|
||||
obj.setTarget(target);
|
||||
obj.emit_llvm_ir = .{ .emit_to = b.pathFromRoot("main.ll") };
|
||||
obj.emit_llvm_bc = .{ .emit_to = b.pathFromRoot("main.bc") };
|
||||
obj.emit_bin = .no_emit;
|
||||
b.default_step.dependOn(&obj.step);
|
||||
|
||||
const test_step = b.step("test", "Test the program");
|
||||
test_step.dependOn(&obj.step);
|
||||
}
|
6
test/standalone/issue_12588/main.zig
Normal file
6
test/standalone/issue_12588/main.zig
Normal file
@ -0,0 +1,6 @@
|
||||
const std = @import("std");
|
||||
|
||||
export fn strFromFloatHelp(float: f64) void {
|
||||
var buf: [400]u8 = undefined;
|
||||
_ = std.fmt.bufPrint(&buf, "{d}", .{float}) catch unreachable;
|
||||
}
|
Loading…
Reference in New Issue
Block a user