New upstream version 1.12.0+dfsg1

[rustc.git] / src / compiler-rt / lib / ubsan / ubsan_handlers.h

diff --git a/src/compiler-rt/lib/ubsan/ubsan_handlers.h b/src/compiler-rt/lib/ubsan/ubsan_handlers.h
index 6f309cf9aaa944e2478eb27b433a405dde3e5a71..e0cfd5b7057d8080a317085e7ddf22cd7bb2ca57 100644 (file)
--- a/src/compiler-rt/lib/ubsan/ubsan_handlers.h
+++ b/src/compiler-rt/lib/ubsan/ubsan_handlers.h
@@ -148,14 +148,25 @@ struct NonNullArgData {
 /// \brief Handle passing null pointer to function with nonnull attribute.
 RECOVERABLE(nonnull_arg, NonNullArgData *Data)
 
-struct CFIBadIcallData {
+/// \brief Known CFI check kinds.
+/// Keep in sync with the enum of the same name in CodeGenFunction.h
+enum CFITypeCheckKind : unsigned char {
+  CFITCK_VCall,
+  CFITCK_NVCall,
+  CFITCK_DerivedCast,
+  CFITCK_UnrelatedCast,
+  CFITCK_ICall,
+};
+
+struct CFICheckFailData {
+  CFITypeCheckKind CheckKind;
   SourceLocation Loc;
   const TypeDescriptor &Type;
 };
 
-/// \brief Handle control flow integrity failure for indirect function calls.
-RECOVERABLE(cfi_bad_icall, CFIBadIcallData *Data, ValueHandle Function)
-
+/// \brief Handle control flow integrity failures.
+RECOVERABLE(cfi_check_fail, CFICheckFailData *Data, ValueHandle Function,
+            uptr VtableIsValid)
 }
 
 #endif // UBSAN_HANDLERS_H