[llvm-branch-commits] [clang] [Clang][CFI] Skip unused diagnostic data in trap and minimal-runtime vtable checks (PR #241640)

Vitaly Buka via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Wed Nov 11 23:24:06 PST 2026


https://github.com/vitalybuka updated https://github.com/llvm/llvm-project/pull/241640

>From d828eda58f3c88723dd2b64940823e0bb246878c Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Wed, 11 Nov 2026 19:05:25 -0800
Subject: [PATCH] [spr] update

Created using spr 2.0.0-beta.2
---
 clang/lib/CodeGen/CGClass.cpp                 | 22 +++--
 .../cfi-vcall-trap-recover-runtime.cpp        | 69 +++++++--------
 .../cfi-vcall-type-checked-load.cpp           | 84 +++++++++----------
 clang/test/CodeGenCXX/cfi-vtable-check.cpp    | 29 +++----
 4 files changed, 104 insertions(+), 100 deletions(-)

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 8bba99f0548aa3..4c57f92cf84ae1 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -2945,25 +2945,31 @@ void CodeGenFunction::EmitVTableCheck(CFITypeCheckKind TCK, CanQualType T,
   auto [M, SSK] = SanitizerInfoFromCFICheckKind(TCK);
   EmitSanitizerStatReport(SSK);
 
+  llvm::ConstantInt *CrossDsoTypeId =
+      UseCrossDsoSlowPath ? CGM.CreateCrossDsoCfiTypeId(MD) : nullptr;
+  if (!CrossDsoTypeId && (CGM.getCodeGenOpts().SanitizeTrap.has(M) ||
+                          CGM.getCodeGenOpts().SanitizeMinimalRuntime)) {
+    EmitCheck(std::make_pair(TypeTest, M), SanitizerHandler::CFICheckFail, {},
+              {});
+    return;
+  }
+
+  if (CGM.getCodeGenOpts().SanitizeTrap.has(M)) {
+    EmitCfiSlowPathCheck(M, TypeTest, CrossDsoTypeId, VTable, {});
+    return;
+  }
+
   llvm::Constant *StaticData[] = {
       llvm::ConstantInt::get(Int8Ty, TCK),
       EmitCheckSourceLocation(Loc),
       EmitCheckTypeDescriptor(T),
   };
 
-  llvm::ConstantInt *CrossDsoTypeId =
-      UseCrossDsoSlowPath ? CGM.CreateCrossDsoCfiTypeId(MD) : nullptr;
   if (CrossDsoTypeId) {
     EmitCfiSlowPathCheck(M, TypeTest, CrossDsoTypeId, VTable, StaticData);
     return;
   }
 
-  if (CGM.getCodeGenOpts().SanitizeTrap.has(M)) {
-    bool NoMerge = !CGM.getCodeGenOpts().SanitizeMergeHandlers.has(M);
-    EmitTrapCheck(TypeTest, SanitizerHandler::CFICheckFail, NoMerge);
-    return;
-  }
-
   llvm::Value *AllVtables = llvm::MetadataAsValue::get(
       CGM.getLLVMContext(),
       llvm::MDString::get(CGM.getLLVMContext(), "all-vtables"));
diff --git a/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp b/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp
index a1e1563a4f38d8..498f3820e11621 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp
@@ -19,7 +19,7 @@ struct S1 {
 };
 
 // TRAP-LABEL: define hidden void @_Z3s1fP2S1(
-// TRAP-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]]
+// TRAP-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META4:![0-9]+]] {
 // TRAP-NEXT:  [[ENTRY:.*:]]
 // TRAP-NEXT:    [[S1_ADDR:%.*]] = alloca ptr, align 8
 // TRAP-NEXT:    store ptr [[S1]], ptr [[S1_ADDR]], align 8
@@ -37,20 +37,20 @@ struct S1 {
 // TRAP-NEXT:    ret void
 //
 // ABORT-LABEL: define hidden void @_Z3s1fP2S1(
-// ABORT-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]]
+// ABORT-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META7:![0-9]+]] {
 // ABORT-NEXT:  [[ENTRY:.*:]]
 // ABORT-NEXT:    [[S1_ADDR:%.*]] = alloca ptr, align 8
 // ABORT-NEXT:    store ptr [[S1]], ptr [[S1_ADDR]], align 8
 // ABORT-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S1_ADDR]], align 8
 // ABORT-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// ABORT-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS2S1"), !nosanitize [[META5:![0-9]+]]
-// ABORT-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META5]]
-// ABORT-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6:![0-9]+]], !nosanitize [[META5]]
+// ABORT-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS2S1"), !nosanitize [[META8:![0-9]+]]
+// ABORT-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META8]]
+// ABORT-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF9:![0-9]+]], !nosanitize [[META8]]
 // ABORT:       [[HANDLER_CFI_CHECK_FAIL]]:
-// ABORT-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META5]]
-// ABORT-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META5]]
-// ABORT-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.00e38160576ab76122d2f8d139d2e390.1, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR3:[0-9]+]], !nosanitize [[META5]]
-// ABORT-NEXT:    unreachable, !nosanitize [[META5]]
+// ABORT-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META8]]
+// ABORT-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META8]]
+// ABORT-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.00e38160576ab76122d2f8d139d2e390.1, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR3:[0-9]+]], !nosanitize [[META8]]
+// ABORT-NEXT:    unreachable, !nosanitize [[META8]]
 // ABORT:       [[CONT]]:
 // ABORT-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
 // ABORT-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8
@@ -58,20 +58,20 @@ struct S1 {
 // ABORT-NEXT:    ret void
 //
 // RECOVER-LABEL: define hidden void @_Z3s1fP2S1(
-// RECOVER-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]]
+// RECOVER-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META7:![0-9]+]] {
 // RECOVER-NEXT:  [[ENTRY:.*:]]
 // RECOVER-NEXT:    [[S1_ADDR:%.*]] = alloca ptr, align 8
 // RECOVER-NEXT:    store ptr [[S1]], ptr [[S1_ADDR]], align 8
 // RECOVER-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S1_ADDR]], align 8
 // RECOVER-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// RECOVER-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS2S1"), !nosanitize [[META5:![0-9]+]]
-// RECOVER-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META5]]
-// RECOVER-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6:![0-9]+]], !nosanitize [[META5]]
+// RECOVER-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS2S1"), !nosanitize [[META8:![0-9]+]]
+// RECOVER-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META8]]
+// RECOVER-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF9:![0-9]+]], !nosanitize [[META8]]
 // RECOVER:       [[HANDLER_CFI_CHECK_FAIL]]:
-// RECOVER-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META5]]
-// RECOVER-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META5]]
-// RECOVER-NEXT:    call void @__ubsan_handle_cfi_check_fail(ptr @anon.00e38160576ab76122d2f8d139d2e390.1, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR3:[0-9]+]], !nosanitize [[META5]]
-// RECOVER-NEXT:    br label %[[CONT]], !nosanitize [[META5]]
+// RECOVER-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META8]]
+// RECOVER-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META8]]
+// RECOVER-NEXT:    call void @__ubsan_handle_cfi_check_fail(ptr @anon.00e38160576ab76122d2f8d139d2e390.1, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR3:[0-9]+]], !nosanitize [[META8]]
+// RECOVER-NEXT:    br label %[[CONT]], !nosanitize [[META8]]
 // RECOVER:       [[CONT]]:
 // RECOVER-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
 // RECOVER-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8
@@ -79,81 +79,84 @@ struct S1 {
 // RECOVER-NEXT:    ret void
 //
 // ABORT_MIN-LABEL: define hidden void @_Z3s1fP2S1(
-// ABORT_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]]
+// ABORT_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META4:![0-9]+]] {
 // ABORT_MIN-NEXT:  [[ENTRY:.*:]]
 // ABORT_MIN-NEXT:    [[S1_ADDR:%.*]] = alloca ptr, align 8
 // ABORT_MIN-NEXT:    store ptr [[S1]], ptr [[S1_ADDR]], align 8
 // ABORT_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S1_ADDR]], align 8
 // ABORT_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
 // ABORT_MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS2S1"), !nosanitize [[META5:![0-9]+]]
-// ABORT_MIN-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META5]]
 // ABORT_MIN-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6:![0-9]+]], !nosanitize [[META5]]
 // ABORT_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
 // ABORT_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal_abort() #[[ATTR3:[0-9]+]], !nosanitize [[META5]]
 // ABORT_MIN-NEXT:    unreachable, !nosanitize [[META5]]
 // ABORT_MIN:       [[CONT]]:
 // ABORT_MIN-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
-// ABORT_MIN-NEXT:    [[TMP3:%.*]] = load ptr, ptr [[VFN]], align 8
-// ABORT_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// ABORT_MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// ABORT_MIN-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // ABORT_MIN-NEXT:    ret void
 //
 // RECOVER_MIN-LABEL: define hidden void @_Z3s1fP2S1(
-// RECOVER_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]]
+// RECOVER_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META4:![0-9]+]] {
 // RECOVER_MIN-NEXT:  [[ENTRY:.*:]]
 // RECOVER_MIN-NEXT:    [[S1_ADDR:%.*]] = alloca ptr, align 8
 // RECOVER_MIN-NEXT:    store ptr [[S1]], ptr [[S1_ADDR]], align 8
 // RECOVER_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S1_ADDR]], align 8
 // RECOVER_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
 // RECOVER_MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS2S1"), !nosanitize [[META5:![0-9]+]]
-// RECOVER_MIN-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META5]]
 // RECOVER_MIN-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6:![0-9]+]], !nosanitize [[META5]]
 // RECOVER_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
 // RECOVER_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR3:[0-9]+]], !nosanitize [[META5]]
 // RECOVER_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META5]]
 // RECOVER_MIN:       [[CONT]]:
 // RECOVER_MIN-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
-// RECOVER_MIN-NEXT:    [[TMP3:%.*]] = load ptr, ptr [[VFN]], align 8
-// RECOVER_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// RECOVER_MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// RECOVER_MIN-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // RECOVER_MIN-NEXT:    ret void
 //
 // PRESERVE_MIN-LABEL: define hidden void @_Z3s1fP2S1(
-// PRESERVE_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]]
+// PRESERVE_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META4:![0-9]+]] {
 // PRESERVE_MIN-NEXT:  [[ENTRY:.*:]]
 // PRESERVE_MIN-NEXT:    [[S1_ADDR:%.*]] = alloca ptr, align 8
 // PRESERVE_MIN-NEXT:    store ptr [[S1]], ptr [[S1_ADDR]], align 8
 // PRESERVE_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S1_ADDR]], align 8
 // PRESERVE_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
 // PRESERVE_MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS2S1"), !nosanitize [[META5:![0-9]+]]
-// PRESERVE_MIN-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META5]]
 // PRESERVE_MIN-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6:![0-9]+]], !nosanitize [[META5]]
 // PRESERVE_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
 // PRESERVE_MIN-NEXT:    call preserve_allcc void @__ubsan_handle_cfi_check_fail_minimal_preserve() #[[ATTR3:[0-9]+]], !nosanitize [[META5]]
 // PRESERVE_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META5]]
 // PRESERVE_MIN:       [[CONT]]:
 // PRESERVE_MIN-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
-// PRESERVE_MIN-NEXT:    [[TMP3:%.*]] = load ptr, ptr [[VFN]], align 8
-// PRESERVE_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// PRESERVE_MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// PRESERVE_MIN-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // PRESERVE_MIN-NEXT:    ret void
 //
 void s1f(S1 *s1) {
   s1->f();
 }
 //.
+// TRAP: [[META4]] = !{i64 7041213465930883840}
 // TRAP: [[META5]] = !{}
 // TRAP: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
 //.
-// ABORT: [[META5]] = !{}
-// ABORT: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
+// ABORT: [[META7]] = !{i64 7041213465930883840}
+// ABORT: [[META8]] = !{}
+// ABORT: [[PROF9]] = !{!"branch_weights", i32 1048575, i32 1}
 //.
-// RECOVER: [[META5]] = !{}
-// RECOVER: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
+// RECOVER: [[META7]] = !{i64 7041213465930883840}
+// RECOVER: [[META8]] = !{}
+// RECOVER: [[PROF9]] = !{!"branch_weights", i32 1048575, i32 1}
 //.
+// ABORT_MIN: [[META4]] = !{i64 7041213465930883840}
 // ABORT_MIN: [[META5]] = !{}
 // ABORT_MIN: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
 //.
+// RECOVER_MIN: [[META4]] = !{i64 7041213465930883840}
 // RECOVER_MIN: [[META5]] = !{}
 // RECOVER_MIN: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
 //.
+// PRESERVE_MIN: [[META4]] = !{i64 7041213465930883840}
 // PRESERVE_MIN: [[META5]] = !{}
 // PRESERVE_MIN: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
 //.
diff --git a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
index a8969c4f016083..7b2e29bfa09015 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
@@ -46,20 +46,20 @@ struct DerivedSameLayoutFromPublic : Public {};
 // XDSO-NEXT:    ret void
 //
 // XDSOT-LABEL: define hidden void @call_hidden(
-// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META8:![0-9]+]] {
+// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META6:![0-9]+]] {
 // XDSOT-NEXT:  [[ENTRY:.*:]]
 // XDSOT-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // XDSOT-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // XDSOT-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // XDSOT-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// XDSOT-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META9:![0-9]+]]
-// XDSOT-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META9]]
-// XDSOT-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF10:![0-9]+]], !nosanitize [[META9]]
+// XDSOT-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META7:![0-9]+]]
+// XDSOT-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META7]]
+// XDSOT-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF8:![0-9]+]], !nosanitize [[META7]]
 // XDSOT:       [[TRAP]]:
-// XDSOT-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR7:[0-9]+]], !nosanitize [[META9]]
-// XDSOT-NEXT:    unreachable, !nosanitize [[META9]]
+// XDSOT-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR7:[0-9]+]], !nosanitize [[META7]]
+// XDSOT-NEXT:    unreachable, !nosanitize [[META7]]
 // XDSOT:       [[CONT]]:
-// XDSOT-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META9]]
+// XDSOT-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META7]]
 // XDSOT-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // XDSOT-NEXT:    ret void
 //
@@ -218,17 +218,17 @@ extern "C" void call_hidden(Hidden *p) {
 // XDSO-NEXT:    ret void
 //
 // XDSOT-LABEL: define hidden void @call_public(
-// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META11:![0-9]+]] {
+// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META9:![0-9]+]] {
 // XDSOT-NEXT:  [[ENTRY:.*:]]
 // XDSOT-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // XDSOT-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // XDSOT-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // XDSOT-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// XDSOT-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META9]]
-// XDSOT-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF10]], !nosanitize [[META9]]
+// XDSOT-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META7]]
+// XDSOT-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF8]], !nosanitize [[META7]]
 // XDSOT:       [[CFI_SLOWPATH]]:
-// XDSOT-NEXT:    call void @__cfi_slowpath(i64 7659278028533726273, ptr [[VTABLE]]) #[[ATTR8:[0-9]+]], !nosanitize [[META9]]
-// XDSOT-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META9]]
+// XDSOT-NEXT:    call void @__cfi_slowpath(i64 7659278028533726273, ptr [[VTABLE]]) #[[ATTR8:[0-9]+]], !nosanitize [[META7]]
+// XDSOT-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META7]]
 // XDSOT:       [[CFI_CONT]]:
 // XDSOT-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
 // XDSOT-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
@@ -343,7 +343,7 @@ extern "C" void call_public(Public *p) {
 // XDSO-NEXT:    ret void
 //
 // XDSOT-LABEL: define hidden void @call_no_sanitize(
-// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META12:![0-9]+]] {
+// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META10:![0-9]+]] {
 // XDSOT-NEXT:  [[ENTRY:.*:]]
 // XDSOT-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // XDSOT-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -478,7 +478,7 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidde
 // XDSO-NEXT:    ret void
 //
 // XDSOT-LABEL: define hidden void @call_derived_same_layout(
-// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META13:![0-9]+]] {
+// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META11:![0-9]+]] {
 // XDSOT-NEXT:  [[ENTRY:.*:]]
 // XDSOT-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // XDSOT-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -487,14 +487,14 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidde
 // XDSOT-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
 // XDSOT:       [[DELETE_NOTNULL]]:
 // XDSOT-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// XDSOT-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS17DerivedSameLayout"), !nosanitize [[META9]]
-// XDSOT-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META9]]
-// XDSOT-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF10]], !nosanitize [[META9]]
+// XDSOT-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS17DerivedSameLayout"), !nosanitize [[META7]]
+// XDSOT-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META7]]
+// XDSOT-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF8]], !nosanitize [[META7]]
 // XDSOT:       [[TRAP]]:
-// XDSOT-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR7]], !nosanitize [[META9]]
-// XDSOT-NEXT:    unreachable, !nosanitize [[META9]]
+// XDSOT-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR7]], !nosanitize [[META7]]
+// XDSOT-NEXT:    unreachable, !nosanitize [[META7]]
 // XDSOT:       [[CONT]]:
-// XDSOT-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META9]]
+// XDSOT-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META7]]
 // XDSOT-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR8]]
 // XDSOT-NEXT:    br label %[[DELETE_END]]
 // XDSOT:       [[DELETE_END]]:
@@ -690,20 +690,20 @@ extern "C" void call_derived_same_layout(DerivedSameLayout *p) {
 // XDSO-NEXT:    ret void
 //
 // XDSOT-LABEL: define hidden void @call_derived_public(
-// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META14:![0-9]+]] {
+// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META12:![0-9]+]] {
 // XDSOT-NEXT:  [[ENTRY:.*:]]
 // XDSOT-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // XDSOT-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // XDSOT-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // XDSOT-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// XDSOT-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 32, metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META9]]
-// XDSOT-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META9]]
-// XDSOT-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF10]], !nosanitize [[META9]]
+// XDSOT-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 32, metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META7]]
+// XDSOT-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META7]]
+// XDSOT-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF8]], !nosanitize [[META7]]
 // XDSOT:       [[TRAP]]:
-// XDSOT-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR7]], !nosanitize [[META9]]
-// XDSOT-NEXT:    unreachable, !nosanitize [[META9]]
+// XDSOT-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR7]], !nosanitize [[META7]]
+// XDSOT-NEXT:    unreachable, !nosanitize [[META7]]
 // XDSOT:       [[CONT]]:
-// XDSOT-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META9]]
+// XDSOT-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META7]]
 // XDSOT-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(16) [[TMP0]])
 // XDSOT-NEXT:    ret void
 //
@@ -860,7 +860,7 @@ extern "C" void call_derived_public(DerivedFromPublic *p) {
 // XDSO-NEXT:    ret void
 //
 // XDSOT-LABEL: define hidden void @delete_derived_same_layout_from_public(
-// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META15:![0-9]+]] {
+// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META13:![0-9]+]] {
 // XDSOT-NEXT:  [[ENTRY:.*:]]
 // XDSOT-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // XDSOT-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -869,14 +869,14 @@ extern "C" void call_derived_public(DerivedFromPublic *p) {
 // XDSOT-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
 // XDSOT:       [[DELETE_NOTNULL]]:
 // XDSOT-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// XDSOT-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS27DerivedSameLayoutFromPublic"), !nosanitize [[META9]]
-// XDSOT-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META9]]
-// XDSOT-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF10]], !nosanitize [[META9]]
+// XDSOT-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS27DerivedSameLayoutFromPublic"), !nosanitize [[META7]]
+// XDSOT-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META7]]
+// XDSOT-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF8]], !nosanitize [[META7]]
 // XDSOT:       [[TRAP]]:
-// XDSOT-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR7]], !nosanitize [[META9]]
-// XDSOT-NEXT:    unreachable, !nosanitize [[META9]]
+// XDSOT-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR7]], !nosanitize [[META7]]
+// XDSOT-NEXT:    unreachable, !nosanitize [[META7]]
 // XDSOT:       [[CONT]]:
-// XDSOT-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META9]]
+// XDSOT-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META7]]
 // XDSOT-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR8]]
 // XDSOT-NEXT:    br label %[[DELETE_END]]
 // XDSOT:       [[DELETE_END]]:
@@ -1035,14 +1035,14 @@ extern "C" void delete_derived_same_layout_from_public(DerivedSameLayoutFromPubl
 // XDSO: [[META21]] = !{i64 -1300877796466697334}
 // XDSO: [[META22]] = !{i64 -3011432234017786520}
 //.
-// XDSOT: [[META8]] = !{i64 -8223949192042198753}
-// XDSOT: [[META9]] = !{}
-// XDSOT: [[PROF10]] = !{!"branch_weights", i32 1048575, i32 1}
-// XDSOT: [[META11]] = !{i64 4735877602249467044}
-// XDSOT: [[META12]] = !{i64 7641651042058123257}
-// XDSOT: [[META13]] = !{i64 -4426688768985367573}
-// XDSOT: [[META14]] = !{i64 -1300877796466697334}
-// XDSOT: [[META15]] = !{i64 -3011432234017786520}
+// XDSOT: [[META6]] = !{i64 -8223949192042198753}
+// XDSOT: [[META7]] = !{}
+// XDSOT: [[PROF8]] = !{!"branch_weights", i32 1048575, i32 1}
+// XDSOT: [[META9]] = !{i64 4735877602249467044}
+// XDSOT: [[META10]] = !{i64 7641651042058123257}
+// XDSOT: [[META11]] = !{i64 -4426688768985367573}
+// XDSOT: [[META12]] = !{i64 -1300877796466697334}
+// XDSOT: [[META13]] = !{i64 -3011432234017786520}
 //.
 // VFEFULL: [[META4]] = !{i64 -8223949192042198753}
 // VFEFULL: [[META5]] = !{}
diff --git a/clang/test/CodeGenCXX/cfi-vtable-check.cpp b/clang/test/CodeGenCXX/cfi-vtable-check.cpp
index d3e20d985c14a0..75fa25d047550f 100644
--- a/clang/test/CodeGenCXX/cfi-vtable-check.cpp
+++ b/clang/test/CodeGenCXX/cfi-vtable-check.cpp
@@ -9,14 +9,6 @@ struct S {
 };
 
 //.
-// MIN: @.src = private unnamed_addr constant [21 x i8] c"cfi-vtable-check.cpp\00", align 1
-// MIN: @[[GLOB0:[0-9]+]] = private unnamed_addr constant { i16, i16, [4 x i8] } { i16 -1, i16 0, [4 x i8] c"'S'\00" }
-//.
-// TRAP_CUTOFF: @.src = private unnamed_addr constant [21 x i8] c"cfi-vtable-check.cpp\00", align 1
-// TRAP_CUTOFF: @[[GLOB0:[0-9]+]] = private unnamed_addr constant { i16, i16, [4 x i8] } { i16 -1, i16 0, [4 x i8] c"'S'\00" }
-//.
-// XDSO_TRAP: @.src = private unnamed_addr constant [21 x i8] c"cfi-vtable-check.cpp\00", align 1
-// XDSO_TRAP: @[[GLOB0:[0-9]+]] = private unnamed_addr constant { i16, i16, [4 x i8] } { i16 -1, i16 0, [4 x i8] c"'S'\00" }
 // XDSO_TRAP: @llvm.used = appending global [1 x ptr] [ptr @__cfi_check_fail], section "llvm.metadata"
 //.
 // MIN-LABEL: define hidden void @test(
@@ -27,15 +19,14 @@ struct S {
 // MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S_ADDR]], align 8
 // MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
 // MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS1S"), !nosanitize [[META1:![0-9]+]]
-// MIN-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META1]]
 // MIN-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF2:![0-9]+]], !nosanitize [[META1]]
 // MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
 // MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal_abort() #[[ATTR3:[0-9]+]], !nosanitize [[META1]]
 // MIN-NEXT:    unreachable, !nosanitize [[META1]]
 // MIN:       [[CONT]]:
 // MIN-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
-// MIN-NEXT:    [[TMP3:%.*]] = load ptr, ptr [[VFN]], align 8
-// MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// MIN-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // MIN-NEXT:    ret void
 //
 // TRAP_CUTOFF-LABEL: define hidden void @test(
@@ -46,14 +37,17 @@ struct S {
 // TRAP_CUTOFF-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S_ADDR]], align 8
 // TRAP_CUTOFF-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
 // TRAP_CUTOFF-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS1S"), !nosanitize [[META1:![0-9]+]]
-// TRAP_CUTOFF-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF2:![0-9]+]], !nosanitize [[META1]]
+// TRAP_CUTOFF-NEXT:    [[TMP2:%.*]] = call i1 @llvm.allow.ubsan.check(i8 54), !nosanitize [[META1]]
+// TRAP_CUTOFF-NEXT:    [[TMP3:%.*]] = xor i1 [[TMP2]], true, !nosanitize [[META1]]
+// TRAP_CUTOFF-NEXT:    [[TMP4:%.*]] = or i1 [[TMP1]], [[TMP3]], !nosanitize [[META1]]
+// TRAP_CUTOFF-NEXT:    br i1 [[TMP4]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF2:![0-9]+]], !nosanitize [[META1]]
 // TRAP_CUTOFF:       [[TRAP]]:
-// TRAP_CUTOFF-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3:[0-9]+]], !nosanitize [[META1]]
+// TRAP_CUTOFF-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR4:[0-9]+]], !nosanitize [[META1]]
 // TRAP_CUTOFF-NEXT:    unreachable, !nosanitize [[META1]]
 // TRAP_CUTOFF:       [[CONT]]:
 // TRAP_CUTOFF-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
-// TRAP_CUTOFF-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
-// TRAP_CUTOFF-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// TRAP_CUTOFF-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8
+// TRAP_CUTOFF-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // TRAP_CUTOFF-NEXT:    ret void
 //
 // XDSO_TRAP-LABEL: define hidden void @test(
@@ -103,8 +97,9 @@ extern "C" void test(S *s) {
 //.
 // TRAP_CUTOFF: attributes #[[ATTR0]] = { mustprogress noinline nounwind optnone "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+cx8,+mmx,+sse,+sse2,+x87" }
 // TRAP_CUTOFF: attributes #[[ATTR1:[0-9]+]] = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
-// TRAP_CUTOFF: attributes #[[ATTR2:[0-9]+]] = { cold noreturn nounwind memory(inaccessiblemem: write) }
-// TRAP_CUTOFF: attributes #[[ATTR3]] = { nomerge noreturn nounwind }
+// TRAP_CUTOFF: attributes #[[ATTR2:[0-9]+]] = { nocallback nofree nosync nounwind willreturn memory(inaccessiblemem: readwrite) }
+// TRAP_CUTOFF: attributes #[[ATTR3:[0-9]+]] = { cold noreturn nounwind memory(inaccessiblemem: write) }
+// TRAP_CUTOFF: attributes #[[ATTR4]] = { nomerge noreturn nounwind }
 //.
 // XDSO_TRAP: attributes #[[ATTR0]] = { mustprogress noinline nounwind optnone "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+cx8,+mmx,+sse,+sse2,+x87" }
 // XDSO_TRAP: attributes #[[ATTR1:[0-9]+]] = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }



More information about the llvm-branch-commits mailing list