diff options
| -rw-r--r-- | lib/ubsan/ubsan_handlers.cc | 2 | ||||
| -rw-r--r-- | test/ubsan/TestCases/Misc/Inputs/returns-unexpectedly.c | 1 | ||||
| -rw-r--r-- | test/ubsan/TestCases/Misc/unreachable.cpp | 25 |
3 files changed, 24 insertions, 4 deletions
diff --git a/lib/ubsan/ubsan_handlers.cc b/lib/ubsan/ubsan_handlers.cc index 1112ce1cc..f674c027c 100644 --- a/lib/ubsan/ubsan_handlers.cc +++ b/lib/ubsan/ubsan_handlers.cc @@ -297,7 +297,7 @@ void __ubsan::__ubsan_handle_out_of_bounds_abort(OutOfBoundsData *Data, static void handleBuiltinUnreachableImpl(UnreachableData *Data, ReportOptions Opts) { ScopedReport R(Opts, Data->Loc, ErrorType::UnreachableCall); - Diag(Data->Loc, DL_Error, "execution reached a __builtin_unreachable() call"); + Diag(Data->Loc, DL_Error, "execution reached an unreachable program point"); } void __ubsan::__ubsan_handle_builtin_unreachable(UnreachableData *Data) { diff --git a/test/ubsan/TestCases/Misc/Inputs/returns-unexpectedly.c b/test/ubsan/TestCases/Misc/Inputs/returns-unexpectedly.c new file mode 100644 index 000000000..826ea0ca4 --- /dev/null +++ b/test/ubsan/TestCases/Misc/Inputs/returns-unexpectedly.c @@ -0,0 +1 @@ +void returns_unexpectedly() {} diff --git a/test/ubsan/TestCases/Misc/unreachable.cpp b/test/ubsan/TestCases/Misc/unreachable.cpp index e1206edb3..1b096721c 100644 --- a/test/ubsan/TestCases/Misc/unreachable.cpp +++ b/test/ubsan/TestCases/Misc/unreachable.cpp @@ -1,6 +1,25 @@ -// RUN: %clangxx -fsanitize=unreachable %s -O3 -o %t && not %run %t 2>&1 | FileCheck %s +// RUN: %clang %S/Inputs/returns-unexpectedly.c -O3 -c -o %t.ru.o +// RUN: %clangxx -fsanitize=unreachable -O3 -o %t %s %t.ru.o +// RUN: not %run %t builtin 2>&1 | FileCheck %s -check-prefix=BUILTIN +// RUN: not %run %t noreturn-callee-marked 2>&1 | FileCheck %s -check-prefix=NORETURN1 +// RUN: not %run %t noreturn-caller-marked 2>&1 | FileCheck %s -check-prefix=NORETURN2 + +#include <string.h> + +void __attribute__((noreturn)) callee_marked_noreturn() { + // NORETURN1: unreachable.cpp:[[@LINE+1]]:1: runtime error: execution reached an unreachable program point +} + +extern "C" void __attribute__((noreturn)) returns_unexpectedly(); int main(int, char **argv) { - // CHECK: unreachable.cpp:5:3: runtime error: execution reached a __builtin_unreachable() call - __builtin_unreachable(); + if (strcmp(argv[1], "builtin") == 0) + // BUILTIN: unreachable.cpp:[[@LINE+1]]:5: runtime error: execution reached an unreachable program point + __builtin_unreachable(); + else if (strcmp(argv[1], "noreturn-callee-marked") == 0) + callee_marked_noreturn(); + else if (strcmp(argv[1], "noreturn-caller-marked") == 0) + // NORETURN2: unreachable.cpp:[[@LINE+1]]:5: runtime error: execution reached an unreachable program point + returns_unexpectedly(); + return 0; } |