From f84f696f177bddf93843c4c780e4e9718513e9bd Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
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 <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
---
 lib/ubsan/ubsan_handlers.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/ubsan/ubsan_handlers.h')

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;
-- 
cgit v1.2.3