Commit 744bb5d16a
Changed files (5)
test
link
wasm
export
function-table
src/link/Wasm/Flush.zig
@@ -210,9 +210,8 @@ pub fn finish(f: *Flush, wasm: *Wasm) !void {
const function_index = Wasm.FunctionIndex.fromIpNav(wasm, nav_export.nav_index).?;
const explicit = f.missing_exports.swapRemove(nav_export.name);
const is_hidden = !explicit and switch (export_index.ptr(zcu).opts.visibility) {
- .protected => false,
.hidden => true,
- .default => !comp.config.rdynamic,
+ .default, .protected => false,
};
if (is_hidden) {
try wasm.hidden_function_exports.put(gpa, nav_export.name, function_index);
src/link/Wasm.zig
@@ -3502,7 +3502,7 @@ fn markFunction(wasm: *Wasm, i: ObjectFunctionIndex, override_export: bool) link
if (!is_obj and (override_export or function.flags.isExported(rdynamic))) {
const symbol_name = function.name.unwrap().?;
- if (function.flags.visibility_hidden) {
+ if (!override_export and function.flags.visibility_hidden) {
try wasm.hidden_function_exports.put(gpa, symbol_name, @enumFromInt(gop.index));
} else {
try wasm.function_exports.put(gpa, symbol_name, @enumFromInt(gop.index));
test/link/wasm/export/build.zig
@@ -11,7 +11,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
const no_export = b.addExecutable(.{
.name = "no-export",
.root_module = b.createModule(.{
- .root_source_file = b.path("main.zig"),
+ .root_source_file = b.path("main-hidden.zig"),
.optimize = optimize,
.target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
}),
@@ -36,7 +36,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
const force_export = b.addExecutable(.{
.name = "force",
.root_module = b.createModule(.{
- .root_source_file = b.path("main.zig"),
+ .root_source_file = b.path("main-hidden.zig"),
.optimize = optimize,
.target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
}),
test/link/wasm/function-table/build.zig
@@ -40,7 +40,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
check_export.checkInHeaders();
check_export.checkExact("Section export");
- check_export.checkExact("entries 2");
+ check_export.checkExact("entries 3");
check_export.checkExact("name __indirect_function_table"); // as per linker specification
check_export.checkExact("kind table");