Mac doesn't support MMAP_MAP_32BIT so this condition ends up asserting. #3755
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wenyongh
reviewed
Aug 28, 2024
core/iwasm/aot/aot_loader.c
Outdated
| @@ -302,7 +302,7 @@ loader_mmap(uint32 size, bool prot_exec, char *error_buf, uint32 error_buf_size) | |||
| int map_flags; | |||
| void *mem; | |||
|
|
|||
| #if UINTPTR_MAX == UINT64_MAX | |||
| #if UINTPTR_MAX == UINT64_MAX && (!defined(__APPLE__) || !defined(__arm64__)) | |||
There was a problem hiding this comment.
The MMAP_MAP_32BIT is only handled when the target is x86-64 or riscv64, and __APPLE__ isn't defined. See posix os_mmap:
https://github.com/bytecodealliance/wasm-micro-runtime/blob/main/core/shared/platform/common/posix/posix_memmap.c#L83-L98
How about changing to:
#if defined(BUILD_TARGET_X86_64) || defined(BUILD_TARGET_AMD_64) \
|| defined(BUILD_TARGET_RISCV64_LP64D) \
|| defined(BUILD_TARGET_RISCV64_LP64)
#ifndef __APPLE__
...
#endif
#endifThere was a problem hiding this comment.
Makes sense to me. Updated now.
condition will end up asserting on the ones where it isn't supported.
wenyongh
approved these changes
Aug 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mac on aarch64 uses posix_memmap.c which doesn't do anything with the flag MMAP_MAP_32BIT for that build so this condition ends up asserting unless the mapping ends up in the first 4 gigs worth of addressable space. Not entirely what problems not guaranteeing the mapping to be in that range will cause but as of now it asserts for me every time. It appears the usage of MAP_32BIT isn't functional after MacOS 13 (if I understand this thread correctly #3009)