diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-12-18 13:51:46 +0000 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-12-18 13:51:46 +0000 |
commit | f84f696f177bddf93843c4c780e4e9718513e9bd (patch) | |
tree | 650aaa403de650b66e314a9f441b0a41b0b68353 /lib/ubsan/ubsan_handlers.h | |
parent | 4b787a08f59576b523733b556200287ea54fdc05 (diff) |
Revert r320977 "No -fsanitize=function warning when calling noexcept function through non-noexcept pointer in C++17"
At least <http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-android/
builds/6013/steps/annotate/logs/stdio> 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
Diffstat (limited to 'lib/ubsan/ubsan_handlers.h')
-rw-r--r-- | lib/ubsan/ubsan_handlers.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ubsan/ubsan_handlers.h b/lib/ubsan/ubsan_handlers.h index 4ec2592e3..311776b9f 100644 --- a/lib/ubsan/ubsan_handlers.h +++ b/lib/ubsan/ubsan_handlers.h @@ -140,12 +140,11 @@ RECOVERABLE(invalid_builtin, InvalidBuiltinData *Data) struct FunctionTypeMismatchData { SourceLocation Loc; const TypeDescriptor &Type; - ValueHandle NonNoexceptRTTI; }; RECOVERABLE(function_type_mismatch, FunctionTypeMismatchData *Data, - ValueHandle Val, ValueHandle RTTI) + ValueHandle Val) struct NonNullReturnData { SourceLocation AttrLoc; |