This is an archive of the discontinued LLVM Phabricator instance.

Differential D78594

scudo: Change the macro used to check whether we're targeting the platform.
ClosedPublic

Authored by pcc on Apr 21 2020, 3:33 PM.

Details

Reviewers
cferris
cryptoad
Commits
rG3616e851f66e: scudo: Change the macro used to check whether we're targeting the platform.

Diff Detail

Event Timeline

pcc created this revision.Apr 21 2020, 3:33 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 21 2020, 3:33 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
Harbormaster failed remote builds in B54160: Diff 259115!Apr 21 2020, 4:49 PM
cryptoad accepted this revision.Apr 21 2020, 4:56 PM
This revision is now accepted and ready to land.Apr 21 2020, 4:56 PM
Closed by commit rG3616e851f66e: scudo: Change the macro used to check whether we're targeting the platform. (authored by pcc). · Explain WhyApr 22 2020, 10:53 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
compiler-rt/
lib/
scudo/
standalone/
7 lines

Diff 259334

compiler-rt/lib/scudo/standalone/combined.h

Show All 26 Lines
#ifdef GWP_ASAN_HOOKS #ifdef GWP_ASAN_HOOKS
#include "gwp_asan/guarded_pool_allocator.h" #include "gwp_asan/guarded_pool_allocator.h"
#include "gwp_asan/optional/backtrace.h" #include "gwp_asan/optional/backtrace.h"
#include "gwp_asan/optional/segv_handler.h" #include "gwp_asan/optional/segv_handler.h"
#endif // GWP_ASAN_HOOKS #endif // GWP_ASAN_HOOKS
extern "C" inline void EmptyCallback() {} extern "C" inline void EmptyCallback() {}
#if SCUDO_ANDROID && __ANDROID_API__ == 10000 #ifdef HAVE_ANDROID_UNSAFE_FRAME_POINTER_CHASE
// This function is not part of the NDK so it does not appear in any public // This function is not part of the NDK so it does not appear in any public
// header files. We only declare/use it when targeting the platform (i.e. API // header files. We only declare/use it when targeting the platform.
// level 10000).
extern "C" size_t android_unsafe_frame_pointer_chase(scudo::uptr *buf, extern "C" size_t android_unsafe_frame_pointer_chase(scudo::uptr *buf,
size_t num_entries); size_t num_entries);
#endif #endif
namespace scudo { namespace scudo {
enum class Option { ReleaseInterval }; enum class Option { ReleaseInterval };
▲ Show 20 Lines • Show All 180 Lines • ▼ Show 20 Lines#endif // GWP_ASAN_HOOKS
ALWAYS_INLINE void *untagPointerMaybe(void *Ptr) { ALWAYS_INLINE void *untagPointerMaybe(void *Ptr) {
if (Primary.SupportsMemoryTagging) if (Primary.SupportsMemoryTagging)
return reinterpret_cast<void *>( return reinterpret_cast<void *>(
untagPointer(reinterpret_cast<uptr>(Ptr))); untagPointer(reinterpret_cast<uptr>(Ptr)));
return Ptr; return Ptr;
} }
NOINLINE u32 collectStackTrace() { NOINLINE u32 collectStackTrace() {
#if SCUDO_ANDROID && __ANDROID_API__ == 10000 #ifdef HAVE_ANDROID_UNSAFE_FRAME_POINTER_CHASE
// Discard collectStackTrace() frame and allocator function frame. // Discard collectStackTrace() frame and allocator function frame.
constexpr uptr DiscardFrames = 2; constexpr uptr DiscardFrames = 2;
uptr Stack[MaxTraceSize + DiscardFrames]; uptr Stack[MaxTraceSize + DiscardFrames];
uptr Size = uptr Size =
android_unsafe_frame_pointer_chase(Stack, MaxTraceSize + DiscardFrames); android_unsafe_frame_pointer_chase(Stack, MaxTraceSize + DiscardFrames);
Size = Min<uptr>(Size, MaxTraceSize + DiscardFrames); Size = Min<uptr>(Size, MaxTraceSize + DiscardFrames);
return Depot.insert(Stack + Min<uptr>(DiscardFrames, Size), Stack + Size); return Depot.insert(Stack + Min<uptr>(DiscardFrames, Size), Stack + Size);
#else #else
▲ Show 20 Lines • Show All 813 Lines • Show Last 20 Lines