Skip to content

Commit 438d3d5

Browse files
committed
Revert the actual changes.
1 parent 66e7129 commit 438d3d5

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

compiler-rt/lib/ubsan_minimal/ubsan_minimal_handlers.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static void abort_with_message(const char *msg) {
4949
static void abort_with_message(const char *) { abort(); }
5050
#endif
5151

52-
SANITIZER_INTERFACE_WEAK_DEF(void, __ubsan_report_error, const char *msg,
52+
__attribute__((noinline)) static void report_error(const char *msg,
5353
uintptr_t caller, int abort) {
5454
if (caller == 0)
5555
return;
@@ -110,12 +110,12 @@ void NORETURN CheckFailed(const char *file, int, const char *cond, u64, u64) {
110110

111111
#define HANDLER_RECOVER(name, msg) \
112112
INTERFACE void __ubsan_handle_##name##_minimal() { \
113-
__ubsan_report_error(msg, GET_CALLER_PC(), 0); \
113+
report_error(msg, GET_CALLER_PC(), 0); \
114114
}
115115

116116
#define HANDLER_NORECOVER(name, msg) \
117117
INTERFACE void __ubsan_handle_##name##_minimal_abort() { \
118-
__ubsan_report_error(msg, GET_CALLER_PC(), 1); \
118+
report_error(msg, GET_CALLER_PC(), 1); \
119119
}
120120

121121
#define HANDLER(name, msg) \

compiler-rt/test/ubsan_minimal/TestCases/override-callback.c

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)