From f84f696f177bddf93843c4c780e4e9718513e9bd Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 18 Dec 2017 13:51:46 +0000 Subject: Revert r320977 "No -fsanitize=function warning when calling noexcept function through non-noexcept pointer in C++17" At least complains about __ubsan::__ubsan_handle_function_type_mismatch_abort (compiler-rt lib/ubsan/ubsan_handlers.cc) returning now despite being declared 'noreturn', so looks like a different approach is needed for the function_type_mismatch check to be called also in cases that may ultimately succeed. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@320981 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../TestCases/TypeCheck/Function/function.cpp | 40 +--------------------- 1 file changed, 1 insertion(+), 39 deletions(-) (limited to 'test') diff --git a/test/ubsan/TestCases/TypeCheck/Function/function.cpp b/test/ubsan/TestCases/TypeCheck/Function/function.cpp index 409eeb2ff..25b2bdc32 100644 --- a/test/ubsan/TestCases/TypeCheck/Function/function.cpp +++ b/test/ubsan/TestCases/TypeCheck/Function/function.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -std=c++17 -fsanitize=function %s -O3 -g -o %t +// RUN: %clangxx -fsanitize=function %s -O3 -g -o %t // RUN: %run %t 2>&1 | FileCheck %s // Verify that we can disable symbolization if needed: // RUN: %env_ubsan_opts=symbolize=0 %run %t 2>&1 | FileCheck %s --check-prefix=NOSYM @@ -23,47 +23,9 @@ void make_invalid_call() { reinterpret_cast(reinterpret_cast(f))(42); } -void f1(int) {} -void f2(unsigned int) {} -void f3(int) noexcept {} -void f4(unsigned int) noexcept {} - -void check_noexcept_calls() { - void (*p1)(int); - p1 = &f1; - p1(0); - p1 = reinterpret_cast(&f2); - // CHECK: function.cpp:[[@LINE+2]]:3: runtime error: call to function f2(unsigned int) through pointer to incorrect function type 'void (*)(int)' - // NOSYM: function.cpp:[[@LINE+1]]:3: runtime error: call to function (unknown) through pointer to incorrect function type 'void (*)(int)' - p1(0); - p1 = &f3; - p1(0); - p1 = reinterpret_cast(&f4); - // CHECK: function.cpp:[[@LINE+2]]:3: runtime error: call to function f4(unsigned int) through pointer to incorrect function type 'void (*)(int)' - // NOSYM: function.cpp:[[@LINE+1]]:3: runtime error: call to function (unknown) through pointer to incorrect function type 'void (*)(int)' - p1(0); - - void (*p2)(int) noexcept; - p2 = reinterpret_cast(&f1); - // CHECK: function.cpp:[[@LINE+2]]:3: runtime error: call to function f1(int) through pointer to incorrect function type 'void (*)(int) noexcept' - // NOSYM: function.cpp:[[@LINE+1]]:3: runtime error: call to function (unknown) through pointer to incorrect function type 'void (*)(int) noexcept' - p2(0); - p2 = reinterpret_cast(&f2); - // CHECK: function.cpp:[[@LINE+2]]:3: runtime error: call to function f2(unsigned int) through pointer to incorrect function type 'void (*)(int) noexcept' - // NOSYM: function.cpp:[[@LINE+1]]:3: runtime error: call to function (unknown) through pointer to incorrect function type 'void (*)(int) noexcept' - p2(0); - p2 = &f3; - p2(0); - p2 = reinterpret_cast(&f4); - // CHECK: function.cpp:[[@LINE+2]]:3: runtime error: call to function f4(unsigned int) through pointer to incorrect function type 'void (*)(int) noexcept' - // NOSYM: function.cpp:[[@LINE+1]]:3: runtime error: call to function (unknown) through pointer to incorrect function type 'void (*)(int) noexcept' - p2(0); -} - int main(void) { make_valid_call(); make_invalid_call(); - check_noexcept_calls(); // Check that no more errors will be printed. // CHECK-NOT: runtime error: call to function // NOSYM-NOT: runtime error: call to function -- cgit v1.2.3