[clang] [compiler-rt] [NFC][Clang][CodeGen] Take const& in deleted copy assignment operators (PR #241713)

Vitaly Buka via cfe-commits cfe-commits at lists.llvm.org
Thu Nov 12 19:06:23 PST 2026


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

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

Created using spr 2.0.0-beta.2
---
 clang/test/CodeGenCXX/cfi-ignorelist.cpp      |   40 +
 .../CodeGenCXX/cfi-ms-secondary-vfptr.cpp     |   76 ++
 clang/test/CodeGenCXX/cfi-stats.cpp           |   14 +
 clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp   |    4 +-
 .../cfi-vcall-type-checked-load.cpp           | 1108 +++++++++++++++++
 clang/test/CodeGenCXX/cfi-vtable-check.cpp    |  138 ++
 .../DebugInfo/Generic/cfi-vcall-debuginfo.cpp |  150 +++
 7 files changed, 1529 insertions(+), 1 deletion(-)
 create mode 100644 clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp
 create mode 100644 clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
 create mode 100644 clang/test/CodeGenCXX/cfi-vtable-check.cpp
 create mode 100644 clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp

diff --git a/clang/test/CodeGenCXX/cfi-ignorelist.cpp b/clang/test/CodeGenCXX/cfi-ignorelist.cpp
index bdab782b5a113..548641c2af1fd 100644
--- a/clang/test/CodeGenCXX/cfi-ignorelist.cpp
+++ b/clang/test/CodeGenCXX/cfi-ignorelist.cpp
@@ -14,6 +14,10 @@
 // RUN: echo "type:std::*" >> %t.other.txt
 // RUN: %clang_cc1 -triple %itanium_abi_triple -fvisibility=hidden -fms-extensions -fsanitize=cfi-vcall -fsanitize-ignorelist=%t.other.txt -emit-llvm -o - %s | FileCheck --check-prefix=CHECK --check-prefix=NOBL %s
 
+// Check ignore listing with -fwhole-program-vtables and -fvirtual-function-elimination.
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fms-extensions -fsanitize=cfi-vcall -fwhole-program-vtables -fsanitize-ignorelist=%t.vcall.txt -emit-llvm -o - %s | FileCheck --check-prefix=NOSTD-WPD %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fms-extensions -fsanitize=cfi-vcall -fwhole-program-vtables -fvirtual-function-elimination -fsanitize-ignorelist=%t.vcall.txt -emit-llvm -o - %s | FileCheck --check-prefix=NOSTD-VFE %s
+
 struct S1 {
   virtual void f();
 };
@@ -27,15 +31,51 @@ struct S2 {
 }
 
 // CHECK: define{{.*}}s1f
+// NOSTD-WPD-LABEL: define{{.*}}s1f
+// NOSTD-VFE-LABEL: define{{.*}}s1f
 // NOBL: llvm.type.test
 // NOSTD: llvm.type.test
+// 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()
 void s1f(S1 *s1) {
   s1->f();
 }
 
 // CHECK: define{{.*}}s2f
+// NOSTD-WPD-LABEL: define{{.*}}s2f
+// NOSTD-VFE-LABEL: define{{.*}}s2f
 // NOBL: llvm.type.test
 // NOSTD-NOT: llvm.type.test
+// NOSTD-WPD-NOT: llvm.type.checked.load
+// 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
+// NOSTD-VFE: extractvalue { ptr, i1 } {{.*}}, 1
+// NOSTD-VFE-NOT: call void @__ubsan_handle_cfi_check_fail
+// NOSTD-VFE: ret void
 void s2f(std::S2 *s2) {
   s2->f();
 }
+
+struct DerivedFromS2 : std::S2 {};
+
+// CHECK-LABEL: define{{.*}}d2f
+// NOSTD-WPD-LABEL: define{{.*}}d2f
+// NOSTD-VFE-LABEL: define{{.*}}d2f
+// NOBL: llvm.type.test{{.*}}!"_ZTSSt2S2"
+// NOSTD-NOT: llvm.type.test
+// CHECK: ret void
+// NOSTD-WPD-NOT: llvm.type.checked.load
+// 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 0, metadata !"_ZTS13DerivedFromS2")
+// NOSTD-VFE: extractvalue { ptr, i1 } {{.*}}, 1
+// NOSTD-VFE: call void @__ubsan_handle_cfi_check_fail_abort()
+// NOSTD-VFE: ret void
+void d2f(DerivedFromS2 *d) {
+  d->f();
+}
diff --git a/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp b/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp
new file mode 100644
index 0000000000000..f0f8864c0302e
--- /dev/null
+++ b/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp
@@ -0,0 +1,76 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
+// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -flto -flto-unit -fsanitize=cfi-vcall -fsanitize-trap=cfi-vcall -fwhole-program-vtables -emit-llvm -o - %s | FileCheck %s
+
+struct Primary {
+  virtual void pri();
+};
+
+struct [[clang::lto_visibility_public]] Public {
+  virtual void pub();
+};
+
+struct DerivedFromPublic : Primary, Public {
+  void pub() override;
+};
+
+struct HiddenSec {
+  virtual void sec();
+};
+
+struct DerivedFromHidden : Primary, HiddenSec {
+  void sec() override;
+};
+
+// CHECK-LABEL: define dso_local void @call_public_sec(
+// CHECK-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META8:![0-9]+]] {
+// CHECK-NEXT:  [[ENTRY:.*:]]
+// CHECK-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// CHECK-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// CHECK-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
+// CHECK-NEXT:    [[TMP2:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
+// CHECK-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP2]], align 8
+// CHECK-NEXT:    [[TMP3:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"?AUPublic@@"), !nosanitize [[META9:![0-9]+]]
+// CHECK-NEXT:    [[TMP4:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 1, !nosanitize [[META9]]
+// CHECK-NEXT:    br i1 [[TMP4]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF10:![0-9]+]], !nosanitize [[META9]]
+// CHECK:       [[TRAP]]:
+// CHECK-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3:[0-9]+]], !nosanitize [[META9]]
+// CHECK-NEXT:    unreachable, !nosanitize [[META9]]
+// CHECK:       [[CONT]]:
+// CHECK-NEXT:    [[TMP5:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 0, !nosanitize [[META9]]
+// CHECK-NEXT:    call void [[TMP5]](ptr noundef [[TMP1]])
+// CHECK-NEXT:    ret void
+//
+extern "C" void call_public_sec(DerivedFromPublic *p) {
+  p->pub();
+}
+
+// CHECK-LABEL: define dso_local void @call_hidden_sec(
+// CHECK-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META11:![0-9]+]] {
+// CHECK-NEXT:  [[ENTRY:.*:]]
+// CHECK-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// CHECK-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// CHECK-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
+// CHECK-NEXT:    [[TMP2:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
+// CHECK-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP2]], align 8
+// CHECK-NEXT:    [[TMP3:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"?AUHiddenSec@@"), !nosanitize [[META9]]
+// CHECK-NEXT:    [[TMP4:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 1, !nosanitize [[META9]]
+// CHECK-NEXT:    br i1 [[TMP4]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF10]], !nosanitize [[META9]]
+// CHECK:       [[TRAP]]:
+// CHECK-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3]], !nosanitize [[META9]]
+// CHECK-NEXT:    unreachable, !nosanitize [[META9]]
+// CHECK:       [[CONT]]:
+// CHECK-NEXT:    [[TMP5:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 0, !nosanitize [[META9]]
+// CHECK-NEXT:    call void [[TMP5]](ptr noundef [[TMP1]])
+// CHECK-NEXT:    ret void
+//
+extern "C" void call_hidden_sec(DerivedFromHidden *p) {
+  p->sec();
+}
+//.
+// CHECK: [[META8]] = !{i64 -5210807322846835646}
+// CHECK: [[META9]] = !{}
+// CHECK: [[PROF10]] = !{!"branch_weights", i32 1048575, i32 1}
+// CHECK: [[META11]] = !{i64 702925180092474428}
+//.
diff --git a/clang/test/CodeGenCXX/cfi-stats.cpp b/clang/test/CodeGenCXX/cfi-stats.cpp
index 091b1990930b5..f3690e41945a7 100644
--- a/clang/test/CodeGenCXX/cfi-stats.cpp
+++ b/clang/test/CodeGenCXX/cfi-stats.cpp
@@ -1,7 +1,9 @@
 // RUN: %clang_cc1 -triple x86_64-unknown-linux -fvisibility=hidden -fsanitize=cfi-vcall,cfi-nvcall,cfi-derived-cast,cfi-unrelated-cast,cfi-icall -fsanitize-stats -emit-llvm -o - %s | FileCheck %s
 // RUN: %clang_cc1 -triple x86_64-unknown-linux -fvisibility=hidden -fsanitize=cfi-vcall,cfi-nvcall,cfi-derived-cast,cfi-unrelated-cast,cfi-icall -fsanitize-trap=cfi-vcall -fwhole-program-vtables -fsanitize-stats -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fsanitize=cfi-vcall,cfi-nvcall,cfi-derived-cast,cfi-unrelated-cast,cfi-icall -fwhole-program-vtables -fvirtual-function-elimination -fsanitize-stats -emit-llvm -o - %s | FileCheck --check-prefix=VFE %s
 
 // CHECK: [[STATS:@[^ ]*]] = internal global { ptr, i32, [5 x [2 x ptr]] } { ptr null, i32 5, [5 x [2 x ptr]]
+// VFE: [[STATS:@[^ ]*]] = internal global { ptr, i32, [6 x [2 x ptr]] } { ptr null, i32 6, [6 x [2 x ptr]]
 // CHECK: {{\[\[}}2 x ptr] zeroinitializer,
 // CHECK: [2 x ptr] [ptr null, ptr inttoptr (i64 2305843009213693952 to ptr)],
 // CHECK: [2 x ptr] [ptr null, ptr inttoptr (i64 4611686018427387904 to ptr)],
@@ -17,8 +19,10 @@ struct A {
 struct B : A {};
 
 // CHECK: @vcall
+// VFE-LABEL: @vcall(
 extern "C" void vcall(A *a) {
   // CHECK: call void @__sanitizer_stat_report({{.*}}[[STATS]]{{.*}}i64 16)
+  // VFE: call void @__sanitizer_stat_report({{.*}}[[STATS]]{{.*}}i64 16)
   a->vf();
 }
 
@@ -46,6 +50,16 @@ extern "C" void icall(void (*p)()) {
   p();
 }
 
+// CHECK-LABEL: @vcall_unsanitized(
+// VFE-LABEL: @vcall_unsanitized(
+extern "C" __attribute__((no_sanitize("cfi-vcall"))) void vcall_unsanitized(A *a) {
+  // CHECK-NOT: @__sanitizer_stat_report
+  // VFE: call void @__sanitizer_stat_report({{.*}}[[STATS]]{{.*}}i64 96)
+  a->vf();
+  // CHECK: ret void
+  // VFE: ret void
+}
+
 // CHECK: define internal void [[CTOR]]()
 // CHECK-NEXT: call void @__sanitizer_stat_init(ptr [[STATS]])
 // CHECK-NEXT: ret void
diff --git a/clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp b/clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp
index 92ed322af6058..b3db3dac90fdb 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp
@@ -7,8 +7,10 @@ struct S1 {
 };
 
 // CHECK: define{{.*}}s1f
-// CHECK: llvm.type.test
+// CFI: llvm.type.test(ptr {{.*}}, metadata !"{{.*}}S1{{.*}}")
+// CFI: llvm.type.test(ptr {{.*}}, metadata !"all-vtables")
 // CFI-NOT: llvm.assume
+// NOCFI: llvm.type.test(ptr {{.*}}, metadata !"{{.*}}S1{{.*}}")
 // NOCFI: llvm.assume
 void s1f(S1 *s1) {
   s1->f();
diff --git a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
new file mode 100644
index 0000000000000..a8969c4f01608
--- /dev/null
+++ b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
@@ -0,0 +1,1108 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-recover=cfi-vcall -fsanitize-minimal-runtime -fsanitize-cfi-cross-dso -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=XDSO %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fsanitize=cfi-vcall -fsanitize-trap=cfi-vcall -fsanitize-cfi-cross-dso -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=XDSOT %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-recover=cfi-vcall -fwhole-program-vtables -fvirtual-function-elimination -emit-llvm -o - %s | FileCheck --check-prefix=VFEFULL %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-recover=cfi-vcall -fsanitize-minimal-runtime -fsanitize-cfi-cross-dso -fwhole-program-vtables -fvirtual-function-elimination -emit-llvm -o - %s | FileCheck --check-prefix=VFECROSS_MIN %s
+// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -flto -flto-unit -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=MS %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fexperimental-relative-c++-abi-vtables -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=REL %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fdevirtualize-speculatively -emit-llvm -o - %s | FileCheck --check-prefix=SPEC %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fwhole-program-vtables -fvirtual-function-elimination -emit-llvm -o - %s | FileCheck --check-prefix=VFE_NOCFI %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fsanitize=cfi-vcall,cfi-cast-strict -fno-sanitize-trap=cfi-vcall -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=STRICT %s
+
+struct Hidden {
+  virtual void f();
+  virtual void g();
+  virtual ~Hidden();
+};
+
+struct DerivedSameLayout : Hidden {};
+
+struct [[clang::lto_visibility_public]] Public {
+  virtual void f();
+  virtual void pub();
+  virtual ~Public();
+};
+
+struct DerivedFromPublic : Hidden, Public { void pub() override; };
+
+struct DerivedSameLayoutFromPublic : Public {};
+
+// XDSO-LABEL: define hidden void @call_hidden(
+// XDSO-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META15:![0-9]+]] {
+// XDSO-NEXT:  [[ENTRY:.*:]]
+// XDSO-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// XDSO-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// XDSO-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// XDSO-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// XDSO-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Hidden"), !nosanitize [[META16:![0-9]+]]
+// XDSO-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF17:![0-9]+]], !nosanitize [[META16]]
+// XDSO:       [[CFI_SLOWPATH]]:
+// XDSO-NEXT:    call void @__cfi_slowpath_diag(i64 2113178649093603051, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.1) #[[ATTR7:[0-9]+]], !nosanitize [[META16]]
+// XDSO-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META16]]
+// XDSO:       [[CFI_CONT]]:
+// XDSO-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 1
+// XDSO-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// XDSO-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// XDSO-NEXT:    ret void
+//
+// XDSOT-LABEL: define hidden void @call_hidden(
+// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META8:![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:       [[TRAP]]:
+// XDSOT-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR7:[0-9]+]], !nosanitize [[META9]]
+// XDSOT-NEXT:    unreachable, !nosanitize [[META9]]
+// XDSOT:       [[CONT]]:
+// XDSOT-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META9]]
+// XDSOT-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// XDSOT-NEXT:    ret void
+//
+// VFEFULL-LABEL: define hidden void @call_hidden(
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META4:![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:       [[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:       [[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:    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-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:       [[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:       [[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]])
+// VFECROSS_MIN-NEXT:    ret void
+//
+// MS-LABEL: define dso_local void @call_hidden(
+// MS-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META12:![0-9]+]] {
+// MS-NEXT:  [[ENTRY:.*:]]
+// MS-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// MS-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// MS-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// MS-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// MS-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"?AUHidden@@"), !nosanitize [[META13:![0-9]+]]
+// MS-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META13]]
+// MS-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF14:![0-9]+]], !nosanitize [[META13]]
+// MS:       [[HANDLER_CFI_CHECK_FAIL]]:
+// MS-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META13]]
+// MS-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META13]]
+// MS-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.1, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR4:[0-9]+]], !nosanitize [[META13]]
+// MS-NEXT:    unreachable, !nosanitize [[META13]]
+// MS:       [[CONT]]:
+// MS-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 1
+// MS-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8
+// MS-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// MS-NEXT:    ret void
+//
+// REL-LABEL: define hidden void @call_hidden(
+// REL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META10:![0-9]+]] {
+// REL-NEXT:  [[ENTRY:.*:]]
+// REL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// REL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// REL-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// REL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// REL-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Hidden"), !nosanitize [[META11:![0-9]+]]
+// REL-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META11]]
+// REL-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12:![0-9]+]], !nosanitize [[META11]]
+// REL:       [[HANDLER_CFI_CHECK_FAIL]]:
+// REL-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META11]]
+// REL-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META11]]
+// REL-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.1, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR5:[0-9]+]], !nosanitize [[META11]]
+// REL-NEXT:    unreachable, !nosanitize [[META11]]
+// REL:       [[CONT]]:
+// REL-NEXT:    [[TMP5:%.*]] = call ptr @llvm.load.relative.i32(ptr [[VTABLE]], i32 4)
+// REL-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// REL-NEXT:    ret void
+//
+// SPEC-LABEL: define hidden void @call_hidden(
+// SPEC-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META9:![0-9]+]] {
+// SPEC-NEXT:  [[ENTRY:.*:]]
+// SPEC-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// SPEC-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// SPEC-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// SPEC-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// SPEC-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Hidden"), !nosanitize [[META10:![0-9]+]]
+// SPEC-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META10]]
+// SPEC-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF11:![0-9]+]], !nosanitize [[META10]]
+// SPEC:       [[HANDLER_CFI_CHECK_FAIL]]:
+// SPEC-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META10]]
+// SPEC-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META10]]
+// SPEC-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.1, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR4:[0-9]+]], !nosanitize [[META10]]
+// SPEC-NEXT:    unreachable, !nosanitize [[META10]]
+// SPEC:       [[CONT]]:
+// SPEC-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 1
+// SPEC-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8
+// SPEC-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// SPEC-NEXT:    ret void
+//
+// VFE_NOCFI-LABEL: define hidden void @call_hidden(
+// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META4:![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:![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:    ret void
+//
+// STRICT-LABEL: define hidden void @call_hidden(
+// STRICT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META13:![0-9]+]] {
+// STRICT-NEXT:  [[ENTRY:.*:]]
+// STRICT-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// STRICT-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// STRICT-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// STRICT-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// STRICT-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Hidden"), !nosanitize [[META14:![0-9]+]]
+// STRICT-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META14]]
+// STRICT-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF15:![0-9]+]], !nosanitize [[META14]]
+// STRICT:       [[HANDLER_CFI_CHECK_FAIL]]:
+// STRICT-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META14]]
+// STRICT-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META14]]
+// STRICT-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.1, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR4:[0-9]+]], !nosanitize [[META14]]
+// STRICT-NEXT:    unreachable, !nosanitize [[META14]]
+// STRICT:       [[CONT]]:
+// STRICT-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 1
+// STRICT-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8
+// STRICT-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// STRICT-NEXT:    ret void
+//
+extern "C" void call_hidden(Hidden *p) {
+  p->g();
+}
+
+// XDSO-LABEL: define hidden void @call_public(
+// XDSO-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META18:![0-9]+]] {
+// XDSO-NEXT:  [[ENTRY:.*:]]
+// XDSO-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// XDSO-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// XDSO-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// XDSO-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// XDSO-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META16]]
+// XDSO-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF17]], !nosanitize [[META16]]
+// XDSO:       [[CFI_SLOWPATH]]:
+// XDSO-NEXT:    call void @__cfi_slowpath_diag(i64 7659278028533726273, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.3) #[[ATTR7]], !nosanitize [[META16]]
+// XDSO-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META16]]
+// XDSO:       [[CFI_CONT]]:
+// XDSO-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// XDSO-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// XDSO-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// XDSO-NEXT:    ret void
+//
+// XDSOT-LABEL: define hidden void @call_public(
+// 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
+// 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:       [[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:       [[CFI_CONT]]:
+// XDSOT-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// XDSOT-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// XDSOT-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// XDSOT-NEXT:    ret void
+//
+// VFEFULL-LABEL: define hidden void @call_public(
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META7:![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:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// VFEFULL-NEXT:    [[TMP1:%.*]] = load ptr, ptr [[VFN]], align 8
+// VFEFULL-NEXT:    call void [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// 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-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:       [[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:       [[CFI_CONT]]:
+// VFECROSS_MIN-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// 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_public(
+// MS-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META15:![0-9]+]] {
+// MS-NEXT:  [[ENTRY:.*:]]
+// MS-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// MS-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// MS-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// MS-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// MS-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// MS-NEXT:    [[TMP1:%.*]] = load ptr, ptr [[VFN]], align 8
+// MS-NEXT:    call void [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// MS-NEXT:    ret void
+//
+// REL-LABEL: define hidden void @call_public(
+// REL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META13:![0-9]+]] {
+// REL-NEXT:  [[ENTRY:.*:]]
+// REL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// REL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// REL-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// REL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// REL-NEXT:    [[TMP1:%.*]] = call ptr @llvm.load.relative.i32(ptr [[VTABLE]], i32 0)
+// REL-NEXT:    call void [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// REL-NEXT:    ret void
+//
+// SPEC-LABEL: define hidden void @call_public(
+// SPEC-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META12:![0-9]+]] {
+// SPEC-NEXT:  [[ENTRY:.*:]]
+// SPEC-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// SPEC-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// SPEC-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// SPEC-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// SPEC-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// SPEC-NEXT:    [[TMP1:%.*]] = load ptr, ptr [[VFN]], align 8
+// SPEC-NEXT:    call void [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// 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-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:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = load ptr, ptr [[VFN]], align 8
+// VFE_NOCFI-NEXT:    call void [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// VFE_NOCFI-NEXT:    ret void
+//
+// STRICT-LABEL: define hidden void @call_public(
+// STRICT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META16:![0-9]+]] {
+// STRICT-NEXT:  [[ENTRY:.*:]]
+// STRICT-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// STRICT-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// STRICT-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// STRICT-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// STRICT-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// STRICT-NEXT:    [[TMP1:%.*]] = load ptr, ptr [[VFN]], align 8
+// STRICT-NEXT:    call void [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// STRICT-NEXT:    ret void
+//
+extern "C" void call_public(Public *p) {
+  p->f();
+}
+
+// XDSO-LABEL: define hidden void @call_no_sanitize(
+// XDSO-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META19:![0-9]+]] {
+// XDSO-NEXT:  [[ENTRY:.*:]]
+// XDSO-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// XDSO-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// XDSO-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// XDSO-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// XDSO-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Hidden")
+// XDSO-NEXT:    call void @llvm.assume(i1 [[TMP1]])
+// XDSO-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 1
+// XDSO-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// XDSO-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// XDSO-NEXT:    ret void
+//
+// XDSOT-LABEL: define hidden void @call_no_sanitize(
+// 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 i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Hidden")
+// XDSOT-NEXT:    call void @llvm.assume(i1 [[TMP1]])
+// XDSOT-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 1
+// XDSOT-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// XDSOT-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// XDSOT-NEXT:    ret void
+//
+// VFEFULL-LABEL: define hidden void @call_no_sanitize(
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META8:![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:    ret void
+//
+// VFECROSS_MIN-LABEL: define hidden void @call_no_sanitize(
+// 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 { 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:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// VFECROSS_MIN-NEXT:    ret void
+//
+// MS-LABEL: define dso_local void @call_no_sanitize(
+// MS-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META16:![0-9]+]] {
+// MS-NEXT:  [[ENTRY:.*:]]
+// MS-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// MS-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// MS-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// MS-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// MS-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"?AUHidden@@")
+// MS-NEXT:    call void @llvm.assume(i1 [[TMP1]])
+// MS-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 1
+// MS-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// MS-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// MS-NEXT:    ret void
+//
+// REL-LABEL: define hidden void @call_no_sanitize(
+// REL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META14:![0-9]+]] {
+// REL-NEXT:  [[ENTRY:.*:]]
+// REL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// REL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// REL-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// REL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// REL-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Hidden")
+// REL-NEXT:    call void @llvm.assume(i1 [[TMP1]])
+// REL-NEXT:    [[TMP2:%.*]] = call ptr @llvm.load.relative.i32(ptr [[VTABLE]], i32 4)
+// REL-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// REL-NEXT:    ret void
+//
+// SPEC-LABEL: define hidden void @call_no_sanitize(
+// SPEC-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META13:![0-9]+]] {
+// SPEC-NEXT:  [[ENTRY:.*:]]
+// SPEC-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// SPEC-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// SPEC-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// SPEC-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// SPEC-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Hidden")
+// SPEC-NEXT:    call void @llvm.assume(i1 [[TMP1]])
+// SPEC-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 1
+// SPEC-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// SPEC-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// 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-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:    ret void
+//
+// STRICT-LABEL: define hidden void @call_no_sanitize(
+// STRICT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META17:![0-9]+]] {
+// STRICT-NEXT:  [[ENTRY:.*:]]
+// STRICT-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// STRICT-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// STRICT-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// STRICT-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// STRICT-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Hidden")
+// STRICT-NEXT:    call void @llvm.assume(i1 [[TMP1]])
+// STRICT-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 1
+// STRICT-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// STRICT-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// STRICT-NEXT:    ret void
+//
+extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidden *p) {
+  p->g();
+}
+
+// XDSO-LABEL: define hidden void @call_derived_same_layout(
+// XDSO-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META20:![0-9]+]] {
+// XDSO-NEXT:  [[ENTRY:.*:]]
+// XDSO-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// XDSO-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// XDSO-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// XDSO-NEXT:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// XDSO-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
+// XDSO:       [[DELETE_NOTNULL]]:
+// XDSO-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// XDSO-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Hidden"), !nosanitize [[META16]]
+// XDSO-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF17]], !nosanitize [[META16]]
+// XDSO:       [[CFI_SLOWPATH]]:
+// XDSO-NEXT:    call void @__cfi_slowpath_diag(i64 2113178649093603051, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.4) #[[ATTR7]], !nosanitize [[META16]]
+// XDSO-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META16]]
+// XDSO:       [[CFI_CONT]]:
+// XDSO-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 3
+// XDSO-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// XDSO-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR7]]
+// XDSO-NEXT:    br label %[[DELETE_END]]
+// XDSO:       [[DELETE_END]]:
+// XDSO-NEXT:    ret void
+//
+// XDSOT-LABEL: define hidden void @call_derived_same_layout(
+// 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
+// XDSOT-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// XDSOT-NEXT:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// 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:       [[TRAP]]:
+// XDSOT-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR7]], !nosanitize [[META9]]
+// XDSOT-NEXT:    unreachable, !nosanitize [[META9]]
+// XDSOT:       [[CONT]]:
+// XDSOT-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META9]]
+// XDSOT-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR8]]
+// XDSOT-NEXT:    br label %[[DELETE_END]]
+// XDSOT:       [[DELETE_END]]:
+// XDSOT-NEXT:    ret void
+//
+// VFEFULL-LABEL: define hidden void @call_derived_same_layout(
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META9:![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:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// 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:    [[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:[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 [[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:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// 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:       [[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:    br label %[[DELETE_END]]
+// VFECROSS_MIN:       [[DELETE_END]]:
+// VFECROSS_MIN-NEXT:    ret void
+//
+// MS-LABEL: define dso_local void @call_derived_same_layout(
+// MS-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META17:![0-9]+]] {
+// MS-NEXT:  [[ENTRY:.*:]]
+// MS-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// MS-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// MS-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// MS-NEXT:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// MS-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
+// MS:       [[DELETE_NOTNULL]]:
+// MS-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// MS-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"?AUHidden@@"), !nosanitize [[META13]]
+// MS-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META13]]
+// MS-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF14]], !nosanitize [[META13]]
+// MS:       [[HANDLER_CFI_CHECK_FAIL]]:
+// MS-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META13]]
+// MS-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META13]]
+// MS-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.2, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR4]], !nosanitize [[META13]]
+// MS-NEXT:    unreachable, !nosanitize [[META13]]
+// MS:       [[CONT]]:
+// MS-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 2
+// MS-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8
+// MS-NEXT:    [[CALL:%.*]] = call noundef ptr [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]], i32 noundef 1) #[[ATTR5:[0-9]+]]
+// MS-NEXT:    br label %[[DELETE_END]]
+// MS:       [[DELETE_END]]:
+// MS-NEXT:    ret void
+//
+// REL-LABEL: define hidden void @call_derived_same_layout(
+// REL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META15:![0-9]+]] {
+// REL-NEXT:  [[ENTRY:.*:]]
+// REL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// REL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// REL-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// REL-NEXT:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// REL-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
+// REL:       [[DELETE_NOTNULL]]:
+// REL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// REL-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Hidden"), !nosanitize [[META11]]
+// REL-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META11]]
+// REL-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12]], !nosanitize [[META11]]
+// REL:       [[HANDLER_CFI_CHECK_FAIL]]:
+// REL-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META11]]
+// REL-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META11]]
+// REL-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.2, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR5]], !nosanitize [[META11]]
+// REL-NEXT:    unreachable, !nosanitize [[META11]]
+// REL:       [[CONT]]:
+// REL-NEXT:    [[TMP5:%.*]] = call ptr @llvm.load.relative.i32(ptr [[VTABLE]], i32 12)
+// REL-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR6:[0-9]+]]
+// REL-NEXT:    br label %[[DELETE_END]]
+// REL:       [[DELETE_END]]:
+// REL-NEXT:    ret void
+//
+// SPEC-LABEL: define hidden void @call_derived_same_layout(
+// SPEC-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META14:![0-9]+]] {
+// SPEC-NEXT:  [[ENTRY:.*:]]
+// SPEC-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// SPEC-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// SPEC-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// SPEC-NEXT:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// SPEC-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
+// SPEC:       [[DELETE_NOTNULL]]:
+// SPEC-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// SPEC-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Hidden"), !nosanitize [[META10]]
+// SPEC-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META10]]
+// SPEC-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF11]], !nosanitize [[META10]]
+// SPEC:       [[HANDLER_CFI_CHECK_FAIL]]:
+// SPEC-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META10]]
+// SPEC-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META10]]
+// SPEC-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.2, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR4]], !nosanitize [[META10]]
+// SPEC-NEXT:    unreachable, !nosanitize [[META10]]
+// SPEC:       [[CONT]]:
+// SPEC-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 3
+// SPEC-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8
+// SPEC-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR5:[0-9]+]]
+// SPEC-NEXT:    br label %[[DELETE_END]]
+// SPEC:       [[DELETE_END]]:
+// 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-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:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// 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:    br label %[[DELETE_END]]
+// VFE_NOCFI:       [[DELETE_END]]:
+// VFE_NOCFI-NEXT:    ret void
+//
+// STRICT-LABEL: define hidden void @call_derived_same_layout(
+// STRICT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META18:![0-9]+]] {
+// STRICT-NEXT:  [[ENTRY:.*:]]
+// STRICT-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// STRICT-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// STRICT-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// STRICT-NEXT:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// STRICT-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
+// STRICT:       [[DELETE_NOTNULL]]:
+// STRICT-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// STRICT-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS17DerivedSameLayout"), !nosanitize [[META14]]
+// STRICT-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META14]]
+// STRICT-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF15]], !nosanitize [[META14]]
+// STRICT:       [[HANDLER_CFI_CHECK_FAIL]]:
+// STRICT-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META14]]
+// STRICT-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META14]]
+// STRICT-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.3, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR4]], !nosanitize [[META14]]
+// STRICT-NEXT:    unreachable, !nosanitize [[META14]]
+// STRICT:       [[CONT]]:
+// STRICT-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 3
+// STRICT-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8
+// STRICT-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR5:[0-9]+]]
+// STRICT-NEXT:    br label %[[DELETE_END]]
+// STRICT:       [[DELETE_END]]:
+// STRICT-NEXT:    ret void
+//
+extern "C" void call_derived_same_layout(DerivedSameLayout *p) {
+  delete p;
+}
+
+// XDSO-LABEL: define hidden void @call_derived_public(
+// XDSO-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META21:![0-9]+]] {
+// XDSO-NEXT:  [[ENTRY:.*:]]
+// XDSO-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// XDSO-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// XDSO-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// XDSO-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// XDSO-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META16]]
+// XDSO-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF17]], !nosanitize [[META16]]
+// XDSO:       [[CFI_SLOWPATH]]:
+// XDSO-NEXT:    call void @__cfi_slowpath_diag(i64 -6426894850856698049, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.6) #[[ATTR7]], !nosanitize [[META16]]
+// XDSO-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META16]]
+// XDSO:       [[CFI_CONT]]:
+// XDSO-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 4
+// XDSO-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// XDSO-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(16) [[TMP0]])
+// XDSO-NEXT:    ret void
+//
+// XDSOT-LABEL: define hidden void @call_derived_public(
+// XDSOT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META14:![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:       [[TRAP]]:
+// XDSOT-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR7]], !nosanitize [[META9]]
+// XDSOT-NEXT:    unreachable, !nosanitize [[META9]]
+// XDSOT:       [[CONT]]:
+// XDSOT-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META9]]
+// XDSOT-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(16) [[TMP0]])
+// XDSOT-NEXT:    ret void
+//
+// VFEFULL-LABEL: define hidden void @call_derived_public(
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !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 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:       [[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(16) [[TMP0]])
+// 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-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:       [[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(16) [[TMP0]])
+// VFECROSS_MIN-NEXT:    ret void
+//
+// MS-LABEL: define dso_local void @call_derived_public(
+// MS-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META18:![0-9]+]] {
+// MS-NEXT:  [[ENTRY:.*:]]
+// MS-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// MS-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// MS-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// MS-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
+// MS-NEXT:    [[TMP2:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
+// MS-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP2]], align 8
+// MS-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 1
+// MS-NEXT:    [[TMP3:%.*]] = load ptr, ptr [[VFN]], align 8
+// MS-NEXT:    call void [[TMP3]](ptr noundef [[TMP1]])
+// MS-NEXT:    ret void
+//
+// REL-LABEL: define hidden void @call_derived_public(
+// REL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META16:![0-9]+]] {
+// REL-NEXT:  [[ENTRY:.*:]]
+// REL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// REL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// REL-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// REL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// REL-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META11]]
+// REL-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META11]]
+// REL-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12]], !nosanitize [[META11]]
+// REL:       [[HANDLER_CFI_CHECK_FAIL]]:
+// REL-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META11]]
+// REL-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META11]]
+// REL-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.4, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR5]], !nosanitize [[META11]]
+// REL-NEXT:    unreachable, !nosanitize [[META11]]
+// REL:       [[CONT]]:
+// REL-NEXT:    [[TMP5:%.*]] = call ptr @llvm.load.relative.i32(ptr [[VTABLE]], i32 16)
+// REL-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(16) [[TMP0]])
+// REL-NEXT:    ret void
+//
+// SPEC-LABEL: define hidden void @call_derived_public(
+// SPEC-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META15:![0-9]+]] {
+// SPEC-NEXT:  [[ENTRY:.*:]]
+// SPEC-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// SPEC-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// SPEC-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// SPEC-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// SPEC-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META10]]
+// SPEC-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META10]]
+// SPEC-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF11]], !nosanitize [[META10]]
+// SPEC:       [[HANDLER_CFI_CHECK_FAIL]]:
+// SPEC-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META10]]
+// SPEC-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META10]]
+// SPEC-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.4, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR4]], !nosanitize [[META10]]
+// SPEC-NEXT:    unreachable, !nosanitize [[META10]]
+// SPEC:       [[CONT]]:
+// SPEC-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 4
+// SPEC-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8
+// SPEC-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(16) [[TMP0]])
+// 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-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:    ret void
+//
+// STRICT-LABEL: define hidden void @call_derived_public(
+// STRICT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META19:![0-9]+]] {
+// STRICT-NEXT:  [[ENTRY:.*:]]
+// STRICT-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// STRICT-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// STRICT-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// STRICT-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// STRICT-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS17DerivedFromPublic"), !nosanitize [[META14]]
+// STRICT-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META14]]
+// STRICT-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF15]], !nosanitize [[META14]]
+// STRICT:       [[HANDLER_CFI_CHECK_FAIL]]:
+// STRICT-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META14]]
+// STRICT-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META14]]
+// STRICT-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.5, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR4]], !nosanitize [[META14]]
+// STRICT-NEXT:    unreachable, !nosanitize [[META14]]
+// STRICT:       [[CONT]]:
+// STRICT-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 4
+// STRICT-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8
+// STRICT-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(16) [[TMP0]])
+// STRICT-NEXT:    ret void
+//
+extern "C" void call_derived_public(DerivedFromPublic *p) {
+  p->pub();
+}
+
+// XDSO-LABEL: define hidden void @delete_derived_same_layout_from_public(
+// XDSO-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META22:![0-9]+]] {
+// XDSO-NEXT:  [[ENTRY:.*:]]
+// XDSO-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// XDSO-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// XDSO-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// XDSO-NEXT:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// XDSO-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
+// XDSO:       [[DELETE_NOTNULL]]:
+// XDSO-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// XDSO-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META16]]
+// XDSO-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF17]], !nosanitize [[META16]]
+// XDSO:       [[CFI_SLOWPATH]]:
+// XDSO-NEXT:    call void @__cfi_slowpath_diag(i64 7659278028533726273, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.7) #[[ATTR7]], !nosanitize [[META16]]
+// XDSO-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META16]]
+// XDSO:       [[CFI_CONT]]:
+// XDSO-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 3
+// XDSO-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// XDSO-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR7]]
+// XDSO-NEXT:    br label %[[DELETE_END]]
+// XDSO:       [[DELETE_END]]:
+// 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-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:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// 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:       [[TRAP]]:
+// XDSOT-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR7]], !nosanitize [[META9]]
+// XDSOT-NEXT:    unreachable, !nosanitize [[META9]]
+// XDSOT:       [[CONT]]:
+// XDSOT-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META9]]
+// XDSOT-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR8]]
+// XDSOT-NEXT:    br label %[[DELETE_END]]
+// XDSOT:       [[DELETE_END]]:
+// 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-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:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// 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:    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-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:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// 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:    br label %[[DELETE_END]]
+// VFECROSS_MIN:       [[DELETE_END]]:
+// VFECROSS_MIN-NEXT:    ret void
+//
+// MS-LABEL: define dso_local void @delete_derived_same_layout_from_public(
+// MS-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META19:![0-9]+]] {
+// MS-NEXT:  [[ENTRY:.*:]]
+// MS-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// MS-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// MS-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// MS-NEXT:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// MS-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
+// MS:       [[DELETE_NOTNULL]]:
+// MS-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// MS-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 2
+// MS-NEXT:    [[TMP1:%.*]] = load ptr, ptr [[VFN]], align 8
+// MS-NEXT:    [[CALL:%.*]] = call noundef ptr [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]], i32 noundef 1) #[[ATTR5]]
+// MS-NEXT:    br label %[[DELETE_END]]
+// MS:       [[DELETE_END]]:
+// MS-NEXT:    ret void
+//
+// REL-LABEL: define hidden void @delete_derived_same_layout_from_public(
+// REL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META17:![0-9]+]] {
+// REL-NEXT:  [[ENTRY:.*:]]
+// REL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// REL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// REL-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// REL-NEXT:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// REL-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
+// REL:       [[DELETE_NOTNULL]]:
+// REL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// REL-NEXT:    [[TMP1:%.*]] = call ptr @llvm.load.relative.i32(ptr [[VTABLE]], i32 12)
+// REL-NEXT:    call void [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR6]]
+// REL-NEXT:    br label %[[DELETE_END]]
+// REL:       [[DELETE_END]]:
+// REL-NEXT:    ret void
+//
+// SPEC-LABEL: define hidden void @delete_derived_same_layout_from_public(
+// SPEC-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META16:![0-9]+]] {
+// SPEC-NEXT:  [[ENTRY:.*:]]
+// SPEC-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// SPEC-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// SPEC-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// SPEC-NEXT:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// SPEC-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
+// SPEC:       [[DELETE_NOTNULL]]:
+// SPEC-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// SPEC-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 3
+// SPEC-NEXT:    [[TMP1:%.*]] = load ptr, ptr [[VFN]], align 8
+// SPEC-NEXT:    call void [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR5]]
+// SPEC-NEXT:    br label %[[DELETE_END]]
+// SPEC:       [[DELETE_END]]:
+// 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-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:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// 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:    br label %[[DELETE_END]]
+// VFE_NOCFI:       [[DELETE_END]]:
+// VFE_NOCFI-NEXT:    ret void
+//
+// STRICT-LABEL: define hidden void @delete_derived_same_layout_from_public(
+// STRICT-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META20:![0-9]+]] {
+// STRICT-NEXT:  [[ENTRY:.*:]]
+// STRICT-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
+// STRICT-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
+// STRICT-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
+// STRICT-NEXT:    [[ISNULL:%.*]] = icmp eq ptr [[TMP0]], null
+// STRICT-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
+// STRICT:       [[DELETE_NOTNULL]]:
+// STRICT-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// STRICT-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS27DerivedSameLayoutFromPublic"), !nosanitize [[META14]]
+// STRICT-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META14]]
+// STRICT-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF15]], !nosanitize [[META14]]
+// STRICT:       [[HANDLER_CFI_CHECK_FAIL]]:
+// STRICT-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META14]]
+// STRICT-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !nosanitize [[META14]]
+// STRICT-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.7, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR4]], !nosanitize [[META14]]
+// STRICT-NEXT:    unreachable, !nosanitize [[META14]]
+// STRICT:       [[CONT]]:
+// STRICT-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 3
+// STRICT-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8
+// STRICT-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR5]]
+// STRICT-NEXT:    br label %[[DELETE_END]]
+// STRICT:       [[DELETE_END]]:
+// STRICT-NEXT:    ret void
+//
+extern "C" void delete_derived_same_layout_from_public(DerivedSameLayoutFromPublic *p) {
+  delete p;
+}
+//.
+// XDSO: [[META15]] = !{i64 -8223949192042198753}
+// XDSO: [[META16]] = !{}
+// XDSO: [[PROF17]] = !{!"branch_weights", i32 1048575, i32 1}
+// XDSO: [[META18]] = !{i64 4735877602249467044}
+// XDSO: [[META19]] = !{i64 7641651042058123257}
+// XDSO: [[META20]] = !{i64 -4426688768985367573}
+// 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}
+//.
+// 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}
+//.
+// 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}
+//.
+// MS: [[META12]] = !{i64 -8223949192042198753}
+// MS: [[META13]] = !{}
+// MS: [[PROF14]] = !{!"branch_weights", i32 1048575, i32 1}
+// MS: [[META15]] = !{i64 4735877602249467044}
+// MS: [[META16]] = !{i64 7641651042058123257}
+// MS: [[META17]] = !{i64 -4426688768985367573}
+// MS: [[META18]] = !{i64 -1300877796466697334}
+// MS: [[META19]] = !{i64 -3011432234017786520}
+//.
+// REL: [[META10]] = !{i64 -8223949192042198753}
+// REL: [[META11]] = !{}
+// REL: [[PROF12]] = !{!"branch_weights", i32 1048575, i32 1}
+// REL: [[META13]] = !{i64 4735877602249467044}
+// REL: [[META14]] = !{i64 7641651042058123257}
+// REL: [[META15]] = !{i64 -4426688768985367573}
+// REL: [[META16]] = !{i64 -1300877796466697334}
+// REL: [[META17]] = !{i64 -3011432234017786520}
+//.
+// SPEC: [[META9]] = !{i64 -8223949192042198753}
+// SPEC: [[META10]] = !{}
+// SPEC: [[PROF11]] = !{!"branch_weights", i32 1048575, i32 1}
+// SPEC: [[META12]] = !{i64 4735877602249467044}
+// SPEC: [[META13]] = !{i64 7641651042058123257}
+// SPEC: [[META14]] = !{i64 -4426688768985367573}
+// SPEC: [[META15]] = !{i64 -1300877796466697334}
+// 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}
+//.
+// STRICT: [[META13]] = !{i64 -8223949192042198753}
+// STRICT: [[META14]] = !{}
+// STRICT: [[PROF15]] = !{!"branch_weights", i32 1048575, i32 1}
+// STRICT: [[META16]] = !{i64 4735877602249467044}
+// STRICT: [[META17]] = !{i64 7641651042058123257}
+// STRICT: [[META18]] = !{i64 -4426688768985367573}
+// STRICT: [[META19]] = !{i64 -1300877796466697334}
+// STRICT: [[META20]] = !{i64 -3011432234017786520}
+//.
diff --git a/clang/test/CodeGenCXX/cfi-vtable-check.cpp b/clang/test/CodeGenCXX/cfi-vtable-check.cpp
new file mode 100644
index 0000000000000..d3e20d985c14a
--- /dev/null
+++ b/clang/test/CodeGenCXX/cfi-vtable-check.cpp
@@ -0,0 +1,138 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --check-globals all --version 6
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -fvisibility=hidden -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-minimal-runtime -fsanitize-undefined-strip-path-components=-1 -emit-llvm -o - %s | FileCheck --implicit-check-not="private unnamed_addr constant" --check-prefix=MIN %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -fvisibility=hidden -fsanitize=cfi-vcall -fsanitize-trap=cfi-vcall -fsanitize-skip-hot-cutoff=cfi-vcall=0.5 -disable-llvm-passes -fsanitize-undefined-strip-path-components=-1 -emit-llvm -o - %s | FileCheck --implicit-check-not="private unnamed_addr constant" --check-prefix=TRAP_CUTOFF %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -fvisibility=hidden -fsanitize=cfi-vcall -fsanitize-trap=cfi-vcall -fsanitize-cfi-cross-dso -fsanitize-undefined-strip-path-components=-1 -emit-llvm -o - %s | FileCheck --implicit-check-not="private unnamed_addr constant" --check-prefix=XDSO_TRAP %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -fvisibility=hidden -fsanitize=cfi-vcall -fsanitize-trap=cfi-vcall -fdevirtualize-speculatively -fsanitize-undefined-strip-path-components=-1 -emit-llvm -o - %s | FileCheck --implicit-check-not="private unnamed_addr constant" --check-prefix=SPEC_TRAP %s
+
+struct S {
+  virtual void f();
+};
+
+//.
+// 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(
+// MIN-SAME: ptr noundef [[S:%.*]]) #[[ATTR0:[0-9]+]] {
+// MIN-NEXT:  [[ENTRY:.*:]]
+// MIN-NEXT:    [[S_ADDR:%.*]] = alloca ptr, align 8
+// MIN-NEXT:    store ptr [[S]], ptr [[S_ADDR]], align 8
+// 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:    ret void
+//
+// TRAP_CUTOFF-LABEL: define hidden void @test(
+// TRAP_CUTOFF-SAME: ptr noundef [[S:%.*]]) #[[ATTR0:[0-9]+]] {
+// TRAP_CUTOFF-NEXT:  [[ENTRY:.*:]]
+// TRAP_CUTOFF-NEXT:    [[S_ADDR:%.*]] = alloca ptr, align 8
+// TRAP_CUTOFF-NEXT:    store ptr [[S]], ptr [[S_ADDR]], align 8
+// 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:       [[TRAP]]:
+// TRAP_CUTOFF-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3:[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:    ret void
+//
+// XDSO_TRAP-LABEL: define hidden void @test(
+// XDSO_TRAP-SAME: ptr noundef [[S:%.*]]) #[[ATTR0:[0-9]+]] {
+// XDSO_TRAP-NEXT:  [[ENTRY:.*:]]
+// XDSO_TRAP-NEXT:    [[S_ADDR:%.*]] = alloca ptr, align 8
+// XDSO_TRAP-NEXT:    store ptr [[S]], ptr [[S_ADDR]], align 8
+// XDSO_TRAP-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S_ADDR]], align 8
+// XDSO_TRAP-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// XDSO_TRAP-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS1S"), !nosanitize [[META2:![0-9]+]]
+// XDSO_TRAP-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF3:![0-9]+]], !nosanitize [[META2]]
+// XDSO_TRAP:       [[CFI_SLOWPATH]]:
+// XDSO_TRAP-NEXT:    call void @__cfi_slowpath(i64 -7568795971037593456, ptr [[VTABLE]]) #[[ATTR5:[0-9]+]], !nosanitize [[META2]]
+// XDSO_TRAP-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META2]]
+// XDSO_TRAP:       [[CFI_CONT]]:
+// XDSO_TRAP-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// XDSO_TRAP-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// XDSO_TRAP-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// XDSO_TRAP-NEXT:    ret void
+//
+// SPEC_TRAP-LABEL: define hidden void @test(
+// SPEC_TRAP-SAME: ptr noundef [[S:%.*]]) #[[ATTR0:[0-9]+]] {
+// SPEC_TRAP-NEXT:  [[ENTRY:.*:]]
+// SPEC_TRAP-NEXT:    [[S_ADDR:%.*]] = alloca ptr, align 8
+// SPEC_TRAP-NEXT:    store ptr [[S]], ptr [[S_ADDR]], align 8
+// SPEC_TRAP-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S_ADDR]], align 8
+// SPEC_TRAP-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// SPEC_TRAP-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS1S"), !nosanitize [[META1:![0-9]+]]
+// SPEC_TRAP-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META1]]
+// SPEC_TRAP-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF2:![0-9]+]], !nosanitize [[META1]]
+// SPEC_TRAP:       [[TRAP]]:
+// SPEC_TRAP-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3:[0-9]+]], !nosanitize [[META1]]
+// SPEC_TRAP-NEXT:    unreachable, !nosanitize [[META1]]
+// SPEC_TRAP:       [[CONT]]:
+// SPEC_TRAP-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META1]]
+// SPEC_TRAP-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// SPEC_TRAP-NEXT:    ret void
+//
+extern "C" void test(S *s) {
+  s->f();
+}
+//.
+// MIN: 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" }
+// MIN: attributes #[[ATTR1:[0-9]+]] = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
+// MIN: attributes #[[ATTR2:[0-9]+]] = { noreturn nounwind uwtable }
+// MIN: attributes #[[ATTR3]] = { nomerge noreturn nounwind }
+//.
+// 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 }
+//.
+// 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) }
+// XDSO_TRAP: attributes #[[ATTR2:[0-9]+]] = { noinline nounwind "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+cx8,+mmx,+sse,+sse2,+x87" }
+// XDSO_TRAP: attributes #[[ATTR3:[0-9]+]] = { cold noreturn nounwind memory(inaccessiblemem: write) }
+// XDSO_TRAP: attributes #[[ATTR4:[0-9]+]] = { noinline nounwind "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+cx8,+mmx,+sse,+sse2,+x87" }
+// XDSO_TRAP: attributes #[[ATTR5]] = { nounwind }
+// XDSO_TRAP: attributes #[[ATTR6:[0-9]+]] = { nomerge noreturn nounwind }
+//.
+// SPEC_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" }
+// SPEC_TRAP: attributes #[[ATTR1:[0-9]+]] = { nocallback nofree nosync nounwind willreturn memory(none) }
+// SPEC_TRAP: attributes #[[ATTR2:[0-9]+]] = { cold noreturn nounwind memory(inaccessiblemem: write) }
+// SPEC_TRAP: attributes #[[ATTR3]] = { nomerge noreturn nounwind }
+//.
+// MIN: [[META0:![0-9]+]] = !{!"{{.*}}clang version {{.*}}"}
+// MIN: [[META1]] = !{}
+// MIN: [[PROF2]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// TRAP_CUTOFF: [[META0:![0-9]+]] = !{!"{{.*}}clang version {{.*}}"}
+// TRAP_CUTOFF: [[META1]] = !{}
+// TRAP_CUTOFF: [[PROF2]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// XDSO_TRAP: [[META0:![0-9]+]] = !{i32 4, !"Cross-DSO CFI", i32 1}
+// XDSO_TRAP: [[META1:![0-9]+]] = !{!"{{.*}}clang version {{.*}}"}
+// XDSO_TRAP: [[META2]] = !{}
+// XDSO_TRAP: [[PROF3]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// SPEC_TRAP: [[META0:![0-9]+]] = !{!"{{.*}}clang version {{.*}}"}
+// SPEC_TRAP: [[META1]] = !{}
+// SPEC_TRAP: [[PROF2]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
diff --git a/clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp b/clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp
new file mode 100644
index 0000000000000..24dfa0d28e5a7
--- /dev/null
+++ b/clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp
@@ -0,0 +1,150 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden \
+// RUN:     -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-recover=cfi-vcall \
+// RUN:     -fsanitize-annotate-debug-info=cfi-vcall \
+// RUN:     -fwhole-program-vtables -fvirtual-function-elimination \
+// RUN:     -fdebug-prefix-map=%S/= -fno-ident -fdebug-compilation-dir=%S -debug-info-kind=limited \
+// RUN:     -emit-llvm -o - %s | FileCheck --check-prefix=WPD %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden \
+// RUN:     -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-recover=cfi-vcall \
+// RUN:     -fsanitize-annotate-debug-info=cfi-vcall \
+// RUN:     -fdebug-prefix-map=%S/= -fno-ident -fdebug-compilation-dir=%S -debug-info-kind=limited \
+// RUN:     -emit-llvm -o - %s | FileCheck --check-prefix=NOWPD %s
+
+struct S {
+  virtual void f();
+};
+
+// WPD-LABEL: define hidden void @checked(
+// WPD-SAME: ptr noundef [[S:%.*]]) #[[ATTR0:[0-9]+]] !dbg [[DBG6:![0-9]+]] !guid [[META13:![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:       [[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:       [[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]+]]
+//
+// NOWPD-LABEL: define hidden void @checked(
+// NOWPD-SAME: ptr noundef [[S:%.*]]) #[[ATTR0:[0-9]+]] !dbg [[DBG8:![0-9]+]] !guid [[META15:![0-9]+]] {
+// NOWPD-NEXT:  [[ENTRY:.*:]]
+// NOWPD-NEXT:    [[S_ADDR:%.*]] = alloca ptr, align 8
+// NOWPD-NEXT:    store ptr [[S]], ptr [[S_ADDR]], align 8
+// NOWPD-NEXT:      #dbg_declare(ptr [[S_ADDR]], [[META16:![0-9]+]], !DIExpression(), [[META17:![0-9]+]])
+// NOWPD-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S_ADDR]], align 8, !dbg [[DBG18:![0-9]+]]
+// NOWPD-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8, !dbg [[DBG19:![0-9]+]]
+// NOWPD-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS1S"), !dbg [[DBG20:![0-9]+]], !nosanitize [[META14:![0-9]+]]
+// NOWPD-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !dbg [[DBG20]], !nosanitize [[META14]]
+// NOWPD-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !dbg [[DBG20]], !prof [[PROF24:![0-9]+]], !nosanitize [[META14]]
+// NOWPD:       [[HANDLER_CFI_CHECK_FAIL]]:
+// NOWPD-NEXT:    [[TMP3:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !dbg [[DBG20]], !nosanitize [[META14]]
+// NOWPD-NEXT:    [[TMP4:%.*]] = zext i1 [[TMP2]] to i64, !dbg [[DBG20]], !nosanitize [[META14]]
+// NOWPD-NEXT:    call void @__ubsan_handle_cfi_check_fail(ptr @anon.f7bcfe50d3057283bb357af6240bedc0.1, i64 [[TMP3]], i64 [[TMP4]]) #[[ATTR3:[0-9]+]], !dbg [[DBG20]], !nosanitize [[META14]]
+// NOWPD-NEXT:    br label %[[CONT]], !dbg [[DBG20]], !nosanitize [[META14]]
+// NOWPD:       [[CONT]]:
+// NOWPD-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0, !dbg [[DBG19]]
+// NOWPD-NEXT:    [[TMP5:%.*]] = load ptr, ptr [[VFN]], align 8, !dbg [[DBG19]]
+// NOWPD-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]), !dbg [[DBG19]]
+// NOWPD-NEXT:    ret void, !dbg [[DBG25:![0-9]+]]
+//
+extern "C" void checked(S *s) {
+  s->f();
+}
+
+// WPD-LABEL: define hidden void @unchecked(
+// WPD-SAME: ptr noundef [[S:%.*]]) #[[ATTR0]] !dbg [[DBG24:![0-9]+]] !guid [[META25:![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]+]]
+//
+// NOWPD-LABEL: define hidden void @unchecked(
+// NOWPD-SAME: ptr noundef [[S:%.*]]) #[[ATTR0]] !dbg [[DBG26:![0-9]+]] !guid [[META27:![0-9]+]] {
+// NOWPD-NEXT:  [[ENTRY:.*:]]
+// NOWPD-NEXT:    [[S_ADDR:%.*]] = alloca ptr, align 8
+// NOWPD-NEXT:    store ptr [[S]], ptr [[S_ADDR]], align 8
+// NOWPD-NEXT:      #dbg_declare(ptr [[S_ADDR]], [[META28:![0-9]+]], !DIExpression(), [[META29:![0-9]+]])
+// NOWPD-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S_ADDR]], align 8, !dbg [[DBG30:![0-9]+]]
+// NOWPD-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8, !dbg [[DBG31:![0-9]+]]
+// NOWPD-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0, !dbg [[DBG31]]
+// NOWPD-NEXT:    [[TMP1:%.*]] = load ptr, ptr [[VFN]], align 8, !dbg [[DBG31]]
+// NOWPD-NEXT:    call void [[TMP1]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]), !dbg [[DBG31]]
+// NOWPD-NEXT:    ret void, !dbg [[DBG32:![0-9]+]]
+//
+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]])
+//.
+// 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: [[META9]] = !DIFile(filename: "{{.*}}cfi-vcall-debuginfo.cpp", directory: {{.*}})
+// NOWPD: [[META10]] = !DISubroutineType(types: [[META11:![0-9]+]])
+// NOWPD: [[META11]] = !{null, [[META12:![0-9]+]]}
+// NOWPD: [[META12]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: [[META13:![0-9]+]], size: 64)
+// 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: [[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: [[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]])
+//.

>From 11603104cb69d17198d57946bff56f4c104db52f Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Wed, 11 Nov 2026 22:17:07 -0800
Subject: [PATCH 02/15] Add compiler-rt reproducers

Created using spr 2.0.0-beta.2
---
 .../test/cfi/devirtualize-speculatively.cpp   | 28 +++++++++++++++++++
 compiler-rt/test/cfi/same-layout-delete.cpp   | 27 ++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 compiler-rt/test/cfi/devirtualize-speculatively.cpp
 create mode 100644 compiler-rt/test/cfi/same-layout-delete.cpp

diff --git a/compiler-rt/test/cfi/devirtualize-speculatively.cpp b/compiler-rt/test/cfi/devirtualize-speculatively.cpp
new file mode 100644
index 0000000000000..92fd71ee7494b
--- /dev/null
+++ b/compiler-rt/test/cfi/devirtualize-speculatively.cpp
@@ -0,0 +1,28 @@
+// RUN: %clangxx -fno-lto -DIMPL -c -o %t.impl.o %s
+// RUN: %clangxx_cfi -fdevirtualize-speculatively -o %t %s %t.impl.o
+// RUN: %run %t
+
+// -fdevirtualize-speculatively must not add local CFI checks to classes with
+// public LTO visibility: their vtables may come from outside of the LTO unit,
+// like the one defined in a non-LTO object here.
+
+// FIXME: The checked load traps on the vtable from the non-LTO object.
+// XFAIL: *
+
+struct [[clang::lto_visibility_public]] A {
+  virtual void f();
+};
+
+A *create();
+
+#ifdef IMPL
+void A::f() {}
+
+struct B : A {
+  void f() override {}
+};
+
+A *create() { return new B; }
+#else
+int main() { create()->f(); }
+#endif
diff --git a/compiler-rt/test/cfi/same-layout-delete.cpp b/compiler-rt/test/cfi/same-layout-delete.cpp
new file mode 100644
index 0000000000000..7c086ee59c3b0
--- /dev/null
+++ b/compiler-rt/test/cfi/same-layout-delete.cpp
@@ -0,0 +1,27 @@
+// RUN: %clangxx_cfi -o %t1 %s
+// RUN: %run %t1
+
+// RUN: %clangxx_cfi -fsanitize=cfi-cast-strict -o %t2 %s
+// RUN: %expect_crash %run %t2
+
+// Without -fsanitize=cfi-cast-strict, CFI allows deleting a base object
+// 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 {
+  virtual ~A();
+};
+A::~A() {}
+
+struct B : A {};
+
+int main() {
+  A *a = new A;
+  break_optimization(a);
+  delete static_cast<B *>(a); // UB, allowed without cfi-cast-strict
+}

>From 9608252726773e95297f8d62e784040d1f396bd6 Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Wed, 11 Nov 2026 22:41:14 -0800
Subject: [PATCH 03/15] Add test purpose comments

Created using spr 2.0.0-beta.2
---
 clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp |  4 ++++
 .../CodeGenCXX/cfi-vcall-type-checked-load.cpp   |  5 +++++
 clang/test/CodeGenCXX/cfi-vtable-check.cpp       |  5 +++++
 .../DebugInfo/Generic/cfi-vcall-debuginfo.cpp    | 16 ++++++++--------
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp b/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp
index f0f8864c0302e..a14587b47fc1a 100644
--- a/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp
+++ b/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp
@@ -1,6 +1,10 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 // RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -flto -flto-unit -fsanitize=cfi-vcall -fsanitize-trap=cfi-vcall -fwhole-program-vtables -emit-llvm -o - %s | FileCheck %s
 
+// Tests trapping cfi-vcall with -fwhole-program-vtables on MS ABI calls
+// through a secondary vfptr, where the overriding class and the class that
+// owns the vfptr differ in LTO visibility.
+
 struct Primary {
   virtual void pri();
 };
diff --git a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
index a8969c4f01608..fd4cc7d886a1f 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
@@ -9,6 +9,11 @@
 // RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fwhole-program-vtables -fvirtual-function-elimination -emit-llvm -o - %s | FileCheck --check-prefix=VFE_NOCFI %s
 // RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fsanitize=cfi-vcall,cfi-cast-strict -fno-sanitize-trap=cfi-vcall -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=STRICT %s
 
+// Tests which intrinsic and failure handler cfi-vcall emits for virtual calls
+// in each mode (trap, minimal and full runtime, cross-DSO), with and without
+// -fwhole-program-vtables and VFE, for classes with hidden and public LTO
+// visibility, same-layout derived classes, and no_sanitize functions.
+
 struct Hidden {
   virtual void f();
   virtual void g();
diff --git a/clang/test/CodeGenCXX/cfi-vtable-check.cpp b/clang/test/CodeGenCXX/cfi-vtable-check.cpp
index d3e20d985c14a..eb5b395410041 100644
--- a/clang/test/CodeGenCXX/cfi-vtable-check.cpp
+++ b/clang/test/CodeGenCXX/cfi-vtable-check.cpp
@@ -4,6 +4,11 @@
 // RUN: %clang_cc1 -triple x86_64-unknown-linux -fvisibility=hidden -fsanitize=cfi-vcall -fsanitize-trap=cfi-vcall -fsanitize-cfi-cross-dso -fsanitize-undefined-strip-path-components=-1 -emit-llvm -o - %s | FileCheck --implicit-check-not="private unnamed_addr constant" --check-prefix=XDSO_TRAP %s
 // RUN: %clang_cc1 -triple x86_64-unknown-linux -fvisibility=hidden -fsanitize=cfi-vcall -fsanitize-trap=cfi-vcall -fdevirtualize-speculatively -fsanitize-undefined-strip-path-components=-1 -emit-llvm -o - %s | FileCheck --implicit-check-not="private unnamed_addr constant" --check-prefix=SPEC_TRAP %s
 
+// Tests how a failed cfi-vcall vtable check is reported in trap and
+// minimal-runtime modes (with skip-hot-cutoff, cross-DSO CFI, and
+// -fdevirtualize-speculatively). --implicit-check-not catches unused
+// diagnostic data.
+
 struct S {
   virtual void f();
 };
diff --git a/clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp b/clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp
index 24dfa0d28e5a7..2596365e0ffb0 100644
--- a/clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp
+++ b/clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp
@@ -1,15 +1,15 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 // RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden \
-// RUN:     -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-recover=cfi-vcall \
-// RUN:     -fsanitize-annotate-debug-info=cfi-vcall \
+// RUN:     -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-recover=cfi-vcall -fsanitize-annotate-debug-info=cfi-vcall \
 // RUN:     -fwhole-program-vtables -fvirtual-function-elimination \
-// RUN:     -fdebug-prefix-map=%S/= -fno-ident -fdebug-compilation-dir=%S -debug-info-kind=limited \
-// RUN:     -emit-llvm -o - %s | FileCheck --check-prefix=WPD %s
+// RUN:     -fdebug-prefix-map=%S/= -fno-ident -fdebug-compilation-dir=%S -debug-info-kind=limited -emit-llvm -o - %s | FileCheck --check-prefix=WPD %s
 // RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden \
-// RUN:     -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-recover=cfi-vcall \
-// RUN:     -fsanitize-annotate-debug-info=cfi-vcall \
-// RUN:     -fdebug-prefix-map=%S/= -fno-ident -fdebug-compilation-dir=%S -debug-info-kind=limited \
-// RUN:     -emit-llvm -o - %s | FileCheck --check-prefix=NOWPD %s
+// RUN:     -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-recover=cfi-vcall -fsanitize-annotate-debug-info=cfi-vcall \
+// RUN:     -fdebug-prefix-map=%S/= -fno-ident -fdebug-compilation-dir=%S -debug-info-kind=limited -emit-llvm -o - %s | FileCheck --check-prefix=NOWPD %s
+
+// Tests debug locations of cfi-vcall checks with
+// -fsanitize-annotate-debug-info, on the llvm.type.checked.load path (WPD) and
+// the llvm.type.test path (NOWPD), and for a call without a check.
 
 struct S {
   virtual void f();

>From 7103dd43c654706100ab53774e2b1048a5895022 Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Wed, 11 Nov 2026 23:23:46 -0800
Subject: [PATCH 04/15] Add VFE diag compiler-rt test

Created using spr 2.0.0-beta.2
---
 compiler-rt/test/cfi/vfe-diag.cpp | 42 +++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 compiler-rt/test/cfi/vfe-diag.cpp

diff --git a/compiler-rt/test/cfi/vfe-diag.cpp b/compiler-rt/test/cfi/vfe-diag.cpp
new file mode 100644
index 0000000000000..8c51630ea85e3
--- /dev/null
+++ b/compiler-rt/test/cfi/vfe-diag.cpp
@@ -0,0 +1,42 @@
+// RUN: %clangxx_cfi_diag -fno-sanitize-recover=cfi -fvirtual-function-elimination -o %t %s
+// RUN: not %run %t 2>&1 | FileCheck %s
+
+// Tests that diagnostic CFI reports a bad virtual call with
+// -fvirtual-function-elimination, which emits llvm.type.checked.load for
+// every virtual call.
+
+// -fvirtual-function-elimination requires full LTO.
+// UNSUPPORTED: thinlto
+
+// FIXME: The checked load calls the handler without its arguments.
+// XFAIL: *
+
+#include "utils.h"
+#include <string.h>
+
+struct A {
+  virtual void f();
+};
+void A::f() {}
+
+// A second implementation keeps WPD from devirtualizing a->f().
+struct A2 : A {
+  void f() override;
+};
+void A2::f() {}
+
+struct B {
+  virtual void f();
+};
+void B::f() {}
+
+int main() {
+  break_optimization(new A2);
+  B *b = new B;
+  break_optimization(b);
+  A *a;
+  memcpy(&a, &b, sizeof(a)); // Avoid the cast checks.
+  // CHECK: runtime error: control flow integrity check for type 'A' failed during virtual call
+  // CHECK-NEXT: note: vtable is of type '{{(struct )?}}B'
+  a->f();
+}

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

Created using spr 2.0.0-beta.2
---
 clang/lib/CodeGen/MicrosoftCXXABI.cpp         | 55 +++++++++----------
 .../CodeGenCXX/cfi-ms-secondary-vfptr.cpp     | 32 +++++------
 2 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
index 7a95ca2f50fdd..e7aac1530637c 100644
--- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp
+++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
@@ -2031,37 +2031,36 @@ CGCallee MicrosoftCXXABI::getVirtualFunctionPointer(CodeGenFunction &CGF,
   MicrosoftVTableContext &VFTContext = CGM.getMicrosoftVTableContext();
   MethodVFTableLocation ML = VFTContext.getMethodVFTableLocation(GD);
 
-  // Compute the identity of the most derived class whose virtual table is
-  // located at the MethodVFTableLocation ML.
-  auto getObjectWithVPtr = [&] {
-    return llvm::find_if(VFTContext.getVFPtrOffsets(
-                             ML.VBase ? ML.VBase : MethodDecl->getParent()),
-                         [&](const std::unique_ptr<VPtrInfo> &Info) {
-                           return Info->FullOffsetInMDC == ML.VFPtrOffset;
-                         })
-        ->get()
-        ->ObjectWithVPtr;
-  };
-
-  llvm::Value *VFunc;
-  if (CGF.ShouldEmitVTableTypeCheckedLoad(MethodDecl->getParent())) {
-    VFunc = CGF.EmitVTableTypeCheckedLoad(
-        getObjectWithVPtr(), VTable, Ty,
-        ML.Index *
-            CGM.getContext().getTargetInfo().getPointerWidth(LangAS::Default) /
-            8,
-        Loc);
-  } else {
-    if (CGM.getCodeGenOpts().PrepareForLTO)
-      CGF.EmitTypeMetadataCodeForVCall(getObjectWithVPtr(), VTable, Loc);
+  if (CGM.getCodeGenOpts().PrepareForLTO) {
+    // Compute the identity of the most derived class whose virtual table is
+    // located at the MethodVFTableLocation ML.
+    const CXXRecordDecl *ObjectWithVPtr =
+        llvm::find_if(VFTContext.getVFPtrOffsets(
+                          ML.VBase ? ML.VBase : MethodDecl->getParent()),
+                      [&](const std::unique_ptr<VPtrInfo> &Info) {
+                        return Info->FullOffsetInMDC == ML.VFPtrOffset;
+                      })
+            ->get()
+            ->ObjectWithVPtr;
+    if (CGF.ShouldEmitVTableTypeCheckedLoad(ObjectWithVPtr)) {
+      llvm::Value *VFunc = CGF.EmitVTableTypeCheckedLoad(
+          ObjectWithVPtr, VTable, Ty,
+          ML.Index *
+              CGM.getContext().getTargetInfo().getPointerWidth(
+                  LangAS::Default) /
+              8,
+          Loc);
+      return CGCallee(GD, VFunc);
+    }
 
-    llvm::Value *VFuncPtr =
-        Builder.CreateConstInBoundsGEP1_64(Ty, VTable, ML.Index, "vfn");
-    VFunc = Builder.CreateAlignedLoad(Ty, VFuncPtr, CGF.getPointerAlign());
+    CGF.EmitTypeMetadataCodeForVCall(ObjectWithVPtr, VTable, Loc);
   }
 
-  CGCallee Callee(GD, VFunc);
-  return Callee;
+  llvm::Value *VFuncPtr =
+      Builder.CreateConstInBoundsGEP1_64(Ty, VTable, ML.Index, "vfn");
+  llvm::Value *VFunc =
+      Builder.CreateAlignedLoad(Ty, VFuncPtr, CGF.getPointerAlign());
+  return CGCallee(GD, VFunc);
 }
 
 llvm::Value *MicrosoftCXXABI::EmitVirtualDestructorCall(
diff --git a/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp b/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp
index a14587b47fc1a..f458bb293fb6f 100644
--- a/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp
+++ b/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp
@@ -34,15 +34,9 @@ struct DerivedFromHidden : Primary, HiddenSec {
 // CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
 // CHECK-NEXT:    [[TMP2:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
 // CHECK-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP2]], align 8
-// CHECK-NEXT:    [[TMP3:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"?AUPublic@@"), !nosanitize [[META9:![0-9]+]]
-// CHECK-NEXT:    [[TMP4:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 1, !nosanitize [[META9]]
-// CHECK-NEXT:    br i1 [[TMP4]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF10:![0-9]+]], !nosanitize [[META9]]
-// CHECK:       [[TRAP]]:
-// CHECK-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3:[0-9]+]], !nosanitize [[META9]]
-// CHECK-NEXT:    unreachable, !nosanitize [[META9]]
-// CHECK:       [[CONT]]:
-// CHECK-NEXT:    [[TMP5:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 0, !nosanitize [[META9]]
-// CHECK-NEXT:    call void [[TMP5]](ptr noundef [[TMP1]])
+// CHECK-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// CHECK-NEXT:    [[TMP3:%.*]] = load ptr, ptr [[VFN]], align 8
+// CHECK-NEXT:    call void [[TMP3]](ptr noundef [[TMP1]])
 // CHECK-NEXT:    ret void
 //
 extern "C" void call_public_sec(DerivedFromPublic *p) {
@@ -50,7 +44,7 @@ extern "C" void call_public_sec(DerivedFromPublic *p) {
 }
 
 // CHECK-LABEL: define dso_local void @call_hidden_sec(
-// CHECK-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META11:![0-9]+]] {
+// CHECK-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META9:![0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
 // CHECK-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // CHECK-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -58,14 +52,14 @@ extern "C" void call_public_sec(DerivedFromPublic *p) {
 // CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
 // CHECK-NEXT:    [[TMP2:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
 // CHECK-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP2]], align 8
-// CHECK-NEXT:    [[TMP3:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"?AUHiddenSec@@"), !nosanitize [[META9]]
-// CHECK-NEXT:    [[TMP4:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 1, !nosanitize [[META9]]
-// CHECK-NEXT:    br i1 [[TMP4]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF10]], !nosanitize [[META9]]
+// CHECK-NEXT:    [[TMP3:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"?AUHiddenSec@@"), !nosanitize [[META10:![0-9]+]]
+// CHECK-NEXT:    [[TMP4:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 1, !nosanitize [[META10]]
+// CHECK-NEXT:    br i1 [[TMP4]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF11:![0-9]+]], !nosanitize [[META10]]
 // CHECK:       [[TRAP]]:
-// CHECK-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3]], !nosanitize [[META9]]
-// CHECK-NEXT:    unreachable, !nosanitize [[META9]]
+// CHECK-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3:[0-9]+]], !nosanitize [[META10]]
+// CHECK-NEXT:    unreachable, !nosanitize [[META10]]
 // CHECK:       [[CONT]]:
-// CHECK-NEXT:    [[TMP5:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 0, !nosanitize [[META9]]
+// CHECK-NEXT:    [[TMP5:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 0, !nosanitize [[META10]]
 // CHECK-NEXT:    call void [[TMP5]](ptr noundef [[TMP1]])
 // CHECK-NEXT:    ret void
 //
@@ -74,7 +68,7 @@ extern "C" void call_hidden_sec(DerivedFromHidden *p) {
 }
 //.
 // CHECK: [[META8]] = !{i64 -5210807322846835646}
-// CHECK: [[META9]] = !{}
-// CHECK: [[PROF10]] = !{!"branch_weights", i32 1048575, i32 1}
-// CHECK: [[META11]] = !{i64 702925180092474428}
+// CHECK: [[META9]] = !{i64 702925180092474428}
+// CHECK: [[META10]] = !{}
+// CHECK: [[PROF11]] = !{!"branch_weights", i32 1048575, i32 1}
 //.

>From 329f04205b0514d1afc21993ab0fffe689dddbc1 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 06/15] [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 8bba99f0548aa..4c57f92cf84ae 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 a1e1563a4f38d..498f3820e1162 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 fd4cc7d886a1f..cff49bfca5c9b 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
@@ -51,20 +51,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
 //
@@ -223,17 +223,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
@@ -348,7 +348,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
@@ -483,7 +483,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
@@ -492,14 +492,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]]:
@@ -695,20 +695,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
 //
@@ -865,7 +865,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
@@ -874,14 +874,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]]:
@@ -1040,14 +1040,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 eb5b395410041..46c4b2f935044 100644
--- a/clang/test/CodeGenCXX/cfi-vtable-check.cpp
+++ b/clang/test/CodeGenCXX/cfi-vtable-check.cpp
@@ -14,14 +14,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(
@@ -32,15 +24,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(
@@ -51,14 +42,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(
@@ -108,8 +102,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) }

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

Created using spr 2.0.0-beta.2
---
 clang/lib/CodeGen/CGClass.cpp       | 3 +--
 clang/test/CodeGenCXX/cfi-stats.cpp | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 4c57f92cf84ae..00bc1eb0848d4 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -3004,8 +3004,6 @@ llvm::Value *CodeGenFunction::EmitVTableTypeCheckedLoad(
   auto CheckHandler = SanitizerHandler::CFICheckFail;
   SanitizerDebugLocation SanScope(this, {CheckOrdinal}, CheckHandler);
 
-  EmitSanitizerStatReport(llvm::SanStat_CFI_VCall);
-
   CanQualType T = CGM.getContext().getCanonicalTagType(RD);
   llvm::Metadata *MD = CGM.CreateMetadataIdentifierForType(T);
   llvm::Value *TypeId = llvm::MetadataAsValue::get(CGM.getLLVMContext(), MD);
@@ -3023,6 +3021,7 @@ llvm::Value *CodeGenFunction::EmitVTableTypeCheckedLoad(
   if (SanOpts.has(SanitizerKind::CFIVCall) &&
       !getContext().getNoSanitizeList().containsType(SanitizerKind::CFIVCall,
                                                      TypeName)) {
+    EmitSanitizerStatReport(llvm::SanStat_CFI_VCall);
     EmitCheck(std::make_pair(CheckResult, CheckOrdinal), CheckHandler, {}, {});
   }
 
diff --git a/clang/test/CodeGenCXX/cfi-stats.cpp b/clang/test/CodeGenCXX/cfi-stats.cpp
index f3690e41945a7..261092984fa2b 100644
--- a/clang/test/CodeGenCXX/cfi-stats.cpp
+++ b/clang/test/CodeGenCXX/cfi-stats.cpp
@@ -3,7 +3,7 @@
 // RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fsanitize=cfi-vcall,cfi-nvcall,cfi-derived-cast,cfi-unrelated-cast,cfi-icall -fwhole-program-vtables -fvirtual-function-elimination -fsanitize-stats -emit-llvm -o - %s | FileCheck --check-prefix=VFE %s
 
 // CHECK: [[STATS:@[^ ]*]] = internal global { ptr, i32, [5 x [2 x ptr]] } { ptr null, i32 5, [5 x [2 x ptr]]
-// VFE: [[STATS:@[^ ]*]] = internal global { ptr, i32, [6 x [2 x ptr]] } { ptr null, i32 6, [6 x [2 x ptr]]
+// VFE: [[STATS:@[^ ]*]] = internal global { ptr, i32, [5 x [2 x ptr]] } { ptr null, i32 5, [5 x [2 x ptr]]
 // CHECK: {{\[\[}}2 x ptr] zeroinitializer,
 // CHECK: [2 x ptr] [ptr null, ptr inttoptr (i64 2305843009213693952 to ptr)],
 // CHECK: [2 x ptr] [ptr null, ptr inttoptr (i64 4611686018427387904 to ptr)],
@@ -54,7 +54,7 @@ extern "C" void icall(void (*p)()) {
 // VFE-LABEL: @vcall_unsanitized(
 extern "C" __attribute__((no_sanitize("cfi-vcall"))) void vcall_unsanitized(A *a) {
   // CHECK-NOT: @__sanitizer_stat_report
-  // VFE: call void @__sanitizer_stat_report({{.*}}[[STATS]]{{.*}}i64 96)
+  // VFE-NOT: @__sanitizer_stat_report
   a->vf();
   // CHECK: ret void
   // VFE: ret void

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

Created using spr 2.0.0-beta.2
---
 clang/lib/CodeGen/CGClass.cpp              |  5 ++---
 clang/test/CodeGenCXX/cfi-vtable-check.cpp | 12 ++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 00bc1eb0848d4..a1b61394571d4 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -2980,9 +2980,8 @@ void CodeGenFunction::EmitVTableCheck(CFITypeCheckKind TCK, CanQualType T,
 }
 
 bool CodeGenFunction::ShouldEmitVTableTypeCheckedLoad(const CXXRecordDecl *RD) {
-  if ((!CGM.getCodeGenOpts().WholeProgramVTables ||
-       !CGM.HasHiddenLTOVisibility(RD)) &&
-      !CGM.getCodeGenOpts().DevirtualizeSpeculatively)
+  if (!CGM.getCodeGenOpts().WholeProgramVTables ||
+      !CGM.HasHiddenLTOVisibility(RD))
     return false;
 
   if (CGM.getCodeGenOpts().VirtualFunctionElimination)
diff --git a/clang/test/CodeGenCXX/cfi-vtable-check.cpp b/clang/test/CodeGenCXX/cfi-vtable-check.cpp
index 46c4b2f935044..47e8d7130e7ba 100644
--- a/clang/test/CodeGenCXX/cfi-vtable-check.cpp
+++ b/clang/test/CodeGenCXX/cfi-vtable-check.cpp
@@ -80,15 +80,15 @@ struct S {
 // SPEC_TRAP-NEXT:    store ptr [[S]], ptr [[S_ADDR]], align 8
 // SPEC_TRAP-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S_ADDR]], align 8
 // SPEC_TRAP-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// SPEC_TRAP-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS1S"), !nosanitize [[META1:![0-9]+]]
-// SPEC_TRAP-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META1]]
-// SPEC_TRAP-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF2:![0-9]+]], !nosanitize [[META1]]
+// SPEC_TRAP-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS1S"), !nosanitize [[META1:![0-9]+]]
+// SPEC_TRAP-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF2:![0-9]+]], !nosanitize [[META1]]
 // SPEC_TRAP:       [[TRAP]]:
 // SPEC_TRAP-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3:[0-9]+]], !nosanitize [[META1]]
 // SPEC_TRAP-NEXT:    unreachable, !nosanitize [[META1]]
 // SPEC_TRAP:       [[CONT]]:
-// SPEC_TRAP-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META1]]
-// SPEC_TRAP-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// SPEC_TRAP-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// SPEC_TRAP-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// SPEC_TRAP-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // SPEC_TRAP-NEXT:    ret void
 //
 extern "C" void test(S *s) {
@@ -115,7 +115,7 @@ extern "C" void test(S *s) {
 // XDSO_TRAP: attributes #[[ATTR6:[0-9]+]] = { nomerge noreturn nounwind }
 //.
 // SPEC_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" }
-// SPEC_TRAP: attributes #[[ATTR1:[0-9]+]] = { nocallback nofree nosync nounwind willreturn memory(none) }
+// SPEC_TRAP: attributes #[[ATTR1:[0-9]+]] = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
 // SPEC_TRAP: attributes #[[ATTR2:[0-9]+]] = { cold noreturn nounwind memory(inaccessiblemem: write) }
 // SPEC_TRAP: attributes #[[ATTR3]] = { nomerge noreturn nounwind }
 //.

>From c42eb39f51e1848f11dc10c50a25133ec54960e8 Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Wed, 11 Nov 2026 19:05:46 -0800
Subject: [PATCH 09/15] [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 +++++++++---------
 3 files changed, 88 insertions(+), 84 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 548641c2af1fd..2732d30ad1ff4 100644
--- a/clang/test/CodeGenCXX/cfi-ignorelist.cpp
+++ b/clang/test/CodeGenCXX/cfi-ignorelist.cpp
@@ -72,9 +72,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 0, metadata !"_ZTS13DerivedFromS2")
+// NOSTD-VFE: call { ptr, i1 } @llvm.type.checked.load(ptr {{.*}}, i32 0, 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) {
   d->f();
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]] = !{}

>From 832b006138c4ff81e67701bed857dde7f2b66a0a Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Wed, 11 Nov 2026 23:00:40 -0800
Subject: [PATCH 10/15] Dedup checked load; NFC const& fix

Created using spr 2.0.0-beta.2
---
 clang/lib/CodeGen/CGDebugInfo.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/clang/lib/CodeGen/CGDebugInfo.h b/clang/lib/CodeGen/CGDebugInfo.h
index b70671821c920..bf92336743958 100644
--- a/clang/lib/CodeGen/CGDebugInfo.h
+++ b/clang/lib/CodeGen/CGDebugInfo.h
@@ -1028,7 +1028,8 @@ class ApplyInlineDebugLocation {
   /// Restore everything back to the original state.
   ~ApplyInlineDebugLocation();
   ApplyInlineDebugLocation(const ApplyInlineDebugLocation &) = delete;
-  ApplyInlineDebugLocation &operator=(ApplyInlineDebugLocation &) = delete;
+  ApplyInlineDebugLocation &
+  operator=(const ApplyInlineDebugLocation &) = delete;
 };
 
 class SanitizerDebugLocation {
@@ -1041,7 +1042,7 @@ class SanitizerDebugLocation {
                          SanitizerHandler Handler);
   ~SanitizerDebugLocation();
   SanitizerDebugLocation(const SanitizerDebugLocation &) = delete;
-  SanitizerDebugLocation &operator=(SanitizerDebugLocation &) = delete;
+  SanitizerDebugLocation &operator=(const SanitizerDebugLocation &) = delete;
 };
 
 } // namespace CodeGen

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

Created using spr 2.0.0-beta.2
---
 clang/lib/CodeGen/MicrosoftCXXABI.cpp         | 55 +++++++++----------
 .../CodeGenCXX/cfi-ms-secondary-vfptr.cpp     | 32 +++++------
 2 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
index 7a95ca2f50fdd..e7aac1530637c 100644
--- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp
+++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
@@ -2031,37 +2031,36 @@ CGCallee MicrosoftCXXABI::getVirtualFunctionPointer(CodeGenFunction &CGF,
   MicrosoftVTableContext &VFTContext = CGM.getMicrosoftVTableContext();
   MethodVFTableLocation ML = VFTContext.getMethodVFTableLocation(GD);
 
-  // Compute the identity of the most derived class whose virtual table is
-  // located at the MethodVFTableLocation ML.
-  auto getObjectWithVPtr = [&] {
-    return llvm::find_if(VFTContext.getVFPtrOffsets(
-                             ML.VBase ? ML.VBase : MethodDecl->getParent()),
-                         [&](const std::unique_ptr<VPtrInfo> &Info) {
-                           return Info->FullOffsetInMDC == ML.VFPtrOffset;
-                         })
-        ->get()
-        ->ObjectWithVPtr;
-  };
-
-  llvm::Value *VFunc;
-  if (CGF.ShouldEmitVTableTypeCheckedLoad(MethodDecl->getParent())) {
-    VFunc = CGF.EmitVTableTypeCheckedLoad(
-        getObjectWithVPtr(), VTable, Ty,
-        ML.Index *
-            CGM.getContext().getTargetInfo().getPointerWidth(LangAS::Default) /
-            8,
-        Loc);
-  } else {
-    if (CGM.getCodeGenOpts().PrepareForLTO)
-      CGF.EmitTypeMetadataCodeForVCall(getObjectWithVPtr(), VTable, Loc);
+  if (CGM.getCodeGenOpts().PrepareForLTO) {
+    // Compute the identity of the most derived class whose virtual table is
+    // located at the MethodVFTableLocation ML.
+    const CXXRecordDecl *ObjectWithVPtr =
+        llvm::find_if(VFTContext.getVFPtrOffsets(
+                          ML.VBase ? ML.VBase : MethodDecl->getParent()),
+                      [&](const std::unique_ptr<VPtrInfo> &Info) {
+                        return Info->FullOffsetInMDC == ML.VFPtrOffset;
+                      })
+            ->get()
+            ->ObjectWithVPtr;
+    if (CGF.ShouldEmitVTableTypeCheckedLoad(ObjectWithVPtr)) {
+      llvm::Value *VFunc = CGF.EmitVTableTypeCheckedLoad(
+          ObjectWithVPtr, VTable, Ty,
+          ML.Index *
+              CGM.getContext().getTargetInfo().getPointerWidth(
+                  LangAS::Default) /
+              8,
+          Loc);
+      return CGCallee(GD, VFunc);
+    }
 
-    llvm::Value *VFuncPtr =
-        Builder.CreateConstInBoundsGEP1_64(Ty, VTable, ML.Index, "vfn");
-    VFunc = Builder.CreateAlignedLoad(Ty, VFuncPtr, CGF.getPointerAlign());
+    CGF.EmitTypeMetadataCodeForVCall(ObjectWithVPtr, VTable, Loc);
   }
 
-  CGCallee Callee(GD, VFunc);
-  return Callee;
+  llvm::Value *VFuncPtr =
+      Builder.CreateConstInBoundsGEP1_64(Ty, VTable, ML.Index, "vfn");
+  llvm::Value *VFunc =
+      Builder.CreateAlignedLoad(Ty, VFuncPtr, CGF.getPointerAlign());
+  return CGCallee(GD, VFunc);
 }
 
 llvm::Value *MicrosoftCXXABI::EmitVirtualDestructorCall(
diff --git a/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp b/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp
index a14587b47fc1a..f458bb293fb6f 100644
--- a/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp
+++ b/clang/test/CodeGenCXX/cfi-ms-secondary-vfptr.cpp
@@ -34,15 +34,9 @@ struct DerivedFromHidden : Primary, HiddenSec {
 // CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
 // CHECK-NEXT:    [[TMP2:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
 // CHECK-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP2]], align 8
-// CHECK-NEXT:    [[TMP3:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"?AUPublic@@"), !nosanitize [[META9:![0-9]+]]
-// CHECK-NEXT:    [[TMP4:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 1, !nosanitize [[META9]]
-// CHECK-NEXT:    br i1 [[TMP4]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF10:![0-9]+]], !nosanitize [[META9]]
-// CHECK:       [[TRAP]]:
-// CHECK-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3:[0-9]+]], !nosanitize [[META9]]
-// CHECK-NEXT:    unreachable, !nosanitize [[META9]]
-// CHECK:       [[CONT]]:
-// CHECK-NEXT:    [[TMP5:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 0, !nosanitize [[META9]]
-// CHECK-NEXT:    call void [[TMP5]](ptr noundef [[TMP1]])
+// CHECK-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// CHECK-NEXT:    [[TMP3:%.*]] = load ptr, ptr [[VFN]], align 8
+// CHECK-NEXT:    call void [[TMP3]](ptr noundef [[TMP1]])
 // CHECK-NEXT:    ret void
 //
 extern "C" void call_public_sec(DerivedFromPublic *p) {
@@ -50,7 +44,7 @@ extern "C" void call_public_sec(DerivedFromPublic *p) {
 }
 
 // CHECK-LABEL: define dso_local void @call_hidden_sec(
-// CHECK-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META11:![0-9]+]] {
+// CHECK-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META9:![0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
 // CHECK-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // CHECK-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -58,14 +52,14 @@ extern "C" void call_public_sec(DerivedFromPublic *p) {
 // CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
 // CHECK-NEXT:    [[TMP2:%.*]] = getelementptr inbounds i8, ptr [[TMP0]], i64 8
 // CHECK-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP2]], align 8
-// CHECK-NEXT:    [[TMP3:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"?AUHiddenSec@@"), !nosanitize [[META9]]
-// CHECK-NEXT:    [[TMP4:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 1, !nosanitize [[META9]]
-// CHECK-NEXT:    br i1 [[TMP4]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF10]], !nosanitize [[META9]]
+// CHECK-NEXT:    [[TMP3:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"?AUHiddenSec@@"), !nosanitize [[META10:![0-9]+]]
+// CHECK-NEXT:    [[TMP4:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 1, !nosanitize [[META10]]
+// CHECK-NEXT:    br i1 [[TMP4]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF11:![0-9]+]], !nosanitize [[META10]]
 // CHECK:       [[TRAP]]:
-// CHECK-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3]], !nosanitize [[META9]]
-// CHECK-NEXT:    unreachable, !nosanitize [[META9]]
+// CHECK-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3:[0-9]+]], !nosanitize [[META10]]
+// CHECK-NEXT:    unreachable, !nosanitize [[META10]]
 // CHECK:       [[CONT]]:
-// CHECK-NEXT:    [[TMP5:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 0, !nosanitize [[META9]]
+// CHECK-NEXT:    [[TMP5:%.*]] = extractvalue { ptr, i1 } [[TMP3]], 0, !nosanitize [[META10]]
 // CHECK-NEXT:    call void [[TMP5]](ptr noundef [[TMP1]])
 // CHECK-NEXT:    ret void
 //
@@ -74,7 +68,7 @@ extern "C" void call_hidden_sec(DerivedFromHidden *p) {
 }
 //.
 // CHECK: [[META8]] = !{i64 -5210807322846835646}
-// CHECK: [[META9]] = !{}
-// CHECK: [[PROF10]] = !{!"branch_weights", i32 1048575, i32 1}
-// CHECK: [[META11]] = !{i64 702925180092474428}
+// CHECK: [[META9]] = !{i64 702925180092474428}
+// CHECK: [[META10]] = !{}
+// CHECK: [[PROF11]] = !{!"branch_weights", i32 1048575, i32 1}
 //.

>From a2e1b1ac928cef22382d65e32c71a8de228a42a4 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 12/15] [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 8bba99f0548aa..4c57f92cf84ae 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 a1e1563a4f38d..498f3820e1162 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 fd4cc7d886a1f..cff49bfca5c9b 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
@@ -51,20 +51,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
 //
@@ -223,17 +223,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
@@ -348,7 +348,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
@@ -483,7 +483,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
@@ -492,14 +492,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]]:
@@ -695,20 +695,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
 //
@@ -865,7 +865,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
@@ -874,14 +874,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]]:
@@ -1040,14 +1040,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 eb5b395410041..46c4b2f935044 100644
--- a/clang/test/CodeGenCXX/cfi-vtable-check.cpp
+++ b/clang/test/CodeGenCXX/cfi-vtable-check.cpp
@@ -14,14 +14,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(
@@ -32,15 +24,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(
@@ -51,14 +42,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(
@@ -108,8 +102,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) }

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

Created using spr 2.0.0-beta.2
---
 clang/lib/CodeGen/CGClass.cpp       | 3 +--
 clang/test/CodeGenCXX/cfi-stats.cpp | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 4c57f92cf84ae..00bc1eb0848d4 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -3004,8 +3004,6 @@ llvm::Value *CodeGenFunction::EmitVTableTypeCheckedLoad(
   auto CheckHandler = SanitizerHandler::CFICheckFail;
   SanitizerDebugLocation SanScope(this, {CheckOrdinal}, CheckHandler);
 
-  EmitSanitizerStatReport(llvm::SanStat_CFI_VCall);
-
   CanQualType T = CGM.getContext().getCanonicalTagType(RD);
   llvm::Metadata *MD = CGM.CreateMetadataIdentifierForType(T);
   llvm::Value *TypeId = llvm::MetadataAsValue::get(CGM.getLLVMContext(), MD);
@@ -3023,6 +3021,7 @@ llvm::Value *CodeGenFunction::EmitVTableTypeCheckedLoad(
   if (SanOpts.has(SanitizerKind::CFIVCall) &&
       !getContext().getNoSanitizeList().containsType(SanitizerKind::CFIVCall,
                                                      TypeName)) {
+    EmitSanitizerStatReport(llvm::SanStat_CFI_VCall);
     EmitCheck(std::make_pair(CheckResult, CheckOrdinal), CheckHandler, {}, {});
   }
 
diff --git a/clang/test/CodeGenCXX/cfi-stats.cpp b/clang/test/CodeGenCXX/cfi-stats.cpp
index f3690e41945a7..261092984fa2b 100644
--- a/clang/test/CodeGenCXX/cfi-stats.cpp
+++ b/clang/test/CodeGenCXX/cfi-stats.cpp
@@ -3,7 +3,7 @@
 // RUN: %clang_cc1 -triple x86_64-unknown-linux -flto -flto-unit -fvisibility=hidden -fsanitize=cfi-vcall,cfi-nvcall,cfi-derived-cast,cfi-unrelated-cast,cfi-icall -fwhole-program-vtables -fvirtual-function-elimination -fsanitize-stats -emit-llvm -o - %s | FileCheck --check-prefix=VFE %s
 
 // CHECK: [[STATS:@[^ ]*]] = internal global { ptr, i32, [5 x [2 x ptr]] } { ptr null, i32 5, [5 x [2 x ptr]]
-// VFE: [[STATS:@[^ ]*]] = internal global { ptr, i32, [6 x [2 x ptr]] } { ptr null, i32 6, [6 x [2 x ptr]]
+// VFE: [[STATS:@[^ ]*]] = internal global { ptr, i32, [5 x [2 x ptr]] } { ptr null, i32 5, [5 x [2 x ptr]]
 // CHECK: {{\[\[}}2 x ptr] zeroinitializer,
 // CHECK: [2 x ptr] [ptr null, ptr inttoptr (i64 2305843009213693952 to ptr)],
 // CHECK: [2 x ptr] [ptr null, ptr inttoptr (i64 4611686018427387904 to ptr)],
@@ -54,7 +54,7 @@ extern "C" void icall(void (*p)()) {
 // VFE-LABEL: @vcall_unsanitized(
 extern "C" __attribute__((no_sanitize("cfi-vcall"))) void vcall_unsanitized(A *a) {
   // CHECK-NOT: @__sanitizer_stat_report
-  // VFE: call void @__sanitizer_stat_report({{.*}}[[STATS]]{{.*}}i64 96)
+  // VFE-NOT: @__sanitizer_stat_report
   a->vf();
   // CHECK: ret void
   // VFE: ret void

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

Created using spr 2.0.0-beta.2
---
 clang/lib/CodeGen/CGClass.cpp              |  5 ++---
 clang/test/CodeGenCXX/cfi-vtable-check.cpp | 12 ++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 00bc1eb0848d4..a1b61394571d4 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -2980,9 +2980,8 @@ void CodeGenFunction::EmitVTableCheck(CFITypeCheckKind TCK, CanQualType T,
 }
 
 bool CodeGenFunction::ShouldEmitVTableTypeCheckedLoad(const CXXRecordDecl *RD) {
-  if ((!CGM.getCodeGenOpts().WholeProgramVTables ||
-       !CGM.HasHiddenLTOVisibility(RD)) &&
-      !CGM.getCodeGenOpts().DevirtualizeSpeculatively)
+  if (!CGM.getCodeGenOpts().WholeProgramVTables ||
+      !CGM.HasHiddenLTOVisibility(RD))
     return false;
 
   if (CGM.getCodeGenOpts().VirtualFunctionElimination)
diff --git a/clang/test/CodeGenCXX/cfi-vtable-check.cpp b/clang/test/CodeGenCXX/cfi-vtable-check.cpp
index 46c4b2f935044..47e8d7130e7ba 100644
--- a/clang/test/CodeGenCXX/cfi-vtable-check.cpp
+++ b/clang/test/CodeGenCXX/cfi-vtable-check.cpp
@@ -80,15 +80,15 @@ struct S {
 // SPEC_TRAP-NEXT:    store ptr [[S]], ptr [[S_ADDR]], align 8
 // SPEC_TRAP-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S_ADDR]], align 8
 // SPEC_TRAP-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// SPEC_TRAP-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS1S"), !nosanitize [[META1:![0-9]+]]
-// SPEC_TRAP-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META1]]
-// SPEC_TRAP-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF2:![0-9]+]], !nosanitize [[META1]]
+// SPEC_TRAP-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS1S"), !nosanitize [[META1:![0-9]+]]
+// SPEC_TRAP-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF2:![0-9]+]], !nosanitize [[META1]]
 // SPEC_TRAP:       [[TRAP]]:
 // SPEC_TRAP-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3:[0-9]+]], !nosanitize [[META1]]
 // SPEC_TRAP-NEXT:    unreachable, !nosanitize [[META1]]
 // SPEC_TRAP:       [[CONT]]:
-// SPEC_TRAP-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META1]]
-// SPEC_TRAP-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// SPEC_TRAP-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// SPEC_TRAP-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
+// SPEC_TRAP-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // SPEC_TRAP-NEXT:    ret void
 //
 extern "C" void test(S *s) {
@@ -115,7 +115,7 @@ extern "C" void test(S *s) {
 // XDSO_TRAP: attributes #[[ATTR6:[0-9]+]] = { nomerge noreturn nounwind }
 //.
 // SPEC_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" }
-// SPEC_TRAP: attributes #[[ATTR1:[0-9]+]] = { nocallback nofree nosync nounwind willreturn memory(none) }
+// SPEC_TRAP: attributes #[[ATTR1:[0-9]+]] = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
 // SPEC_TRAP: attributes #[[ATTR2:[0-9]+]] = { cold noreturn nounwind memory(inaccessiblemem: write) }
 // SPEC_TRAP: attributes #[[ATTR3]] = { nomerge noreturn nounwind }
 //.

>From ab53de85f4374f4f2a338052bb2595da9bb8673d Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Thu, 12 Nov 2026 15:42:31 -0800
Subject: [PATCH 15/15] Rebase

Created using spr 2.0.0-beta.2
---
 compiler-rt/test/cfi/devirtualize-speculatively.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/compiler-rt/test/cfi/devirtualize-speculatively.cpp b/compiler-rt/test/cfi/devirtualize-speculatively.cpp
index 92fd71ee7494b..7cc258f07751d 100644
--- a/compiler-rt/test/cfi/devirtualize-speculatively.cpp
+++ b/compiler-rt/test/cfi/devirtualize-speculatively.cpp
@@ -6,9 +6,6 @@
 // public LTO visibility: their vtables may come from outside of the LTO unit,
 // like the one defined in a non-LTO object here.
 
-// FIXME: The checked load traps on the vtable from the non-LTO object.
-// XFAIL: *
-
 struct [[clang::lto_visibility_public]] A {
   virtual void f();
 };



More information about the cfe-commits mailing list