[llvm-branch-commits] [clang] [compiler-rt] [Clang][CFI] Use EmitVTableCheck for llvm.type.checked.load (PR #241646)

Vitaly Buka via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Thu Nov 12 19:07:58 PST 2026


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

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

Created using spr 2.0.0-beta.2
---
 clang/lib/CodeGen/CGClass.cpp                 |  30 ++-
 clang/test/CodeGenCXX/cfi-ignorelist.cpp      |   6 +-
 .../cfi-vcall-type-checked-load.cpp           | 247 +++++++++---------
 .../DebugInfo/Generic/cfi-vcall-debuginfo.cpp | 123 ++++-----
 4 files changed, 206 insertions(+), 200 deletions(-)

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 4fbe06314c9a3..be62fd04fb4f0 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -3009,31 +3009,35 @@ bool CodeGenFunction::ShouldEmitVTableTypeCheckedLoad(const CXXRecordDecl *RD) {
 
 llvm::Value *CodeGenFunction::EmitVTableTypeCheckedLoad(
     const CXXRecordDecl *RD, llvm::Value *VTable, llvm::Type *VTableTy,
-    uint64_t VTableByteOffset, SourceLocation /*Loc*/) {
+    uint64_t VTableByteOffset, SourceLocation Loc) {
   auto [TargetRD, ShouldEmitCFICheck] = getCFIVCallTarget(*this, RD);
 
-  auto CheckOrdinal = SanitizerKind::SO_CFIVCall;
-  auto CheckHandler = SanitizerHandler::CFICheckFail;
-  SanitizerDebugLocation SanScope(this, {CheckOrdinal}, CheckHandler);
-
   CanQualType T = CGM.getContext().getCanonicalTagType(TargetRD);
   llvm::Metadata *MD = CGM.CreateMetadataIdentifierForType(T);
   llvm::Value *TypeId = llvm::MetadataAsValue::get(CGM.getLLVMContext(), MD);
-
   auto CheckedLoadIntrinsic = CGM.getLangOpts().RelativeCXXABIVTables
                                   ? llvm::Intrinsic::type_checked_load_relative
                                   : llvm::Intrinsic::type_checked_load;
+
+  if (!ShouldEmitCFICheck) {
+    llvm::Value *CheckedLoad = Builder.CreateCall(
+        CGM.getIntrinsic(CheckedLoadIntrinsic),
+        {VTable, llvm::ConstantInt::get(Int32Ty, VTableByteOffset), TypeId});
+    return Builder.CreateBitCast(Builder.CreateExtractValue(CheckedLoad, 0),
+                                 VTableTy);
+  }
+
+  SanitizerDebugLocation SanScope(this, {SanitizerKind::SO_CFIVCall},
+                                  SanitizerHandler::CFICheckFail);
   llvm::Value *CheckedLoad = Builder.CreateCall(
       CGM.getIntrinsic(CheckedLoadIntrinsic),
       {VTable, llvm::ConstantInt::get(Int32Ty, VTableByteOffset), TypeId});
-
   llvm::Value *CheckResult = Builder.CreateExtractValue(CheckedLoad, 1);
-
-  if (ShouldEmitCFICheck) {
-    EmitSanitizerStatReport(llvm::SanStat_CFI_VCall);
-    EmitCheck(std::make_pair(CheckResult, CheckOrdinal), CheckHandler, {}, {});
-  }
-
+  bool UseCrossDsoSlowPath =
+      CGM.getCodeGenOpts().SanitizeCfiCrossDso &&
+      !CGM.getCodeGenOpts().SanitizeTrap.has(SanitizerKind::CFIVCall);
+  EmitVTableCheck(CFITCK_VCall, T, MD, VTable, CheckResult, Loc,
+                  UseCrossDsoSlowPath);
   return Builder.CreateBitCast(Builder.CreateExtractValue(CheckedLoad, 0),
                                VTableTy);
 }
diff --git a/clang/test/CodeGenCXX/cfi-ignorelist.cpp b/clang/test/CodeGenCXX/cfi-ignorelist.cpp
index 2732d30ad1ff4..f7083e3d600f4 100644
--- a/clang/test/CodeGenCXX/cfi-ignorelist.cpp
+++ b/clang/test/CodeGenCXX/cfi-ignorelist.cpp
@@ -38,7 +38,7 @@ struct S2 {
 // NOSTD-WPD: call i1 @llvm.type.test
 // NOSTD-WPD: call void @__ubsan_handle_cfi_check_fail_abort(ptr
 // NOSTD-VFE: call { ptr, i1 } @llvm.type.checked.load
-// NOSTD-VFE: call void @__ubsan_handle_cfi_check_fail_abort()
+// NOSTD-VFE: call void @__ubsan_handle_cfi_check_fail_abort(ptr
 void s1f(S1 *s1) {
   s1->f();
 }
@@ -53,7 +53,7 @@ void s1f(S1 *s1) {
 // NOSTD-WPD-NOT: call void @__ubsan_handle_cfi_check_fail
 // NOSTD-WPD: ret void
 // NOSTD-VFE: call { ptr, i1 } @llvm.type.checked.load
-// NOSTD-VFE: extractvalue { ptr, i1 } {{.*}}, 1
+// NOSTD-VFE-NOT: extractvalue { ptr, i1 } {{.*}}, 1
 // NOSTD-VFE-NOT: call void @__ubsan_handle_cfi_check_fail
 // NOSTD-VFE: ret void
 void s2f(std::S2 *s2) {
@@ -73,7 +73,7 @@ struct DerivedFromS2 : std::S2 {};
 // NOSTD-WPD-NOT: call void @__ubsan_handle_cfi_check_fail
 // NOSTD-WPD: ret void
 // NOSTD-VFE: call { ptr, i1 } @llvm.type.checked.load(ptr {{.*}}, i32 0, metadata !"_ZTSSt2S2")
-// NOSTD-VFE: extractvalue { ptr, i1 } {{.*}}, 1
+// NOSTD-VFE-NOT: extractvalue { ptr, i1 } {{.*}}, 1
 // NOSTD-VFE-NOT: call void @__ubsan_handle_cfi_check_fail
 // NOSTD-VFE: ret void
 void d2f(DerivedFromS2 *d) {
diff --git a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
index 9c1f5014ddb52..9e5dabe4fbc9e 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
@@ -69,38 +69,41 @@ struct DerivedSameLayoutFromPublic : Public {};
 // XDSOT-NEXT:    ret void
 //
 // VFEFULL-LABEL: define hidden void @call_hidden(
-// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META4:![0-9]+]] {
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META10:![0-9]+]] {
 // VFEFULL-NEXT:  [[ENTRY:.*:]]
 // VFEFULL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFEFULL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFEFULL-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFEFULL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META5:![0-9]+]]
-// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFEFULL-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6:![0-9]+]], !nosanitize [[META5]]
+// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META11:![0-9]+]]
+// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META11]]
+// VFEFULL-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12:![0-9]+]], !nosanitize [[META11]]
 // VFEFULL:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFEFULL-NEXT:    call void @__ubsan_handle_cfi_check_fail() #[[ATTR3:[0-9]+]], !nosanitize [[META5]]
-// VFEFULL-NEXT:    br label %[[CONT]], !nosanitize [[META5]]
+// VFEFULL-NEXT:    [[TMP4:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP5:%.*]] = zext i1 [[TMP3]] to i64, !nosanitize [[META11]]
+// VFEFULL-NEXT:    call void @__ubsan_handle_cfi_check_fail(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.1, i64 [[TMP4]], i64 [[TMP5]]) #[[ATTR4:[0-9]+]], !nosanitize [[META11]]
+// VFEFULL-NEXT:    br label %[[CONT]], !nosanitize [[META11]]
 // VFEFULL:       [[CONT]]:
-// VFEFULL-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFEFULL-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// VFEFULL-NEXT:    [[TMP6:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
+// VFEFULL-NEXT:    call void [[TMP6]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_hidden(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META10:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META15:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META11:![0-9]+]]
-// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12:![0-9]+]], !nosanitize [[META11]]
-// VFECROSS_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFECROSS_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR7:[0-9]+]], !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META11]]
-// VFECROSS_MIN:       [[CONT]]:
-// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META16:![0-9]+]]
+// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF17:![0-9]+]], !nosanitize [[META16]]
+// VFECROSS_MIN:       [[CFI_SLOWPATH]]:
+// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 2113178649093603051, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.1) #[[ATTR7:[0-9]+]], !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META16]]
+// VFECROSS_MIN:       [[CFI_CONT]]:
+// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META16]]
 // VFECROSS_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFECROSS_MIN-NEXT:    ret void
 //
@@ -173,10 +176,9 @@ struct DerivedSameLayoutFromPublic : Public {};
 // VFE_NOCFI-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFE_NOCFI-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFE_NOCFI-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META5:![0-9]+]]
-// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden")
+// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0
+// VFE_NOCFI-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFE_NOCFI-NEXT:    ret void
 //
 // STRICT-LABEL: define hidden void @call_hidden(
@@ -241,7 +243,7 @@ extern "C" void call_hidden(Hidden *p) {
 // XDSOT-NEXT:    ret void
 //
 // VFEFULL-LABEL: define hidden void @call_public(
-// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META7:![0-9]+]] {
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META13:![0-9]+]] {
 // VFEFULL-NEXT:  [[ENTRY:.*:]]
 // VFEFULL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFEFULL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -253,17 +255,17 @@ extern "C" void call_hidden(Hidden *p) {
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_public(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META13:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META18:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF12]], !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF17]], !nosanitize [[META16]]
 // VFECROSS_MIN:       [[CFI_SLOWPATH]]:
-// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 7659278028533726273, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.1) #[[ATTR8:[0-9]+]], !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 7659278028533726273, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.3) #[[ATTR7]], !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META16]]
 // VFECROSS_MIN:       [[CFI_CONT]]:
 // VFECROSS_MIN-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
 // VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
@@ -306,7 +308,7 @@ extern "C" void call_hidden(Hidden *p) {
 // SPEC-NEXT:    ret void
 //
 // VFE_NOCFI-LABEL: define hidden void @call_public(
-// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META6:![0-9]+]] {
+// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META5:![0-9]+]] {
 // VFE_NOCFI-NEXT:  [[ENTRY:.*:]]
 // VFE_NOCFI-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFE_NOCFI-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -362,29 +364,27 @@ extern "C" void call_public(Public *p) {
 // XDSOT-NEXT:    ret void
 //
 // VFEFULL-LABEL: define hidden void @call_no_sanitize(
-// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META8:![0-9]+]] {
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META14:![0-9]+]] {
 // VFEFULL-NEXT:  [[ENTRY:.*:]]
 // VFEFULL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFEFULL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFEFULL-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFEFULL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META5]]
-// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFEFULL-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFEFULL-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden")
+// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0
+// VFEFULL-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_no_sanitize(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META14:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META19:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden")
+// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0
+// VFECROSS_MIN-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFECROSS_MIN-NEXT:    ret void
 //
 // MS-LABEL: define dso_local void @call_no_sanitize(
@@ -429,16 +429,15 @@ extern "C" void call_public(Public *p) {
 // SPEC-NEXT:    ret void
 //
 // VFE_NOCFI-LABEL: define hidden void @call_no_sanitize(
-// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META7:![0-9]+]] {
+// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META6:![0-9]+]] {
 // VFE_NOCFI-NEXT:  [[ENTRY:.*:]]
 // VFE_NOCFI-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFE_NOCFI-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFE_NOCFI-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFE_NOCFI-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden")
+// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0
+// VFE_NOCFI-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFE_NOCFI-NEXT:    ret void
 //
 // STRICT-LABEL: define hidden void @call_no_sanitize(
@@ -506,7 +505,7 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidde
 // XDSOT-NEXT:    ret void
 //
 // VFEFULL-LABEL: define hidden void @call_derived_same_layout(
-// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META9:![0-9]+]] {
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META15:![0-9]+]] {
 // VFEFULL-NEXT:  [[ENTRY:.*:]]
 // VFEFULL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFEFULL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -515,21 +514,24 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidde
 // VFEFULL-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
 // VFEFULL:       [[DELETE_NOTNULL]]:
 // VFEFULL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS6Hidden"), !nosanitize [[META5]]
-// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFEFULL-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6]], !nosanitize [[META5]]
+// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS6Hidden"), !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META11]]
+// VFEFULL-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12]], !nosanitize [[META11]]
 // VFEFULL:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFEFULL-NEXT:    call void @__ubsan_handle_cfi_check_fail() #[[ATTR3]], !nosanitize [[META5]]
-// VFEFULL-NEXT:    br label %[[CONT]], !nosanitize [[META5]]
+// VFEFULL-NEXT:    [[TMP4:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP5:%.*]] = zext i1 [[TMP3]] to i64, !nosanitize [[META11]]
+// VFEFULL-NEXT:    call void @__ubsan_handle_cfi_check_fail(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.2, i64 [[TMP4]], i64 [[TMP5]]) #[[ATTR4]], !nosanitize [[META11]]
+// VFEFULL-NEXT:    br label %[[CONT]], !nosanitize [[META11]]
 // VFEFULL:       [[CONT]]:
-// VFEFULL-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFEFULL-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR4:[0-9]+]]
+// VFEFULL-NEXT:    [[TMP6:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
+// VFEFULL-NEXT:    call void [[TMP6]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR5:[0-9]+]]
 // VFEFULL-NEXT:    br label %[[DELETE_END]]
 // VFEFULL:       [[DELETE_END]]:
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_derived_same_layout(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META15:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META20:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -538,15 +540,15 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidde
 // VFECROSS_MIN-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
 // VFECROSS_MIN:       [[DELETE_NOTNULL]]:
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS6Hidden"), !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12]], !nosanitize [[META11]]
-// VFECROSS_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFECROSS_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR7]], !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META11]]
-// VFECROSS_MIN:       [[CONT]]:
-// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR8]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS6Hidden"), !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF17]], !nosanitize [[META16]]
+// VFECROSS_MIN:       [[CFI_SLOWPATH]]:
+// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 2113178649093603051, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.4) #[[ATTR7]], !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META16]]
+// VFECROSS_MIN:       [[CFI_CONT]]:
+// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR7]]
 // VFECROSS_MIN-NEXT:    br label %[[DELETE_END]]
 // VFECROSS_MIN:       [[DELETE_END]]:
 // VFECROSS_MIN-NEXT:    ret void
@@ -629,7 +631,7 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidde
 // SPEC-NEXT:    ret void
 //
 // VFE_NOCFI-LABEL: define hidden void @call_derived_same_layout(
-// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META8:![0-9]+]] {
+// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META7:![0-9]+]] {
 // VFE_NOCFI-NEXT:  [[ENTRY:.*:]]
 // VFE_NOCFI-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFE_NOCFI-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -638,10 +640,9 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidde
 // VFE_NOCFI-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
 // VFE_NOCFI:       [[DELETE_NOTNULL]]:
 // VFE_NOCFI-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS17DerivedSameLayout"), !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR2:[0-9]+]]
+// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS17DerivedSameLayout")
+// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0
+// VFE_NOCFI-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR2:[0-9]+]]
 // VFE_NOCFI-NEXT:    br label %[[DELETE_END]]
 // VFE_NOCFI:       [[DELETE_END]]:
 // VFE_NOCFI-NEXT:    ret void
@@ -713,38 +714,41 @@ extern "C" void call_derived_same_layout(DerivedSameLayout *p) {
 // XDSOT-NEXT:    ret void
 //
 // VFEFULL-LABEL: define hidden void @call_derived_public(
-// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META10:![0-9]+]] {
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META16:![0-9]+]] {
 // VFEFULL-NEXT:  [[ENTRY:.*:]]
 // VFEFULL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFEFULL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFEFULL-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFEFULL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 32, metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META5]]
-// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFEFULL-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6]], !nosanitize [[META5]]
+// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 32, metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META11]]
+// VFEFULL-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12]], !nosanitize [[META11]]
 // VFEFULL:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFEFULL-NEXT:    call void @__ubsan_handle_cfi_check_fail() #[[ATTR3]], !nosanitize [[META5]]
-// VFEFULL-NEXT:    br label %[[CONT]], !nosanitize [[META5]]
+// VFEFULL-NEXT:    [[TMP4:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP5:%.*]] = zext i1 [[TMP3]] to i64, !nosanitize [[META11]]
+// VFEFULL-NEXT:    call void @__ubsan_handle_cfi_check_fail(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.4, i64 [[TMP4]], i64 [[TMP5]]) #[[ATTR4]], !nosanitize [[META11]]
+// VFEFULL-NEXT:    br label %[[CONT]], !nosanitize [[META11]]
 // VFEFULL:       [[CONT]]:
-// VFEFULL-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFEFULL-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(16) [[TMP0]])
+// VFEFULL-NEXT:    [[TMP6:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
+// VFEFULL-NEXT:    call void [[TMP6]](ptr noundef nonnull align 8 dereferenceable(16) [[TMP0]])
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_derived_public(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META16:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META21:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 32, metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12]], !nosanitize [[META11]]
-// VFECROSS_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFECROSS_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR7]], !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META11]]
-// VFECROSS_MIN:       [[CONT]]:
-// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 32, metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF17]], !nosanitize [[META16]]
+// VFECROSS_MIN:       [[CFI_SLOWPATH]]:
+// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 -6426894850856698049, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.6) #[[ATTR7]], !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META16]]
+// VFECROSS_MIN:       [[CFI_CONT]]:
+// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META16]]
 // VFECROSS_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(16) [[TMP0]])
 // VFECROSS_MIN-NEXT:    ret void
 //
@@ -804,16 +808,15 @@ extern "C" void call_derived_same_layout(DerivedSameLayout *p) {
 // SPEC-NEXT:    ret void
 //
 // VFE_NOCFI-LABEL: define hidden void @call_derived_public(
-// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META9:![0-9]+]] {
+// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META8:![0-9]+]] {
 // VFE_NOCFI-NEXT:  [[ENTRY:.*:]]
 // VFE_NOCFI-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFE_NOCFI-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFE_NOCFI-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFE_NOCFI-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 32, metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(16) [[TMP0]])
+// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 32, metadata !"_ZTS17DerivedFromPublic")
+// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0
+// VFE_NOCFI-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(16) [[TMP0]])
 // VFE_NOCFI-NEXT:    ret void
 //
 // STRICT-LABEL: define hidden void @call_derived_public(
@@ -888,7 +891,7 @@ extern "C" void call_derived_public(DerivedFromPublic *p) {
 // XDSOT-NEXT:    ret void
 //
 // VFEFULL-LABEL: define hidden void @delete_derived_same_layout_from_public(
-// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META11:![0-9]+]] {
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META17:![0-9]+]] {
 // VFEFULL-NEXT:  [[ENTRY:.*:]]
 // VFEFULL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFEFULL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -899,13 +902,13 @@ extern "C" void call_derived_public(DerivedFromPublic *p) {
 // VFEFULL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
 // VFEFULL-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 3
 // VFEFULL-NEXT:    [[TMP1:%.*]] = load ptr, ptr [[VFN]], align 8
-// VFEFULL-NEXT:    call void [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR4]]
+// VFEFULL-NEXT:    call void [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR5]]
 // VFEFULL-NEXT:    br label %[[DELETE_END]]
 // VFEFULL:       [[DELETE_END]]:
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @delete_derived_same_layout_from_public(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META17:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META22:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -914,15 +917,15 @@ extern "C" void call_derived_public(DerivedFromPublic *p) {
 // VFECROSS_MIN-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
 // VFECROSS_MIN:       [[DELETE_NOTNULL]]:
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF12]], !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF17]], !nosanitize [[META16]]
 // VFECROSS_MIN:       [[CFI_SLOWPATH]]:
-// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 7659278028533726273, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.2) #[[ATTR8]], !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 7659278028533726273, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.7) #[[ATTR7]], !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META16]]
 // VFECROSS_MIN:       [[CFI_CONT]]:
 // VFECROSS_MIN-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 3
 // VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
-// VFECROSS_MIN-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR8]]
+// VFECROSS_MIN-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR7]]
 // VFECROSS_MIN-NEXT:    br label %[[DELETE_END]]
 // VFECROSS_MIN:       [[DELETE_END]]:
 // VFECROSS_MIN-NEXT:    ret void
@@ -978,7 +981,7 @@ extern "C" void call_derived_public(DerivedFromPublic *p) {
 // SPEC-NEXT:    ret void
 //
 // VFE_NOCFI-LABEL: define hidden void @delete_derived_same_layout_from_public(
-// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META10:![0-9]+]] {
+// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META9:![0-9]+]] {
 // VFE_NOCFI-NEXT:  [[ENTRY:.*:]]
 // VFE_NOCFI-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFE_NOCFI-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -987,10 +990,9 @@ extern "C" void call_derived_public(DerivedFromPublic *p) {
 // VFE_NOCFI-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
 // VFE_NOCFI:       [[DELETE_NOTNULL]]:
 // VFE_NOCFI-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS27DerivedSameLayoutFromPublic"), !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR2]]
+// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS27DerivedSameLayoutFromPublic")
+// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0
+// VFE_NOCFI-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR2]]
 // VFE_NOCFI-NEXT:    br label %[[DELETE_END]]
 // VFE_NOCFI:       [[DELETE_END]]:
 // VFE_NOCFI-NEXT:    ret void
@@ -1043,23 +1045,23 @@ extern "C" void delete_derived_same_layout_from_public(DerivedSameLayoutFromPubl
 // XDSOT: [[META12]] = !{i64 -1300877796466697334}
 // XDSOT: [[META13]] = !{i64 -3011432234017786520}
 //.
-// VFEFULL: [[META4]] = !{i64 -8223949192042198753}
-// VFEFULL: [[META5]] = !{}
-// VFEFULL: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
-// VFEFULL: [[META7]] = !{i64 4735877602249467044}
-// VFEFULL: [[META8]] = !{i64 7641651042058123257}
-// VFEFULL: [[META9]] = !{i64 -4426688768985367573}
-// VFEFULL: [[META10]] = !{i64 -1300877796466697334}
-// VFEFULL: [[META11]] = !{i64 -3011432234017786520}
+// VFEFULL: [[META10]] = !{i64 -8223949192042198753}
+// VFEFULL: [[META11]] = !{}
+// VFEFULL: [[PROF12]] = !{!"branch_weights", i32 1048575, i32 1}
+// VFEFULL: [[META13]] = !{i64 4735877602249467044}
+// VFEFULL: [[META14]] = !{i64 7641651042058123257}
+// VFEFULL: [[META15]] = !{i64 -4426688768985367573}
+// VFEFULL: [[META16]] = !{i64 -1300877796466697334}
+// VFEFULL: [[META17]] = !{i64 -3011432234017786520}
 //.
-// VFECROSS_MIN: [[META10]] = !{i64 -8223949192042198753}
-// VFECROSS_MIN: [[META11]] = !{}
-// VFECROSS_MIN: [[PROF12]] = !{!"branch_weights", i32 1048575, i32 1}
-// VFECROSS_MIN: [[META13]] = !{i64 4735877602249467044}
-// VFECROSS_MIN: [[META14]] = !{i64 7641651042058123257}
-// VFECROSS_MIN: [[META15]] = !{i64 -4426688768985367573}
-// VFECROSS_MIN: [[META16]] = !{i64 -1300877796466697334}
-// VFECROSS_MIN: [[META17]] = !{i64 -3011432234017786520}
+// VFECROSS_MIN: [[META15]] = !{i64 -8223949192042198753}
+// VFECROSS_MIN: [[META16]] = !{}
+// VFECROSS_MIN: [[PROF17]] = !{!"branch_weights", i32 1048575, i32 1}
+// VFECROSS_MIN: [[META18]] = !{i64 4735877602249467044}
+// VFECROSS_MIN: [[META19]] = !{i64 7641651042058123257}
+// VFECROSS_MIN: [[META20]] = !{i64 -4426688768985367573}
+// VFECROSS_MIN: [[META21]] = !{i64 -1300877796466697334}
+// VFECROSS_MIN: [[META22]] = !{i64 -3011432234017786520}
 //.
 // MS: [[META12]] = !{i64 -8223949192042198753}
 // MS: [[META13]] = !{}
@@ -1089,12 +1091,11 @@ extern "C" void delete_derived_same_layout_from_public(DerivedSameLayoutFromPubl
 // SPEC: [[META16]] = !{i64 -3011432234017786520}
 //.
 // VFE_NOCFI: [[META4]] = !{i64 -8223949192042198753}
-// VFE_NOCFI: [[META5]] = !{}
-// VFE_NOCFI: [[META6]] = !{i64 4735877602249467044}
-// VFE_NOCFI: [[META7]] = !{i64 7641651042058123257}
-// VFE_NOCFI: [[META8]] = !{i64 -4426688768985367573}
-// VFE_NOCFI: [[META9]] = !{i64 -1300877796466697334}
-// VFE_NOCFI: [[META10]] = !{i64 -3011432234017786520}
+// VFE_NOCFI: [[META5]] = !{i64 4735877602249467044}
+// VFE_NOCFI: [[META6]] = !{i64 7641651042058123257}
+// VFE_NOCFI: [[META7]] = !{i64 -4426688768985367573}
+// VFE_NOCFI: [[META8]] = !{i64 -1300877796466697334}
+// VFE_NOCFI: [[META9]] = !{i64 -3011432234017786520}
 //.
 // STRICT: [[META13]] = !{i64 -8223949192042198753}
 // STRICT: [[META14]] = !{}
diff --git a/clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp b/clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp
index 2596365e0ffb0..5e2d9698c148e 100644
--- a/clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp
+++ b/clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp
@@ -16,23 +16,26 @@ struct S {
 };
 
 // WPD-LABEL: define hidden void @checked(
-// WPD-SAME: ptr noundef [[S:%.*]]) #[[ATTR0:[0-9]+]] !dbg [[DBG6:![0-9]+]] !guid [[META13:![0-9]+]] {
+// WPD-SAME: ptr noundef [[S:%.*]]) #[[ATTR0:[0-9]+]] !dbg [[DBG9:![0-9]+]] !guid [[META16:![0-9]+]] {
 // WPD-NEXT:  [[ENTRY:.*:]]
 // WPD-NEXT:    [[S_ADDR:%.*]] = alloca ptr, align 8
 // WPD-NEXT:    store ptr [[S]], ptr [[S_ADDR]], align 8
-// WPD-NEXT:      #dbg_declare(ptr [[S_ADDR]], [[META14:![0-9]+]], !DIExpression(), [[META15:![0-9]+]])
-// WPD-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S_ADDR]], align 8, !dbg [[DBG16:![0-9]+]]
-// WPD-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8, !dbg [[DBG17:![0-9]+]]
-// WPD-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS1S"), !dbg [[DBG18:![0-9]+]], !nosanitize [[META12:![0-9]+]]
-// WPD-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !dbg [[DBG18]], !nosanitize [[META12]]
-// WPD-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !dbg [[DBG18]], !prof [[PROF22:![0-9]+]], !nosanitize [[META12]]
+// WPD-NEXT:      #dbg_declare(ptr [[S_ADDR]], [[META17:![0-9]+]], !DIExpression(), [[META18:![0-9]+]])
+// WPD-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S_ADDR]], align 8, !dbg [[DBG19:![0-9]+]]
+// WPD-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8, !dbg [[DBG20:![0-9]+]]
+// WPD-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS1S"), !dbg [[DBG21:![0-9]+]], !nosanitize [[META15:![0-9]+]]
+// WPD-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !dbg [[DBG21]], !nosanitize [[META15]]
+// WPD-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !dbg [[DBG21]], !nosanitize [[META15]]
+// WPD-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !dbg [[DBG21]], !prof [[PROF25:![0-9]+]], !nosanitize [[META15]]
 // WPD:       [[HANDLER_CFI_CHECK_FAIL]]:
-// WPD-NEXT:    call void @__ubsan_handle_cfi_check_fail() #[[ATTR3:[0-9]+]], !dbg [[DBG18]], !nosanitize [[META12]]
-// WPD-NEXT:    br label %[[CONT]], !dbg [[DBG18]], !nosanitize [[META12]]
+// WPD-NEXT:    [[TMP4:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !dbg [[DBG21]], !nosanitize [[META15]]
+// WPD-NEXT:    [[TMP5:%.*]] = zext i1 [[TMP3]] to i64, !dbg [[DBG21]], !nosanitize [[META15]]
+// WPD-NEXT:    call void @__ubsan_handle_cfi_check_fail(ptr @anon.f7bcfe50d3057283bb357af6240bedc0.1, i64 [[TMP4]], i64 [[TMP5]]) #[[ATTR4:[0-9]+]], !dbg [[DBG21]], !nosanitize [[META15]]
+// WPD-NEXT:    br label %[[CONT]], !dbg [[DBG21]], !nosanitize [[META15]]
 // WPD:       [[CONT]]:
-// WPD-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !dbg [[DBG18]], !nosanitize [[META12]]
-// WPD-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]), !dbg [[DBG17]]
-// WPD-NEXT:    ret void, !dbg [[DBG23:![0-9]+]]
+// WPD-NEXT:    [[TMP6:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !dbg [[DBG21]], !nosanitize [[META15]]
+// WPD-NEXT:    call void [[TMP6]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]), !dbg [[DBG20]]
+// WPD-NEXT:    ret void, !dbg [[DBG26:![0-9]+]]
 //
 // NOWPD-LABEL: define hidden void @checked(
 // NOWPD-SAME: ptr noundef [[S:%.*]]) #[[ATTR0:[0-9]+]] !dbg [[DBG8:![0-9]+]] !guid [[META15:![0-9]+]] {
@@ -61,18 +64,17 @@ extern "C" void checked(S *s) {
 }
 
 // WPD-LABEL: define hidden void @unchecked(
-// WPD-SAME: ptr noundef [[S:%.*]]) #[[ATTR0]] !dbg [[DBG24:![0-9]+]] !guid [[META25:![0-9]+]] {
+// WPD-SAME: ptr noundef [[S:%.*]]) #[[ATTR0]] !dbg [[DBG27:![0-9]+]] !guid [[META28:![0-9]+]] {
 // WPD-NEXT:  [[ENTRY:.*:]]
 // WPD-NEXT:    [[S_ADDR:%.*]] = alloca ptr, align 8
 // WPD-NEXT:    store ptr [[S]], ptr [[S_ADDR]], align 8
-// WPD-NEXT:      #dbg_declare(ptr [[S_ADDR]], [[META26:![0-9]+]], !DIExpression(), [[META27:![0-9]+]])
-// WPD-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S_ADDR]], align 8, !dbg [[DBG28:![0-9]+]]
-// WPD-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8, !dbg [[DBG29:![0-9]+]]
-// WPD-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS1S"), !dbg [[DBG30:![0-9]+]], !nosanitize [[META12]]
-// WPD-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !dbg [[DBG30]], !nosanitize [[META12]]
-// WPD-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !dbg [[DBG30]], !nosanitize [[META12]]
-// WPD-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]), !dbg [[DBG29]]
-// WPD-NEXT:    ret void, !dbg [[DBG31:![0-9]+]]
+// WPD-NEXT:      #dbg_declare(ptr [[S_ADDR]], [[META29:![0-9]+]], !DIExpression(), [[META30:![0-9]+]])
+// WPD-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S_ADDR]], align 8, !dbg [[DBG31:![0-9]+]]
+// WPD-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8, !dbg [[DBG32:![0-9]+]]
+// WPD-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS1S"), !dbg [[DBG32]]
+// WPD-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !dbg [[DBG32]]
+// WPD-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]), !dbg [[DBG32]]
+// WPD-NEXT:    ret void, !dbg [[DBG33:![0-9]+]]
 //
 // NOWPD-LABEL: define hidden void @unchecked(
 // NOWPD-SAME: ptr noundef [[S:%.*]]) #[[ATTR0]] !dbg [[DBG26:![0-9]+]] !guid [[META27:![0-9]+]] {
@@ -91,38 +93,37 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void unchecked(S *s) {
   s->f();
 }
 //.
-// WPD: [[META0:![0-9]+]] = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: [[META1:![0-9]+]], isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
-// WPD: [[META1]] = !DIFile(filename: "{{.*}}<stdin>", directory: {{.*}})
-// WPD: [[DBG6]] = distinct !DISubprogram(name: "checked", scope: [[META7:![0-9]+]], file: [[META7]], line: 59, type: [[META8:![0-9]+]], scopeLine: 59, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: [[META0]], retainedNodes: [[META12]])
-// WPD: [[META7]] = !DIFile(filename: "{{.*}}cfi-vcall-debuginfo.cpp", directory: {{.*}})
-// WPD: [[META8]] = !DISubroutineType(types: [[META9:![0-9]+]])
-// WPD: [[META9]] = !{null, [[META10:![0-9]+]]}
-// WPD: [[META10]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: [[META11:![0-9]+]], size: 64)
-// WPD: [[META11]] = !DICompositeType(tag: DW_TAG_structure_type, name: "S", file: [[META7]], line: 14, size: 64, flags: DIFlagFwdDecl | DIFlagNonTrivial)
-// WPD: [[META12]] = !{}
-// WPD: [[META13]] = !{i64 9020075254552892215}
-// WPD: [[META14]] = !DILocalVariable(name: "s", arg: 1, scope: [[DBG6]], file: [[META7]], line: 59, type: [[META10]])
-// WPD: [[META15]] = !DILocation(line: 59, column: 28, scope: [[DBG6]])
-// WPD: [[DBG16]] = !DILocation(line: 60, column: 3, scope: [[DBG6]])
-// WPD: [[DBG17]] = !DILocation(line: 60, column: 6, scope: [[DBG6]])
-// WPD: [[DBG18]] = !DILocation(line: 0, scope: [[META19:![0-9]+]], inlinedAt: [[DBG17]])
-// WPD: [[META19]] = distinct !DISubprogram(name: "__ubsan_check_cfi_vcall", scope: [[META20:![0-9]+]], file: [[META20]], type: [[META21:![0-9]+]], flags: DIFlagArtificial, spFlags: DISPFlagDefinition, unit: [[META0]])
-// WPD: [[META20]] = !DIFile(filename: "{{.*}}ubsan_interface.h", directory: {{.*}})
-// WPD: [[META21]] = !DISubroutineType(types: null)
-// WPD: [[PROF22]] = !{!"branch_weights", i32 1048575, i32 1}
-// WPD: [[DBG23]] = !DILocation(line: 61, column: 1, scope: [[DBG6]])
-// WPD: [[DBG24]] = distinct !DISubprogram(name: "unchecked", scope: [[META7]], file: [[META7]], line: 90, type: [[META8]], scopeLine: 90, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: [[META0]], retainedNodes: [[META12]])
-// WPD: [[META25]] = !{i64 6260720745251443117}
-// WPD: [[META26]] = !DILocalVariable(name: "s", arg: 1, scope: [[DBG24]], file: [[META7]], line: 90, type: [[META10]])
-// WPD: [[META27]] = !DILocation(line: 90, column: 72, scope: [[DBG24]])
-// WPD: [[DBG28]] = !DILocation(line: 91, column: 3, scope: [[DBG24]])
-// WPD: [[DBG29]] = !DILocation(line: 91, column: 6, scope: [[DBG24]])
-// WPD: [[DBG30]] = !DILocation(line: 0, scope: [[META19]], inlinedAt: [[DBG29]])
-// WPD: [[DBG31]] = !DILocation(line: 92, column: 1, scope: [[DBG24]])
+// WPD: [[META3:![0-9]+]] = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: [[META4:![0-9]+]], isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+// WPD: [[META4]] = !DIFile(filename: "{{.*}}<stdin>", directory: {{.*}})
+// WPD: [[DBG9]] = distinct !DISubprogram(name: "checked", scope: [[META10:![0-9]+]], file: [[META10]], line: 62, type: [[META11:![0-9]+]], scopeLine: 62, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: [[META3]], retainedNodes: [[META15]])
+// WPD: [[META10]] = !DIFile(filename: "{{.*}}cfi-vcall-debuginfo.cpp", directory: {{.*}})
+// WPD: [[META11]] = !DISubroutineType(types: [[META12:![0-9]+]])
+// WPD: [[META12]] = !{null, [[META13:![0-9]+]]}
+// WPD: [[META13]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: [[META14:![0-9]+]], size: 64)
+// WPD: [[META14]] = !DICompositeType(tag: DW_TAG_structure_type, name: "S", file: [[META10]], line: 14, size: 64, flags: DIFlagFwdDecl | DIFlagNonTrivial)
+// WPD: [[META15]] = !{}
+// WPD: [[META16]] = !{i64 9020075254552892215}
+// WPD: [[META17]] = !DILocalVariable(name: "s", arg: 1, scope: [[DBG9]], file: [[META10]], line: 62, type: [[META13]])
+// WPD: [[META18]] = !DILocation(line: 62, column: 28, scope: [[DBG9]])
+// WPD: [[DBG19]] = !DILocation(line: 63, column: 3, scope: [[DBG9]])
+// WPD: [[DBG20]] = !DILocation(line: 63, column: 6, scope: [[DBG9]])
+// WPD: [[DBG21]] = !DILocation(line: 0, scope: [[META22:![0-9]+]], inlinedAt: [[DBG20]])
+// WPD: [[META22]] = distinct !DISubprogram(name: "__ubsan_check_cfi_vcall", scope: [[META23:![0-9]+]], file: [[META23]], type: [[META24:![0-9]+]], flags: DIFlagArtificial, spFlags: DISPFlagDefinition, unit: [[META3]])
+// WPD: [[META23]] = !DIFile(filename: "{{.*}}ubsan_interface.h", directory: {{.*}})
+// WPD: [[META24]] = !DISubroutineType(types: null)
+// WPD: [[PROF25]] = !{!"branch_weights", i32 1048575, i32 1}
+// WPD: [[DBG26]] = !DILocation(line: 64, column: 1, scope: [[DBG9]])
+// WPD: [[DBG27]] = distinct !DISubprogram(name: "unchecked", scope: [[META10]], file: [[META10]], line: 92, type: [[META11]], scopeLine: 92, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: [[META3]], retainedNodes: [[META15]])
+// WPD: [[META28]] = !{i64 6260720745251443117}
+// WPD: [[META29]] = !DILocalVariable(name: "s", arg: 1, scope: [[DBG27]], file: [[META10]], line: 92, type: [[META13]])
+// WPD: [[META30]] = !DILocation(line: 92, column: 72, scope: [[DBG27]])
+// WPD: [[DBG31]] = !DILocation(line: 93, column: 3, scope: [[DBG27]])
+// WPD: [[DBG32]] = !DILocation(line: 93, column: 6, scope: [[DBG27]])
+// WPD: [[DBG33]] = !DILocation(line: 94, column: 1, scope: [[DBG27]])
 //.
 // NOWPD: [[META3:![0-9]+]] = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: [[META4:![0-9]+]], isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
 // NOWPD: [[META4]] = !DIFile(filename: "{{.*}}<stdin>", directory: {{.*}})
-// NOWPD: [[DBG8]] = distinct !DISubprogram(name: "checked", scope: [[META9:![0-9]+]], file: [[META9]], line: 59, type: [[META10:![0-9]+]], scopeLine: 59, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: [[META3]], retainedNodes: [[META14]])
+// NOWPD: [[DBG8]] = distinct !DISubprogram(name: "checked", scope: [[META9:![0-9]+]], file: [[META9]], line: 62, type: [[META10:![0-9]+]], scopeLine: 62, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: [[META3]], retainedNodes: [[META14]])
 // NOWPD: [[META9]] = !DIFile(filename: "{{.*}}cfi-vcall-debuginfo.cpp", directory: {{.*}})
 // NOWPD: [[META10]] = !DISubroutineType(types: [[META11:![0-9]+]])
 // NOWPD: [[META11]] = !{null, [[META12:![0-9]+]]}
@@ -130,21 +131,21 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void unchecked(S *s) {
 // NOWPD: [[META13]] = !DICompositeType(tag: DW_TAG_structure_type, name: "S", file: [[META9]], line: 14, size: 64, flags: DIFlagFwdDecl | DIFlagNonTrivial)
 // NOWPD: [[META14]] = !{}
 // NOWPD: [[META15]] = !{i64 9020075254552892215}
-// NOWPD: [[META16]] = !DILocalVariable(name: "s", arg: 1, scope: [[DBG8]], file: [[META9]], line: 59, type: [[META12]])
-// NOWPD: [[META17]] = !DILocation(line: 59, column: 28, scope: [[DBG8]])
-// NOWPD: [[DBG18]] = !DILocation(line: 60, column: 3, scope: [[DBG8]])
-// NOWPD: [[DBG19]] = !DILocation(line: 60, column: 6, scope: [[DBG8]])
+// NOWPD: [[META16]] = !DILocalVariable(name: "s", arg: 1, scope: [[DBG8]], file: [[META9]], line: 62, type: [[META12]])
+// NOWPD: [[META17]] = !DILocation(line: 62, column: 28, scope: [[DBG8]])
+// NOWPD: [[DBG18]] = !DILocation(line: 63, column: 3, scope: [[DBG8]])
+// NOWPD: [[DBG19]] = !DILocation(line: 63, column: 6, scope: [[DBG8]])
 // NOWPD: [[DBG20]] = !DILocation(line: 0, scope: [[META21:![0-9]+]], inlinedAt: [[DBG19]])
 // NOWPD: [[META21]] = distinct !DISubprogram(name: "__ubsan_check_cfi_vcall", scope: [[META22:![0-9]+]], file: [[META22]], type: [[META23:![0-9]+]], flags: DIFlagArtificial, spFlags: DISPFlagDefinition, unit: [[META3]])
 // NOWPD: [[META22]] = !DIFile(filename: "{{.*}}ubsan_interface.h", directory: {{.*}})
 // NOWPD: [[META23]] = !DISubroutineType(types: null)
 // NOWPD: [[PROF24]] = !{!"branch_weights", i32 1048575, i32 1}
-// NOWPD: [[DBG25]] = !DILocation(line: 61, column: 1, scope: [[DBG8]])
-// NOWPD: [[DBG26]] = distinct !DISubprogram(name: "unchecked", scope: [[META9]], file: [[META9]], line: 90, type: [[META10]], scopeLine: 90, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: [[META3]], retainedNodes: [[META14]])
+// NOWPD: [[DBG25]] = !DILocation(line: 64, column: 1, scope: [[DBG8]])
+// NOWPD: [[DBG26]] = distinct !DISubprogram(name: "unchecked", scope: [[META9]], file: [[META9]], line: 92, type: [[META10]], scopeLine: 92, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: [[META3]], retainedNodes: [[META14]])
 // NOWPD: [[META27]] = !{i64 6260720745251443117}
-// NOWPD: [[META28]] = !DILocalVariable(name: "s", arg: 1, scope: [[DBG26]], file: [[META9]], line: 90, type: [[META12]])
-// NOWPD: [[META29]] = !DILocation(line: 90, column: 72, scope: [[DBG26]])
-// NOWPD: [[DBG30]] = !DILocation(line: 91, column: 3, scope: [[DBG26]])
-// NOWPD: [[DBG31]] = !DILocation(line: 91, column: 6, scope: [[DBG26]])
-// NOWPD: [[DBG32]] = !DILocation(line: 92, column: 1, scope: [[DBG26]])
+// NOWPD: [[META28]] = !DILocalVariable(name: "s", arg: 1, scope: [[DBG26]], file: [[META9]], line: 92, type: [[META12]])
+// NOWPD: [[META29]] = !DILocation(line: 92, column: 72, scope: [[DBG26]])
+// NOWPD: [[DBG30]] = !DILocation(line: 93, column: 3, scope: [[DBG26]])
+// NOWPD: [[DBG31]] = !DILocation(line: 93, column: 6, scope: [[DBG26]])
+// NOWPD: [[DBG32]] = !DILocation(line: 94, column: 1, scope: [[DBG26]])
 //.

>From efd0f4ffd9ab5989d6eae69d46c2fbcae67159e4 Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Thu, 12 Nov 2026 19:06:11 -0800
Subject: [PATCH 2/2] [spr] update

Created using spr 2.0.0-beta.2
---
 clang/lib/CodeGen/CGClass.cpp                 |  38 +++--
 clang/test/CodeGenCXX/cfi-ignorelist.cpp      |   4 +-
 .../cfi-vcall-type-checked-load.cpp           | 130 +++++++++---------
 compiler-rt/test/cfi/same-layout-delete.cpp   |   3 -
 4 files changed, 88 insertions(+), 87 deletions(-)

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index a1b61394571d4..4fbe06314c9a3 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -2979,31 +2979,44 @@ void CodeGenFunction::EmitVTableCheck(CFITypeCheckKind TCK, CanQualType T,
             StaticData, {VTable, ValidVtable});
 }
 
+static std::pair<const CXXRecordDecl *, bool>
+getCFIVCallTarget(const CodeGenFunction &CGF, const CXXRecordDecl *RD) {
+  if (!CGF.SanOpts.has(SanitizerKind::CFIVCall))
+    return {RD, false};
+  if (!CGF.SanOpts.has(SanitizerKind::CFICastStrict))
+    RD = LeastDerivedClassWithSameLayout(RD);
+  bool ShouldEmitCFICheck = !CGF.getContext().getNoSanitizeList().containsType(
+      SanitizerKind::CFIVCall, RD->getQualifiedNameAsString());
+  return {RD, ShouldEmitCFICheck};
+}
+
 bool CodeGenFunction::ShouldEmitVTableTypeCheckedLoad(const CXXRecordDecl *RD) {
-  if (!CGM.getCodeGenOpts().WholeProgramVTables ||
-      !CGM.HasHiddenLTOVisibility(RD))
+  if (!CGM.getCodeGenOpts().WholeProgramVTables)
+    return false;
+
+  auto [TargetRD, ShouldEmitCFICheck] = getCFIVCallTarget(*this, RD);
+  if (!CGM.HasHiddenLTOVisibility(TargetRD))
     return false;
 
+  // GlobalDCE's virtual function elimination only treats vtable slots as live
+  // if they are loaded via llvm.type.checked.load, so it must always be used.
   if (CGM.getCodeGenOpts().VirtualFunctionElimination)
     return true;
 
-  if (!SanOpts.has(SanitizerKind::CFIVCall) ||
-      !CGM.getCodeGenOpts().SanitizeTrap.has(SanitizerKind::CFIVCall))
-    return false;
-
-  std::string TypeName = RD->getQualifiedNameAsString();
-  return !getContext().getNoSanitizeList().containsType(SanitizerKind::CFIVCall,
-                                                        TypeName);
+  return ShouldEmitCFICheck &&
+         CGM.getCodeGenOpts().SanitizeTrap.has(SanitizerKind::CFIVCall);
 }
 
 llvm::Value *CodeGenFunction::EmitVTableTypeCheckedLoad(
     const CXXRecordDecl *RD, llvm::Value *VTable, llvm::Type *VTableTy,
     uint64_t VTableByteOffset, SourceLocation /*Loc*/) {
+  auto [TargetRD, ShouldEmitCFICheck] = getCFIVCallTarget(*this, RD);
+
   auto CheckOrdinal = SanitizerKind::SO_CFIVCall;
   auto CheckHandler = SanitizerHandler::CFICheckFail;
   SanitizerDebugLocation SanScope(this, {CheckOrdinal}, CheckHandler);
 
-  CanQualType T = CGM.getContext().getCanonicalTagType(RD);
+  CanQualType T = CGM.getContext().getCanonicalTagType(TargetRD);
   llvm::Metadata *MD = CGM.CreateMetadataIdentifierForType(T);
   llvm::Value *TypeId = llvm::MetadataAsValue::get(CGM.getLLVMContext(), MD);
 
@@ -3016,10 +3029,7 @@ llvm::Value *CodeGenFunction::EmitVTableTypeCheckedLoad(
 
   llvm::Value *CheckResult = Builder.CreateExtractValue(CheckedLoad, 1);
 
-  std::string TypeName = RD->getQualifiedNameAsString();
-  if (SanOpts.has(SanitizerKind::CFIVCall) &&
-      !getContext().getNoSanitizeList().containsType(SanitizerKind::CFIVCall,
-                                                     TypeName)) {
+  if (ShouldEmitCFICheck) {
     EmitSanitizerStatReport(llvm::SanStat_CFI_VCall);
     EmitCheck(std::make_pair(CheckResult, CheckOrdinal), CheckHandler, {}, {});
   }
diff --git a/clang/test/CodeGenCXX/cfi-ignorelist.cpp b/clang/test/CodeGenCXX/cfi-ignorelist.cpp
index 86fffb2d150df..f2695a76d553a 100644
--- a/clang/test/CodeGenCXX/cfi-ignorelist.cpp
+++ b/clang/test/CodeGenCXX/cfi-ignorelist.cpp
@@ -73,9 +73,9 @@ struct DerivedFromS2 : std::S2 {};
 // NOSTD-WPD-NOT: llvm.type.test
 // NOSTD-WPD-NOT: call void @__ubsan_handle_cfi_check_fail
 // NOSTD-WPD: ret void
-// NOSTD-VFE: call { ptr, i1 } @llvm.type.checked.load(ptr {{.*}}, i32 16, metadata !"_ZTS13DerivedFromS2")
+// NOSTD-VFE: call { ptr, i1 } @llvm.type.checked.load(ptr {{.*}}, i32 16, metadata !"_ZTSSt2S2")
 // NOSTD-VFE: extractvalue { ptr, i1 } {{.*}}, 1
-// NOSTD-VFE: call void @__ubsan_handle_cfi_check_fail_abort()
+// NOSTD-VFE-NOT: call void @__ubsan_handle_cfi_check_fail
 // NOSTD-VFE: ret void
 void d2f(DerivedFromS2 *d) {
   delete d;
diff --git a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
index cff49bfca5c9b..9c1f5014ddb52 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
@@ -87,20 +87,20 @@ struct DerivedSameLayoutFromPublic : Public {};
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_hidden(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META9:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META10:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META10:![0-9]+]]
-// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF11:![0-9]+]], !nosanitize [[META10]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META11:![0-9]+]]
+// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12:![0-9]+]], !nosanitize [[META11]]
 // VFECROSS_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFECROSS_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR7:[0-9]+]], !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META10]]
+// VFECROSS_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR7:[0-9]+]], !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META11]]
 // VFECROSS_MIN:       [[CONT]]:
-// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META10]]
+// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
 // VFECROSS_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFECROSS_MIN-NEXT:    ret void
 //
@@ -253,17 +253,17 @@ extern "C" void call_hidden(Hidden *p) {
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_public(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META12:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META13:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF11]], !nosanitize [[META10]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF12]], !nosanitize [[META11]]
 // VFECROSS_MIN:       [[CFI_SLOWPATH]]:
-// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 7659278028533726273, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.1) #[[ATTR8:[0-9]+]], !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META10]]
+// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 7659278028533726273, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.1) #[[ATTR8:[0-9]+]], !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META11]]
 // VFECROSS_MIN:       [[CFI_CONT]]:
 // VFECROSS_MIN-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
 // VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
@@ -375,15 +375,15 @@ extern "C" void call_public(Public *p) {
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_no_sanitize(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META13:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META14:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META10]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
 // VFECROSS_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFECROSS_MIN-NEXT:    ret void
 //
@@ -492,7 +492,7 @@ 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 [[META7]]
+// XDSOT-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS6Hidden"), !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]]:
@@ -515,7 +515,7 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidde
 // VFEFULL-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
 // VFEFULL:       [[DELETE_NOTNULL]]:
 // VFEFULL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS17DerivedSameLayout"), !nosanitize [[META5]]
+// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS6Hidden"), !nosanitize [[META5]]
 // VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
 // VFEFULL-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6]], !nosanitize [[META5]]
 // VFEFULL:       [[HANDLER_CFI_CHECK_FAIL]]:
@@ -529,7 +529,7 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidde
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_derived_same_layout(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META14:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META15:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -538,14 +538,14 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidde
 // VFECROSS_MIN-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
 // VFECROSS_MIN:       [[DELETE_NOTNULL]]:
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS17DerivedSameLayout"), !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF11]], !nosanitize [[META10]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS6Hidden"), !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12]], !nosanitize [[META11]]
 // VFECROSS_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFECROSS_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR7]], !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META10]]
+// VFECROSS_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR7]], !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META11]]
 // VFECROSS_MIN:       [[CONT]]:
-// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META10]]
+// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
 // VFECROSS_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR8]]
 // VFECROSS_MIN-NEXT:    br label %[[DELETE_END]]
 // VFECROSS_MIN:       [[DELETE_END]]:
@@ -731,20 +731,20 @@ extern "C" void call_derived_same_layout(DerivedSameLayout *p) {
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_derived_public(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META15:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META16:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 32, metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF11]], !nosanitize [[META10]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 32, metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12]], !nosanitize [[META11]]
 // VFECROSS_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFECROSS_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR7]], !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META10]]
+// VFECROSS_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR7]], !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META11]]
 // VFECROSS_MIN:       [[CONT]]:
-// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META10]]
+// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
 // VFECROSS_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(16) [[TMP0]])
 // VFECROSS_MIN-NEXT:    ret void
 //
@@ -874,15 +874,15 @@ 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 [[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 [[META7]]
-// XDSOT-NEXT:    unreachable, !nosanitize [[META7]]
-// XDSOT:       [[CONT]]:
-// 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:    [[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]], !nosanitize [[META7]]
+// XDSOT-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META7]]
+// XDSOT:       [[CFI_CONT]]:
+// XDSOT-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 3
+// XDSOT-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// XDSOT-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR8]]
 // XDSOT-NEXT:    br label %[[DELETE_END]]
 // XDSOT:       [[DELETE_END]]:
 // XDSOT-NEXT:    ret void
@@ -897,21 +897,15 @@ extern "C" void call_derived_public(DerivedFromPublic *p) {
 // VFEFULL-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
 // VFEFULL:       [[DELETE_NOTNULL]]:
 // VFEFULL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS27DerivedSameLayoutFromPublic"), !nosanitize [[META5]]
-// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFEFULL-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6]], !nosanitize [[META5]]
-// VFEFULL:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFEFULL-NEXT:    call void @__ubsan_handle_cfi_check_fail() #[[ATTR3]], !nosanitize [[META5]]
-// VFEFULL-NEXT:    br label %[[CONT]], !nosanitize [[META5]]
-// VFEFULL:       [[CONT]]:
-// VFEFULL-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFEFULL-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR4]]
+// VFEFULL-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 3
+// VFEFULL-NEXT:    [[TMP1:%.*]] = load ptr, ptr [[VFN]], align 8
+// VFEFULL-NEXT:    call void [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR4]]
 // VFEFULL-NEXT:    br label %[[DELETE_END]]
 // VFEFULL:       [[DELETE_END]]:
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @delete_derived_same_layout_from_public(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META16:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META17:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -920,15 +914,15 @@ extern "C" void call_derived_public(DerivedFromPublic *p) {
 // VFECROSS_MIN-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
 // VFECROSS_MIN:       [[DELETE_NOTNULL]]:
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS27DerivedSameLayoutFromPublic"), !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF11]], !nosanitize [[META10]]
-// VFECROSS_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFECROSS_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR7]], !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META10]]
-// VFECROSS_MIN:       [[CONT]]:
-// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META10]]
-// VFECROSS_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR8]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF12]], !nosanitize [[META11]]
+// VFECROSS_MIN:       [[CFI_SLOWPATH]]:
+// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 7659278028533726273, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.2) #[[ATTR8]], !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META11]]
+// VFECROSS_MIN:       [[CFI_CONT]]:
+// VFECROSS_MIN-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 3
+// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// VFECROSS_MIN-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR8]]
 // VFECROSS_MIN-NEXT:    br label %[[DELETE_END]]
 // VFECROSS_MIN:       [[DELETE_END]]:
 // VFECROSS_MIN-NEXT:    ret void
@@ -1058,14 +1052,14 @@ extern "C" void delete_derived_same_layout_from_public(DerivedSameLayoutFromPubl
 // VFEFULL: [[META10]] = !{i64 -1300877796466697334}
 // VFEFULL: [[META11]] = !{i64 -3011432234017786520}
 //.
-// VFECROSS_MIN: [[META9]] = !{i64 -8223949192042198753}
-// VFECROSS_MIN: [[META10]] = !{}
-// VFECROSS_MIN: [[PROF11]] = !{!"branch_weights", i32 1048575, i32 1}
-// VFECROSS_MIN: [[META12]] = !{i64 4735877602249467044}
-// VFECROSS_MIN: [[META13]] = !{i64 7641651042058123257}
-// VFECROSS_MIN: [[META14]] = !{i64 -4426688768985367573}
-// VFECROSS_MIN: [[META15]] = !{i64 -1300877796466697334}
-// VFECROSS_MIN: [[META16]] = !{i64 -3011432234017786520}
+// VFECROSS_MIN: [[META10]] = !{i64 -8223949192042198753}
+// VFECROSS_MIN: [[META11]] = !{}
+// VFECROSS_MIN: [[PROF12]] = !{!"branch_weights", i32 1048575, i32 1}
+// VFECROSS_MIN: [[META13]] = !{i64 4735877602249467044}
+// VFECROSS_MIN: [[META14]] = !{i64 7641651042058123257}
+// VFECROSS_MIN: [[META15]] = !{i64 -4426688768985367573}
+// VFECROSS_MIN: [[META16]] = !{i64 -1300877796466697334}
+// VFECROSS_MIN: [[META17]] = !{i64 -3011432234017786520}
 //.
 // MS: [[META12]] = !{i64 -8223949192042198753}
 // MS: [[META13]] = !{}
diff --git a/compiler-rt/test/cfi/same-layout-delete.cpp b/compiler-rt/test/cfi/same-layout-delete.cpp
index 7c086ee59c3b0..1bdb46389a531 100644
--- a/compiler-rt/test/cfi/same-layout-delete.cpp
+++ b/compiler-rt/test/cfi/same-layout-delete.cpp
@@ -8,9 +8,6 @@
 // through a pointer to a derived class with the same layout. This must also
 // hold with -fwhole-program-vtables (the devirt test suites).
 
-// FIXME: With -fwhole-program-vtables, the checked load uses the derived class.
-// XFAIL: devirt
-
 #include "utils.h"
 
 struct A {



More information about the llvm-branch-commits mailing list