Skip to content

[Memory64] sanitizer C++ changes for 64-bit #15227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aardappel merged 1 commit into from
Oct 7, 2021
Merged

[Memory64] sanitizer C++ changes for 64-bit #15227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion system/lib/compiler-rt/lib/asan/asan_flags.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,9 @@ void InitializeFlags() {
#if SANITIZER_EMSCRIPTEN
char *options;
// Override from Emscripten Module.
// TODO: add EM_ASM_I64 and avoid using a double for a 64-bit pointer.
#define MAKE_OPTION_LOAD(parser, name) \
options = (char*) EM_ASM_INT({ \
options = (char*)(long)EM_ASM_DOUBLE({ \
Comment thread
aardappel marked this conversation as resolved.
return withBuiltinMalloc(function () { \
return allocateUTF8(Module[name] || 0); \
}); \
Expand Down
2 changes: 1 addition & 1 deletion system/lib/compiler-rt/lib/lsan/lsan_allocator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extern "C" void *memset(void *ptr, int value, uptr num);
namespace __lsan {
#if defined(__i386__) || defined(__arm__) || defined(__wasm32__)
static const uptr kMaxAllowedMallocSize = 1UL << 30;
#elif defined(__mips64) || defined(__aarch64__)
#elif defined(__mips64) || defined(__aarch64__) || defined(__wasm64__)
static const uptr kMaxAllowedMallocSize = 4UL << 30;
#else
static const uptr kMaxAllowedMallocSize = 8UL << 30;
Expand Down
2 changes: 1 addition & 1 deletion system/lib/compiler-rt/lib/lsan/lsan_allocator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct ChunkMetadata {
};

#if defined(__mips64) || defined(__aarch64__) || defined(__i386__) || \
defined(__arm__) || defined(__wasm32__)
defined(__arm__) || defined(__wasm__)
static const uptr kRegionSizeLog = 20;
static const uptr kNumRegions = SANITIZER_MMAP_RANGE_SIZE >> kRegionSizeLog;
template <typename AddressSpaceView>
Expand Down
2 changes: 1 addition & 1 deletion system/lib/compiler-rt/lib/sanitizer_common/sanitizer_emscripten.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
namespace __sanitizer {

extern "C" {
int emscripten_get_module_name(char *buf, uptr length);
uptr emscripten_get_module_name(char *buf, uptr length);
}

void ListOfModules::init() {
Expand Down