[PATCH] D40700: [ubsan] Diagnose noreturn functions which return (compiler-rt)
Vedant Kumar via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Nov 30 18:58:10 PST 2017
vsk created this revision.
Herald added subscribers: dberris, kubamracek.
This is a test and a wording update for the clang change: https://reviews.llvm.org/D40698
https://reviews.llvm.org/D40700
Files:
lib/ubsan/ubsan_handlers.cc
test/ubsan/TestCases/Misc/unreachable.cpp
Index: test/ubsan/TestCases/Misc/unreachable.cpp
===================================================================
--- test/ubsan/TestCases/Misc/unreachable.cpp
+++ test/ubsan/TestCases/Misc/unreachable.cpp
@@ -1,6 +1,18 @@
-// RUN: %clangxx -fsanitize=unreachable %s -O3 -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx -fsanitize=unreachable %s -O3 -o %t
+// RUN: not %run %t builtin 2>&1 | FileCheck %s -check-prefix=BUILTIN
+// RUN: not %run %t noreturn 2>&1 | FileCheck %s -check-prefix=NORETURN
+
+#include <string.h>
+
+void __attribute__((noreturn)) return_unexpectedly() {
+ // NORETURN: unreachable.cpp:[[@LINE+1]]:1: runtime error: execution reached an unreachable program point
+}
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") == 0)
+ return_unexpectedly();
+ return 0;
}
Index: lib/ubsan/ubsan_handlers.cc
===================================================================
--- lib/ubsan/ubsan_handlers.cc
+++ lib/ubsan/ubsan_handlers.cc
@@ -297,7 +297,7 @@
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) {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D40700.125070.patch
Type: text/x-patch
Size: 1756 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20171201/25415111/attachment-0001.bin>
More information about the cfe-commits
mailing list