Commit 6716bf52e70791104caf057af3fece674f0ac3dd | zig

author	Pavel Verigo <paul.verigo@gmail.com> 2026-08-17 11:08:23+02:00
committer	Pavel Verigo <paul.verigo@gmail.com> 2026-08-17 11:08:23+02:00
log	6716bf52e70791104caf057af3fece674f0ac3dd
tree	e03eb1aeb75bfb8d6e5070f94bd7a5186e5c90e1
parent	7b02ab758845d553ef4399548274ef2e23eaeb2f
parent	46af37a1ad8bcff989ae18624b02760ab7a5bfa5

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/36534

5 files changed, 73 insertions(+), 7 deletions(-)

build.zig+1-1

...	@@ -772,7 +772,7 @@ pub fn build(b: *std.Build) !void {	...	@@ -772,7 +772,7 @@ pub fn build(b: *std.Build) !void {
772	}	772	}
773		773
774	const test_incremental_step = b.step("test-incremental", "Run the incremental compilation test cases");	774	const test_incremental_step = b.step("test-incremental", "Run the incremental compilation test cases");
775	try tests.addIncrementalTests(b, test_incremental_step, test_filters);	775	try tests.addIncrementalTests(b, test_incremental_step, test_filters, test_target_filters);
776	if (!skip_test_incremental) test_step.dependOn(test_incremental_step);	776	if (!skip_test_incremental) test_step.dependOn(test_incremental_step);
777		777
778	if (tests.addLibcTestNszTests(b, .{	778	if (tests.addLibcTestNszTests(b, .{

src/link/Wasm.zig-3

 @@ -3754,9 +3754,6 @@ pub fn updateExports(
     const ip = &zcu.intern_pool;
     const is_obj = wasm.base.comp.config.output_mode == .Obj;
-    wasm.nav_exports.clearRetainingCapacity();
-    wasm.uav_exports.clearRetainingCapacity();
     for (export_indices) |export_idx| {
         const exp = export_idx.ptr(zcu);
         const name_slice = exp.opts.name.toSlice(ip);

src/link/Wasm/Flush.zig+9

 @@ -249,6 +249,7 @@ pub fn finish(f: *Flush, wasm: *Wasm) !void {
     };
     const is_obj = comp.config.output_mode == .Obj;
     const allow_undefined = is_obj or wasm.import_symbols;
+    const zcu_references = if (comp.zcu) |zcu| try zcu.resolveReferences() else null;
     const entry_name = if (wasm.entry_resolution.isNavOrUnresolved(wasm)) wasm.entry_name else .none;
 @@ -1223,6 +1224,14 @@ pub fn finish(f: *Flush, wasm: *Wasm) !void {
                         try emitTagIndexFunction(wasm, binary_bytes, ip_index);
                     },
                     else => {
+                        if (!zcu_references.?.contains(.wrap(.{ .func = ip_index }))) {
+                            try binary_bytes.appendSlice(gpa, &.{
+                                0, // no locals
+                                @backingInt(std.wasm.Opcode.@"unreachable"),
+                                @backingInt(std.wasm.Opcode.end),
+                            });
+                            continue;
+                        }
                         const func = i.value(wasm).function;
                         const mir: Mir = .{
                             .instructions = wasm.mir_instructions.slice().subslice(func.instructions_off, func.instructions_len),

test/incremental/remove_function_with_changed_callee created+50

...	@@ -0,0 +1,50 @@
1	#update=initial version
2	#file=main.zig
3	const std = @import("std");
4	const io = std.Io.Threaded.global_single_threaded.io();
5
6	const A = enum(u32) {
7	zero,
8	one,
9	};
10
11	fn foo() !void {
12	try bar(.zero);
13	}
14
15	fn bar(a: A) !void {
16	const msg = switch (a) {
17	.zero => "0",
18	.one => "1",
19	};
20	try std.Io.File.stdout().writeStreamingAll(io, msg);
21	}
22
23	pub fn main() !void {
24	try foo();
25	}
26	#expect_stdout="0"
27	#update=remove foo and change bar wasm function type
28	#file=main.zig
29	//! This update must preserve `bar` `InternPool.Index` value, while changing its wasm function type.
30	//! If `foo` code is preserved in the binary without any changes, wasm type checking will fail.
31	const std = @import("std");
32	const io = std.Io.Threaded.global_single_threaded.io();
33
34	const A = enum(u64) {
35	zero,
36	one,
37	};
38
39	fn bar(a: A) !void {
40	const msg = switch (a) {
41	.zero => "0",
42	.one => "1",
43	};
44	try std.Io.File.stdout().writeStreamingAll(io, msg);
45	}
46
47	pub fn main() !void {
48	try bar(.one);
49	}
50	#expect_stdout="1"

test/tests.zig+13-3

 @@ -2266,8 +2266,7 @@ const incremental_targets: []const []const u8 = &.{
     "x86_64-linux-selfhosted",
     // https://codeberg.org/ziglang/zig/issues/31773
     //"x86_64-windows-selfhosted",
-    // https://codeberg.org/ziglang/zig/issues/31810
+    "wasm32-wasi-selfhosted",
-    //"wasm32-wasi-selfhosted",
 };
 fn compatible32bitArch(host: *const std.Target) ?std.Target.Cpu.Arch {
 @@ -3282,7 +3281,12 @@ pub fn addDebuggerTests(b: *std.Build, options: DebuggerContext.Options) ?*Step
     return step;
 }
-pub fn addIncrementalTests(b: *std.Build, test_step: *Step, test_filters: []const []const u8) !void {
+pub fn addIncrementalTests(
+    b: *std.Build,
+    test_step: *Step,
+    test_filters: []const []const u8,
+    test_target_filters: []const []const u8,
+) !void {
     const io = b.graph.io;
     const incr_check = b.addExecutable(.{
 @@ -3317,6 +3321,12 @@ pub fn addIncrementalTests(b: *std.Build, test_step: *Step, test_filters: []cons
         b.dependOnFileContents(b.path(b.pathJoin(&.{ "test", "incremental", entry.path })));
         for (incremental_targets) |target_str| {
+            if (test_target_filters.len > 0) {
+                for (test_target_filters) |filter| {
+                    if (std.mem.find(u8, target_str, filter) != null) break;
+                } else continue;
+            }
             const run = b.addRunArtifact(incr_check);
             run.setName(b.fmt("incr-check {s} '{s}'", .{ target_str, entry.basename }));