diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-10-20 14:50:07 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-10-20 15:34:10 -0700 |
| commit | 361217bda2b4ce397a2b49ab7613162d1abcab67 (patch) | |
| tree | bcaaada7ab445f6eaa7724557adb6f3b365a72c4 /lib | |
| parent | d949180ab04f550d672e20a8f9bdd6619cc3c05c (diff) | |
| download | zig-361217bda2b4ce397a2b49ab7613162d1abcab67.tar.gz zig-361217bda2b4ce397a2b49ab7613162d1abcab67.zip | |
stage2: fix inline assembly with expression output
Thanks @g-w1 for the print_air.zig implementation for inline assembly. I
copied it and slightly modified it from your open pull request.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/std/heap.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/std/heap.zig b/lib/std/heap.zig index 47d964c239..fcea90d751 100644 --- a/lib/std/heap.zig +++ b/lib/std/heap.zig @@ -295,7 +295,7 @@ const PageAllocator = struct { } } - const max_drop_len = alignment - std.math.min(alignment, mem.page_size); + const max_drop_len = alignment - @minimum(alignment, mem.page_size); const alloc_len = if (max_drop_len <= aligned_len - n) aligned_len else @@ -529,7 +529,7 @@ const WasmPageAllocator = struct { fn freePages(start: usize, end: usize) void { if (start < extendedOffset()) { - conventional.recycle(start, std.math.min(extendedOffset(), end) - start); + conventional.recycle(start, @minimum(extendedOffset(), end) - start); } if (end > extendedOffset()) { var new_end = end; |
