authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-10 22:48:12-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-29 06:20:49-07:00
logd40803284e6395e7a4a065a73c9fb09d1c0ff7a8
tree785a2959cb9508b1a6491d606844a431e422ad60
parent3b346223681b40ce1271688cbe4d650a43b8e613

progress towards compiler building again

4 files changed, 41 insertions(+), 41 deletions(-)

lib/std/zig/ErrorBundle.zig+7-5
......@@ -6,12 +6,13 @@
66//! There is one special encoding for this data structure. If both arrays are
77//! empty, it means there are no errors. This special encoding exists so that
88//! heap allocation is not needed in the common case of no errors.
9const ErrorBundle = @This();
910
1011const std = @import("std");
11const ErrorBundle = @This();
12const Io = std.Io;
13const Writer = std.Io.Writer;
1214const Allocator = std.mem.Allocator;
1315const assert = std.debug.assert;
14const Writer = std.Io.Writer;
1516
1617string_bytes: []const u8,
1718/// The first thing in this array is an `ErrorMessageList`.
......@@ -156,7 +157,7 @@ pub fn nullTerminatedString(eb: ErrorBundle, index: String) [:0]const u8 {
156157}
157158
158159pub const RenderOptions = struct {
159 ttyconf: std.Io.tty.Config,
160 ttyconf: Io.tty.Config,
160161 include_reference_trace: bool = true,
161162 include_source_line: bool = true,
162163 include_log_text: bool = true,
......@@ -190,7 +191,7 @@ fn renderErrorMessageToWriter(
190191 err_msg_index: MessageIndex,
191192 w: *Writer,
192193 kind: []const u8,
193 color: std.Io.tty.Color,
194 color: Io.tty.Color,
194195 indent: usize,
195196) (Writer.Error || std.posix.UnexpectedError)!void {
196197 const ttyconf = options.ttyconf;
......@@ -320,6 +321,7 @@ fn writeMsg(eb: ErrorBundle, err_msg: ErrorMessage, w: *Writer, indent: usize) !
320321
321322pub const Wip = struct {
322323 gpa: Allocator,
324 io: Io,
323325 string_bytes: std.ArrayListUnmanaged(u8),
324326 /// The first thing in this array is a ErrorMessageList.
325327 extra: std.ArrayListUnmanaged(u32),
......@@ -806,7 +808,7 @@ pub const Wip = struct {
806808 };
807809 defer bundle.deinit(std.testing.allocator);
808810
809 const ttyconf: std.Io.tty.Config = .no_color;
811 const ttyconf: Io.tty.Config = .no_color;
810812
811813 var bundle_buf: Writer.Allocating = .init(std.testing.allocator);
812814 const bundle_bw = &bundle_buf.interface;
src/Compilation.zig+7-5
......@@ -1,7 +1,9 @@
11const Compilation = @This();
2const builtin = @import("builtin");
23
34const std = @import("std");
4const builtin = @import("builtin");
5const Io = std.Io;
6const Writer = std.Io.Writer;
57const fs = std.fs;
68const mem = std.mem;
79const Allocator = std.mem.Allocator;
......@@ -12,7 +14,6 @@ const ThreadPool = std.Thread.Pool;
1214const WaitGroup = std.Thread.WaitGroup;
1315const ErrorBundle = std.zig.ErrorBundle;
1416const fatal = std.process.fatal;
15const Writer = std.Io.Writer;
1617
1718const Value = @import("Value.zig");
1819const Type = @import("Type.zig");
......@@ -1095,6 +1096,7 @@ pub const CObject = struct {
10951096 bundle: Bundle,
10961097 notes_len: u32,
10971098 ) !ErrorBundle.ErrorMessage {
1099 const io = eb.io;
10981100 var start = diag.src_loc.offset;
10991101 var end = diag.src_loc.offset;
11001102 for (diag.src_ranges) |src_range| {
......@@ -1117,7 +1119,7 @@ pub const CObject = struct {
11171119 const file = fs.cwd().openFile(file_name, .{}) catch break :source_line 0;
11181120 defer file.close();
11191121 var buffer: [1024]u8 = undefined;
1120 var file_reader = file.reader(&buffer);
1122 var file_reader = file.reader(io, &buffer);
11211123 file_reader.seekTo(diag.src_loc.offset + 1 - diag.src_loc.column) catch break :source_line 0;
11221124 var aw: Writer.Allocating = .init(eb.gpa);
11231125 defer aw.deinit();
......@@ -1155,7 +1157,7 @@ pub const CObject = struct {
11551157 gpa.destroy(bundle);
11561158 }
11571159
1158 pub fn parse(gpa: Allocator, path: []const u8) !*Bundle {
1160 pub fn parse(gpa: Allocator, io: Io, path: []const u8) !*Bundle {
11591161 const BlockId = enum(u32) {
11601162 Meta = 8,
11611163 Diag,
......@@ -1191,7 +1193,7 @@ pub const CObject = struct {
11911193 var buffer: [1024]u8 = undefined;
11921194 const file = try fs.cwd().openFile(path, .{});
11931195 defer file.close();
1194 var file_reader = file.reader(&buffer);
1196 var file_reader = file.reader(io, &buffer);
11951197 var bc = std.zig.llvm.BitcodeReader.init(gpa, .{ .reader = &file_reader.interface });
11961198 defer bc.deinit();
11971199
src/main.zig+26-29
......@@ -319,7 +319,7 @@ fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
319319 .root_src_path = "objcopy.zig",
320320 });
321321 } else if (mem.eql(u8, cmd, "fetch")) {
322 return cmdFetch(gpa, arena, cmd_args);
322 return cmdFetch(gpa, arena, io, cmd_args);
323323 } else if (mem.eql(u8, cmd, "libc")) {
324324 return jitCmd(gpa, arena, io, cmd_args, .{
325325 .cmd_name = "libc",
......@@ -348,12 +348,14 @@ fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
348348 return;
349349 } else if (mem.eql(u8, cmd, "env")) {
350350 dev.check(.env_command);
351 const host = std.zig.resolveTargetQueryOrFatal(io, .{});
351352 var stdout_writer = fs.File.stdout().writer(&stdout_buffer);
352353 try @import("print_env.zig").cmdEnv(
353354 arena,
354355 &stdout_writer.interface,
355356 args,
356357 if (native_os == .wasi) wasi_preopens,
358 &host,
357359 );
358360 return stdout_writer.interface.flush();
359361 } else if (mem.eql(u8, cmd, "reduce")) {
......@@ -368,11 +370,11 @@ fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
368370 dev.check(.help_command);
369371 return fs.File.stdout().writeAll(usage);
370372 } else if (mem.eql(u8, cmd, "ast-check")) {
371 return cmdAstCheck(arena, cmd_args);
373 return cmdAstCheck(arena, io, cmd_args);
372374 } else if (mem.eql(u8, cmd, "detect-cpu")) {
373375 return cmdDetectCpu(io, cmd_args);
374376 } else if (build_options.enable_debug_extensions and mem.eql(u8, cmd, "changelist")) {
375 return cmdChangelist(arena, cmd_args);
377 return cmdChangelist(arena, io, cmd_args);
376378 } else if (build_options.enable_debug_extensions and mem.eql(u8, cmd, "dump-zir")) {
377379 return cmdDumpZir(arena, cmd_args);
378380 } else if (build_options.enable_debug_extensions and mem.eql(u8, cmd, "llvm-ints")) {
......@@ -741,7 +743,7 @@ const ArgMode = union(enum) {
741743const Listen = union(enum) {
742744 none,
743745 stdio: if (dev.env.supports(.stdio_listen)) void else noreturn,
744 ip4: if (dev.env.supports(.network_listen)) std.net.Ip4Address else noreturn,
746 ip4: if (dev.env.supports(.network_listen)) Io.net.Ip4Address else noreturn,
745747};
746748
747749const ArgsIterator = struct {
......@@ -1335,7 +1337,7 @@ fn buildOutputType(
13351337 const host, const port_text = mem.cutScalar(u8, next_arg, ':') orelse .{ next_arg, "14735" };
13361338 const port = std.fmt.parseInt(u16, port_text, 10) catch |err|
13371339 fatal("invalid port number: '{s}': {s}", .{ port_text, @errorName(err) });
1338 listen = .{ .ip4 = std.net.Ip4Address.parse(host, port) catch |err|
1340 listen = .{ .ip4 = Io.net.Ip4Address.parse(host, port) catch |err|
13391341 fatal("invalid host: '{s}': {s}", .{ host, @errorName(err) }) };
13401342 }
13411343 } else if (mem.eql(u8, arg, "--listen=-")) {
......@@ -3318,7 +3320,7 @@ fn buildOutputType(
33183320 var file_writer = f.writer(&.{});
33193321 var buffer: [1000]u8 = undefined;
33203322 var hasher = file_writer.interface.hashed(Cache.Hasher.init("0123456789abcdef"), &buffer);
3321 var stdin_reader = fs.File.stdin().readerStreaming(&.{});
3323 var stdin_reader = fs.File.stdin().readerStreaming(io, &.{});
33223324 _ = hasher.writer.sendFileAll(&stdin_reader, .unlimited) catch |err| switch (err) {
33233325 error.WriteFailed => fatal("failed to write {s}: {t}", .{ dump_path, file_writer.err.? }),
33243326 else => fatal("failed to pipe stdin to {s}: {t}", .{ dump_path, err }),
......@@ -3549,7 +3551,7 @@ fn buildOutputType(
35493551 switch (listen) {
35503552 .none => {},
35513553 .stdio => {
3552 var stdin_reader = fs.File.stdin().reader(&stdin_buffer);
3554 var stdin_reader = fs.File.stdin().reader(io, &stdin_buffer);
35533555 var stdout_writer = fs.File.stdout().writer(&stdout_buffer);
35543556 try serve(
35553557 io,
......@@ -3565,23 +3567,23 @@ fn buildOutputType(
35653567 return cleanExit();
35663568 },
35673569 .ip4 => |ip4_addr| {
3568 const addr: std.net.Address = .{ .in = ip4_addr };
3570 const addr: Io.net.IpAddress = .{ .ip4 = ip4_addr };
35693571
3570 var server = try addr.listen(.{
3572 var server = try addr.listen(io, .{
35713573 .reuse_address = true,
35723574 });
3573 defer server.deinit();
3575 defer server.deinit(io);
35743576
3575 const conn = try server.accept();
3576 defer conn.stream.close();
3577 var stream = try server.accept(io);
3578 defer stream.close(io);
35773579
3578 var input = conn.stream.reader(&stdin_buffer);
3579 var output = conn.stream.writer(&stdout_buffer);
3580 var input = stream.reader(io, &stdin_buffer);
3581 var output = stream.writer(io, &stdout_buffer);
35803582
35813583 try serve(
35823584 io,
35833585 comp,
3584 input.interface(),
3586 &input.interface,
35853587 &output.interface,
35863588 test_exec_args.items,
35873589 self_exe_path,
......@@ -5062,7 +5064,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8)
50625064 var http_client: if (dev.env.supports(.fetch_command)) std.http.Client else struct {
50635065 allocator: Allocator,
50645066 fn deinit(_: @This()) void {}
5065 } = .{ .allocator = gpa };
5067 } = .{ .allocator = gpa, .io = io };
50665068 defer http_client.deinit();
50675069
50685070 var unlazy_set: Package.Fetch.JobQueue.UnlazySet = .{};
......@@ -5600,7 +5602,7 @@ fn jitCmd(
56005602 try child.spawn();
56015603
56025604 if (options.capture) |ptr| {
5603 var stdout_reader = child.stdout.?.readerStreaming(&.{});
5605 var stdout_reader = child.stdout.?.readerStreaming(io, &.{});
56045606 ptr.* = try stdout_reader.interface.allocRemaining(arena, .limited(std.math.maxInt(u32)));
56055607 }
56065608
......@@ -6055,10 +6057,7 @@ const usage_ast_check =
60556057 \\
60566058;
60576059
6058fn cmdAstCheck(
6059 arena: Allocator,
6060 args: []const []const u8,
6061) !void {
6060fn cmdAstCheck(arena: Allocator, io: Io, args: []const []const u8) !void {
60626061 dev.check(.ast_check_command);
60636062
60646063 const Zir = std.zig.Zir;
......@@ -6106,7 +6105,7 @@ fn cmdAstCheck(
61066105 };
61076106 } else fs.File.stdin();
61086107 defer if (zig_source_path != null) f.close();
6109 var file_reader: fs.File.Reader = f.reader(&stdin_buffer);
6108 var file_reader: fs.File.Reader = f.reader(io, &stdin_buffer);
61106109 break :s std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch |err| {
61116110 fatal("unable to load file '{s}' for ast-check: {s}", .{ display_path, @errorName(err) });
61126111 };
......@@ -6448,10 +6447,7 @@ fn cmdDumpZir(
64486447}
64496448
64506449/// This is only enabled for debug builds.
6451fn cmdChangelist(
6452 arena: Allocator,
6453 args: []const []const u8,
6454) !void {
6450fn cmdChangelist(arena: Allocator, io: Io, args: []const []const u8) !void {
64556451 dev.check(.changelist_command);
64566452
64576453 const color: Color = .auto;
......@@ -6464,7 +6460,7 @@ fn cmdChangelist(
64646460 var f = fs.cwd().openFile(old_source_path, .{}) catch |err|
64656461 fatal("unable to open old source file '{s}': {s}", .{ old_source_path, @errorName(err) });
64666462 defer f.close();
6467 var file_reader: fs.File.Reader = f.reader(&stdin_buffer);
6463 var file_reader: fs.File.Reader = f.reader(io, &stdin_buffer);
64686464 break :source std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch |err|
64696465 fatal("unable to read old source file '{s}': {s}", .{ old_source_path, @errorName(err) });
64706466 };
......@@ -6472,7 +6468,7 @@ fn cmdChangelist(
64726468 var f = fs.cwd().openFile(new_source_path, .{}) catch |err|
64736469 fatal("unable to open new source file '{s}': {s}", .{ new_source_path, @errorName(err) });
64746470 defer f.close();
6475 var file_reader: fs.File.Reader = f.reader(&stdin_buffer);
6471 var file_reader: fs.File.Reader = f.reader(io, &stdin_buffer);
64766472 break :source std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch |err|
64776473 fatal("unable to read new source file '{s}': {s}", .{ new_source_path, @errorName(err) });
64786474 };
......@@ -6829,6 +6825,7 @@ const usage_fetch =
68296825fn cmdFetch(
68306826 gpa: Allocator,
68316827 arena: Allocator,
6828 io: Io,
68326829 args: []const []const u8,
68336830) !void {
68346831 dev.check(.fetch_command);
......@@ -6884,7 +6881,7 @@ fn cmdFetch(
68846881 try thread_pool.init(.{ .allocator = gpa });
68856882 defer thread_pool.deinit();
68866883
6887 var http_client: std.http.Client = .{ .allocator = gpa };
6884 var http_client: std.http.Client = .{ .allocator = gpa, .io = io };
68886885 defer http_client.deinit();
68896886
68906887 try http_client.initDefaultProxies(arena);
src/print_env.zig+1-2
......@@ -14,6 +14,7 @@ pub fn cmdEnv(
1414 .wasi => std.fs.wasi.Preopens,
1515 else => void,
1616 },
17 host: *const std.Target,
1718) !void {
1819 const override_lib_dir: ?[]const u8 = try EnvVar.ZIG_LIB_DIR.get(arena);
1920 const override_global_cache_dir: ?[]const u8 = try EnvVar.ZIG_GLOBAL_CACHE_DIR.get(arena);
......@@ -38,8 +39,6 @@ pub fn cmdEnv(
3839 const zig_lib_dir = dirs.zig_lib.path orelse "";
3940 const zig_std_dir = try dirs.zig_lib.join(arena, &.{"std"});
4041 const global_cache_dir = dirs.global_cache.path orelse "";
41
42 const host = try std.zig.system.resolveTargetQuery(.{});
4342 const triple = try host.zigTriple(arena);
4443
4544 var serializer: std.zon.Serializer = .{ .writer = out };