mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compilation: inline the flush function

Browse Source 
There is only one call to this function and this made it easier to
troubleshoot the logic.
This commit is contained in:
Andrew Kelley 2023-12-27 12:56:14 -07:00
parent 4c3342ed76
commit 476484f09c
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Compilation.zig
View File

@ -2202,10 +2202,26 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void
return;
}
// Flush takes care of -femit-bin, but we still have -femit-llvm-ir, -femit-llvm-bc, and
// -femit-asm to handle, in the case of C objects.
// Flush below handles -femit-bin but there is still -femit-llvm-ir,
// -femit-llvm-bc, and -femit-asm, in the case of C objects.
comp.emitOthers();
try comp.flush(main_progress_node);
{
if (comp.bin_file) |lf| {
// This is needed before reading the error flags.
lf.flush(comp, main_progress_node) catch |err| switch (err) {
error.FlushFailure => {}, // error reported through link_error_flags
error.LLDReportedFailure => {}, // error reported via lockAndParseLldStderr
else => |e| return e,
};
comp.link_error_flags = lf.error_flags;
}
if (comp.module) |module| {
try link.File.C.flushEmitH(module);
}
}
if (comp.totalErrorCount() != 0) return;
try maybeGenerateAutodocs(comp, main_progress_node);
@ -2323,22 +2339,6 @@ fn maybeGenerateAutodocs(comp: *Compilation, prog_node: *std.Progress.Node) !voi
}
}
fn flush(comp: *Compilation, prog_node: *std.Progress.Node) !void {
if (comp.bin_file) |lf| {
// This is needed before reading the error flags.
lf.flush(comp, prog_node) catch |err| switch (err) {
error.FlushFailure => {}, // error reported through link_error_flags
error.LLDReportedFailure => {}, // error reported via lockAndParseLldStderr
else => |e| return e,
};
comp.link_error_flags = lf.error_flags;
}
if (comp.module) |module| {
try link.File.C.flushEmitH(module);
}
}
/// Communicate the output binary location to parent Compilations.
fn wholeCacheModeSetBinFilePath(
comp: *Compilation,