Commit 5bf9dc3850117c85fb124cc481d4a284e2c8504d | zig

author	Matthew Lugg <mlugg@mlugg.co.uk> 2024-08-21 22:16:56+01:00
committer	GitHub <noreply@github.com> 2024-08-21 22:16:56+01:00
log	5bf9dc3850117c85fb124cc481d4a284e2c8504d
tree	9a25388910f75228d1ccec53da19a1ef803c8115
parent	7bbbbf8ffa3fa9be085cef8e8237cd94ce342483
parent	a0b03d7ffffdf89b14ad6f1d5cd6537935996338
signature	Signed by PGP key B5690EEEBB952194

Merge pull request #21157 from mlugg/kill-cimport

`std.Build.Step.TranslateC` fixes

2 files changed, 36 insertions(+), 16 deletions(-)

lib
- std
  - Build
    Step
    TranslateC.zig
src
- main.zig

lib/std/Build/Step/TranslateC.zig+5-2

...	@@ -29,7 +29,7 @@ pub const Options = struct {	...	@@ -29,7 +29,7 @@ pub const Options = struct {
29	pub fn create(owner: std.Build, options: Options) TranslateC {	29	pub fn create(owner: std.Build, options: Options) TranslateC {
30	const translate_c = owner.allocator.create(TranslateC) catch @panic("OOM");	30	const translate_c = owner.allocator.create(TranslateC) catch @panic("OOM");
31	const source = options.root_source_file.dupe(owner);	31	const source = options.root_source_file.dupe(owner);
32	translate_c.* = TranslateC{	32	translate_c.* = .{
33	.step = Step.init(.{	33	.step = Step.init(.{
34	.id = base_id,	34	.id = base_id,
35	.name = "translate-c",	35	.name = "translate-c",
...	@@ -42,7 +42,7 @@ pub fn create(owner: std.Build, options: Options) TranslateC {	...	@@ -42,7 +42,7 @@ pub fn create(owner: std.Build, options: Options) TranslateC {
42	.out_basename = undefined,	42	.out_basename = undefined,
43	.target = options.target,	43	.target = options.target,
44	.optimize = options.optimize,	44	.optimize = options.optimize,
45	.output_file = std.Build.GeneratedFile{ .step = &translate_c.step },	45	.output_file = .{ .step = &translate_c.step },
46	.link_libc = options.link_libc,	46	.link_libc = options.link_libc,
47	.use_clang = options.use_clang,	47	.use_clang = options.use_clang,
48	};	48	};
...	@@ -89,6 +89,9 @@ pub fn addModule(translate_c: TranslateC, name: []const u8) std.Build.Module {	...	@@ -89,6 +89,9 @@ pub fn addModule(translate_c: TranslateC, name: []const u8) std.Build.Module {
89	pub fn createModule(translate_c: TranslateC) std.Build.Module {	89	pub fn createModule(translate_c: TranslateC) std.Build.Module {
90	return translate_c.step.owner.createModule(.{	90	return translate_c.step.owner.createModule(.{
91	.root_source_file = translate_c.getOutput(),	91	.root_source_file = translate_c.getOutput(),
		92	.target = translate_c.target,
		93	.optimize = translate_c.optimize,
		94	.link_libc = translate_c.link_libc,
92	});	95	});
93	}	96	}
94		97

src/main.zig+31-14

 @@ -4526,7 +4526,12 @@ fn cmdTranslateC(
             Compilation.dump_argv(argv.items);
         }
-        const formatted = switch (comp.config.c_frontend) {
+        const Result = union(enum) {
+            success: []const u8,
+            error_bundle: std.zig.ErrorBundle,
+        };
+        const result: Result = switch (comp.config.c_frontend) {
             .aro => f: {
                 var stdout: []u8 = undefined;
                 try jitCmd(comp.gpa, arena, argv.items, .{
 @@ -4536,7 +4541,7 @@ fn cmdTranslateC(
                     .capture = &stdout,
                     .progress_node = prog_node,
                 });
-                break :f stdout;
+                break :f .{ .success = stdout };
             },
             .clang => f: {
                 if (!build_options.have_llvm) unreachable;
 @@ -4564,31 +4569,43 @@ fn cmdTranslateC(
                     c_headers_dir_path_z,
                 ) catch |err| switch (err) {
                     error.OutOfMemory => return error.OutOfMemory,
-                    error.SemanticAnalyzeFail => {
+                    error.SemanticAnalyzeFail => break :f .{ .error_bundle = errors },
-                        if (fancy_output) |p| {
-                            p.errors = errors;
-                            return;
-                        } else {
-                            errors.renderToStdErr(color.renderOptions());
-                            process.exit(1);
-                        }
-                    },
                 };
                 defer tree.deinit(comp.gpa);
-                break :f try tree.render(arena);
+                break :f .{ .success = try tree.render(arena) };
             },
         };
-        if (out_dep_path) |dep_file_path| {
+        if (out_dep_path) |dep_file_path| add_deps: {
             const dep_basename = fs.path.basename(dep_file_path);
             // Add the files depended on to the cache system.
-            try man.addDepFilePost(zig_cache_tmp_dir, dep_basename);
+            man.addDepFilePost(zig_cache_tmp_dir, dep_basename) catch |err| switch (err) {
+                error.FileNotFound => {
+                    // Clang didn't emit the dep file; nothing to add to the manifest.
+                    break :add_deps;
+                },
+                else => |e| return e,
+            };
             // Just to save disk space, we delete the file because it is never needed again.
             zig_cache_tmp_dir.deleteFile(dep_basename) catch |err| {
                 warn("failed to delete '{s}': {s}", .{ dep_file_path, @errorName(err) });
             };
         }
+        const formatted = switch (result) {
+            .success => |formatted| formatted,
+            .error_bundle => |eb| {
+                if (file_system_inputs) |buf| try man.populateFileSystemInputs(buf);
+                if (fancy_output) |p| {
+                    p.errors = eb;
+                    return;
+                } else {
+                    eb.renderToStdErr(color.renderOptions());
+                    process.exit(1);
+                }
+            },
+        };
         const bin_digest = man.finalBin();
         const hex_digest = Cache.binToHex(bin_digest);