Commit fffece1533d37b917c6e301c984c1cb3eb0040e4 | zig

author	Luuk de Gram <luuk@degram.dev> 2022-08-23 12:45:12+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2022-08-29 18:23:14-04:00
log	fffece1533d37b917c6e301c984c1cb3eb0040e4
tree	f36bab534acfbf1362a48b5adeafb0a799913b09
parent	d2d42cf7ba5d965786d4bfb2fdc61dbd9a0d2ae5

wasm-lld: set stack size to 1MB by default

Regardless of the build mode (build-exe, build-lib), always
set the default stack size to 1MB. Previously, this was only
done when using build-exe, making the inconsistancy confusing.
The user can still override this behavior by providing the
`--stack <size>` flag.

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

src
- link
  - Wasm.zig

src/link/Wasm.zig+8-13

 @@ -2836,24 +2836,19 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation, prog_node: *std.Progress.Node) !
             try argv.append(entry);
         }
-        if (self.base.options.output_mode == .Exe) {
+        // Increase the default stack size to a more reasonable value of 1MB instead of
-            // Increase the default stack size to a more reasonable value of 1MB instead of
+        // the default of 1 Wasm page being 64KB, unless overridden by the user.
-            // the default of 1 Wasm page being 64KB, unless overridden by the user.
+        try argv.append("-z");
-            try argv.append("-z");
+        const stack_size = self.base.options.stack_size_override orelse wasm.page_size * 16;
-            const stack_size = self.base.options.stack_size_override orelse 1048576;
+        const arg = try std.fmt.allocPrint(arena, "stack-size={d}", .{stack_size});
-            const arg = try std.fmt.allocPrint(arena, "stack-size={d}", .{stack_size});
+        try argv.append(arg);
-            try argv.append(arg);
+        if (self.base.options.output_mode == .Exe) {
             if (self.base.options.wasi_exec_model == .reactor) {
                 // Reactor execution model does not have _start so lld doesn't look for it.
                 try argv.append("--no-entry");
             }
-        } else {
+        } else if (self.base.options.entry == null) {
-            if (self.base.options.stack_size_override) |stack_size| {
-                try argv.append("-z");
-                const arg = try std.fmt.allocPrint(arena, "stack-size={d}", .{stack_size});
-                try argv.append(arg);
-            }
             try argv.append("--no-entry"); // So lld doesn't look for _start.
         }
         try argv.appendSlice(&[_][]const u8{