This is an archive of the discontinued LLVM Phabricator instance.

Differential D93970

[sanitizer] Enable mallopt and mallinfo interceptors on Android after D93848
ClosedPublic

Authored by MaskRay on Jan 1 2021, 2:11 PM.

Details

Reviewers
aeubanks
vitalybuka
Commits
rG34489da81b39: [sanitizer] Enable mallopt and mallinfo interceptors on Android after D93848

Diff Detail

Event Timeline

MaskRay requested review of this revision.Jan 1 2021, 2:11 PM
MaskRay created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJan 1 2021, 2:11 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
MaskRay mentioned this in D93848: [sanitizer] Define SANITIZER_GLIBC to refine SANITIZER_LINUX feature detection and support musl.Jan 1 2021, 2:14 PM
aeubanks accepted this revision.Jan 1 2021, 2:41 PM

Confirmed that this fixes it, thanks!

This revision is now accepted and ready to land.Jan 1 2021, 2:41 PM
Harbormaster completed remote builds in B83813: Diff 314232.Jan 1 2021, 2:41 PM
Closed by commit rG34489da81b39: [sanitizer] Enable mallopt and mallinfo interceptors on Android after D93848 (authored by MaskRay). · Explain WhyJan 1 2021, 2:43 PM
This revision was automatically updated to reflect the committed changes.
MaskRay added a commit: rG34489da81b39: [sanitizer] Enable mallopt and mallinfo interceptors on Android after D93848.
thakis added a reverting change: rGfe9976c02c09: Revert "[sanitizer] Define SANITIZER_GLIBC to refine SANITIZER_LINUX feature….Jan 2 2021, 4:00 PM

Revision Contents

PathSize
compiler-rt/
lib/
sanitizer_common/
2 lines

Diff 314233

compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h

Show First 20 Lines • Show All 475 Lines • ▼ Show 20 Lines
#define SANITIZER_INTERCEPT_UTMPX \ #define SANITIZER_INTERCEPT_UTMPX \
(SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD) (SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD)
#define SANITIZER_INTERCEPT_GETLOADAVG \ #define SANITIZER_INTERCEPT_GETLOADAVG \
(SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD) (SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD)
#define SANITIZER_INTERCEPT_MMAP SI_POSIX #define SANITIZER_INTERCEPT_MMAP SI_POSIX
#define SANITIZER_INTERCEPT_MMAP64 SI_LINUX_NOT_ANDROID #define SANITIZER_INTERCEPT_MMAP64 SI_LINUX_NOT_ANDROID
#define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO SI_GLIBC #define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO (SI_GLIBC || SI_ANDROID)
#define SANITIZER_INTERCEPT_MEMALIGN \ #define SANITIZER_INTERCEPT_MEMALIGN \
(!SI_FREEBSD && !SI_MAC && !SI_NETBSD && SI_NOT_RTEMS) (!SI_FREEBSD && !SI_MAC && !SI_NETBSD && SI_NOT_RTEMS)
#define SANITIZER_INTERCEPT___LIBC_MEMALIGN SI_GLIBC #define SANITIZER_INTERCEPT___LIBC_MEMALIGN SI_GLIBC
#define SANITIZER_INTERCEPT_PVALLOC (SI_GLIBC || SI_ANDROID) #define SANITIZER_INTERCEPT_PVALLOC (SI_GLIBC || SI_ANDROID)
#define SANITIZER_INTERCEPT_CFREE SI_GLIBC #define SANITIZER_INTERCEPT_CFREE SI_GLIBC
#define SANITIZER_INTERCEPT_REALLOCARRAY SI_POSIX #define SANITIZER_INTERCEPT_REALLOCARRAY SI_POSIX
#define SANITIZER_INTERCEPT_ALIGNED_ALLOC (!SI_MAC && SI_NOT_RTEMS) #define SANITIZER_INTERCEPT_ALIGNED_ALLOC (!SI_MAC && SI_NOT_RTEMS)
#define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC && !SI_NETBSD) #define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC && !SI_NETBSD)
▲ Show 20 Lines • Show All 96 Lines • Show Last 20 Lines