authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-18 06:45:25-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-19 19:57:37-07:00
logbad836a69bf3c1da29f39ed1a6c8bf6c66febfb6
tree000aadf5a483aa68adfba8a1d9616871c8bc1f37
parent93378e2e7be964a7362a9875e3292e9d6a697177

Compilation: revert some stuff

1 files changed, 8 insertions(+), 10 deletions(-)

src/Compilation.zig+8-10
...@@ -998,13 +998,13 @@ pub const CObject = struct {...@@ -998,13 +998,13 @@ pub const CObject = struct {
998998
999 const file = fs.cwd().openFile(file_name, .{}) catch break :source_line 0;999 const file = fs.cwd().openFile(file_name, .{}) catch break :source_line 0;
1000 defer file.close();1000 defer file.close();
1001 var buffer: [1024]u8 = undefined;1001 file.seekTo(diag.src_loc.offset + 1 - diag.src_loc.column) catch break :source_line 0;
1002 var file_reader = file.reader(&buffer);1002
1003 file_reader.seekTo(diag.src_loc.offset + 1 - diag.src_loc.column) catch break :source_line 0;1003 var line = std.ArrayList(u8).init(eb.gpa);
1004 var aw: Writer.Allocating = .init(eb.gpa);1004 defer line.deinit();
1005 defer aw.deinit();1005 file.deprecatedReader().readUntilDelimiterArrayList(&line, '\n', 1 << 10) catch break :source_line 0;
1006 _ = file_reader.interface.streamDelimiterEnding(&aw.writer, '\n') catch break :source_line 0;1006
1007 break :source_line try eb.addString(aw.getWritten());1007 break :source_line try eb.addString(line.items);
1008 };1008 };
10091009
1010 return .{1010 return .{
...@@ -5850,9 +5850,7 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: std.Pr...@@ -5850,9 +5850,7 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: std.Pr
58505850
5851 try child.spawn();5851 try child.spawn();
58525852
5853 var small_buffer: [1]u8 = undefined;5853 const stderr = try child.stderr.?.deprecatedReader().readAllAlloc(arena, std.math.maxInt(usize));
5854 var stderr_reader = child.stderr.?.reader(&small_buffer);
5855 const stderr = try stderr_reader.interface.allocRemaining(arena, .unlimited);
58565854
5857 const term = child.wait() catch |err| {5855 const term = child.wait() catch |err| {
5858 return comp.failCObj(c_object, "failed to spawn zig clang {s}: {s}", .{ argv.items[0], @errorName(err) });5856 return comp.failCObj(c_object, "failed to spawn zig clang {s}: {s}", .{ argv.items[0], @errorName(err) });