replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ubsan] Diagnose noreturn functions which return (compiler-rt) 

This is paired with the clang change: https://reviews.llvm.org/D40698

Differential Revision: https://reviews.llvm.org/D40700

llvm-svn: 321232
This commit is contained in:
Vedant Kumar 2017-12-21 00:10:36 +00:00
parent 09b5bfdd85
commit 8f4976bb7b
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler-rt/lib/ubsan/ubsan_handlers.cc
View File

@ -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) {

1
compiler-rt/test/ubsan/TestCases/Misc/Inputs/returns-unexpectedly.c Normal file
View File

@ -0,0 +1 @@
void returns_unexpectedly() {}

25
compiler-rt/test/ubsan/TestCases/Misc/unreachable.cpp
View File

@ -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;
}