authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-06-02 13:04:02+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-06-09 00:22:17-04:00
log146be2a8cb3272673a99050351b5f394fd1de30b
treec1d0b43644c6d890c4451cabb5bfaa5fad1e0ec7
parent601e831f1d15ba5c8f89fbab265a72bfabb6af96

Use builtins in std.heap.WasmAllocator

1 files changed, 1 insertions(+), 6 deletions(-)

lib/std/heap.zig+1-6
...@@ -250,11 +250,6 @@ const PageAllocator = struct {...@@ -250,11 +250,6 @@ const PageAllocator = struct {
250 }250 }
251};251};
252252
253// TODO Exposed LLVM intrinsics is a bug
254// See: https://github.com/ziglang/zig/issues/2291
255extern fn @"llvm.wasm.memory.size.i32"(u32) u32;
256extern fn @"llvm.wasm.memory.grow.i32"(u32, u32) i32;
257
258const WasmPageAllocator = struct {253const WasmPageAllocator = struct {
259 comptime {254 comptime {
260 if (!std.Target.current.isWasm()) {255 if (!std.Target.current.isWasm()) {
...@@ -357,7 +352,7 @@ const WasmPageAllocator = struct {...@@ -357,7 +352,7 @@ const WasmPageAllocator = struct {
357 return idx + extendedOffset();352 return idx + extendedOffset();
358 }353 }
359354
360 const prev_page_count = @"llvm.wasm.memory.grow.i32"(0, @intCast(u32, page_count));355 const prev_page_count = @wasmMemoryGrow(@intCast(u32, page_count));
361 if (prev_page_count <= 0) {356 if (prev_page_count <= 0) {
362 return error.OutOfMemory;357 return error.OutOfMemory;
363 }358 }