Skip to content

Commit f76f240

Browse files
committed
Re-enable SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO
The logic of this macro was inverted when the llvm-12 update to compiler-rt (#14280). This caused asan.test_setjmp_noleak to start failing. Its not clear it we want to keep this long term but restoring it at least fixes the failing test. See #14360
1 parent 33bec77 commit f76f240

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

system/lib/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@
493493

494494
#define SANITIZER_INTERCEPT_MMAP SI_POSIX
495495
#define SANITIZER_INTERCEPT_MMAP64 SI_LINUX_NOT_ANDROID
496-
#define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO (SI_GLIBC || SI_ANDROID)
496+
#define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO (SI_GLIBC || SI_ANDROID || SI_EMSCRIPTEN)
497497
#define SANITIZER_INTERCEPT_MEMALIGN \
498498
(!SI_FREEBSD && !SI_MAC && !SI_NETBSD && SI_NOT_RTEMS)
499499
#define SANITIZER_INTERCEPT___LIBC_MEMALIGN SI_GLIBC

0 commit comments

Comments
 (0)