Skip to content

Commit 4248f32

Browse files
committed
[NFC][sanitizer] Use __builtin_extract_return_addr on all platforms
On most platforms it does nothing, so this eliminates a need for one #if.
1 parent e41c5aa commit 4248f32

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -386,13 +386,9 @@ void NORETURN CheckFailed(const char *file, int line, const char *cond,
386386
enum LinkerInitialized { LINKER_INITIALIZED = 0 };
387387

388388
#if !defined(_MSC_VER) || defined(__clang__)
389-
#if SANITIZER_S390_31
390-
# define GET_CALLER_PC() \
391-
((__sanitizer::uptr)__builtin_extract_return_addr( \
392-
__builtin_return_address(0)))
393-
#else
394-
# define GET_CALLER_PC() ((__sanitizer::uptr)__builtin_return_address(0))
395-
#endif
389+
# define GET_CALLER_PC() \
390+
((__sanitizer::uptr)__builtin_extract_return_addr( \
391+
__builtin_return_address(0)))
396392
# define GET_CURRENT_FRAME() ((__sanitizer::uptr)__builtin_frame_address(0))
397393
inline void Trap() {
398394
__builtin_trap();

0 commit comments

Comments
 (0)