[llvm-branch-commits] [clang] [compiler-rt] [Clang][CFI] Emit llvm.type.checked.load for non-trapping cfi-vcall (PR #241647)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Wed Nov 11 23:56:54 PST 2026


llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang-codegen

Author: Vitaly Buka (vitalybuka)

<details>
<summary>Changes</summary>

With `-fwhole-program-vtables`, trapping `cfi-vcall` emits
`llvm.type.checked.load`, which `WholeProgramDevirt` uses to
devirtualize calls. Non-trapping modes (full runtime, minimal runtime,
cross-DSO) emitted `llvm.type.test` without `llvm.assume` instead, so
their virtual calls were never devirtualized.

Emit `llvm.type.checked.load` for all `cfi-vcall` modes on classes with
hidden LTO visibility. Failed checks are reported the same way as
before, through `EmitVTableCheck`.

As with trapping CFI, when `WholeProgramDevirt` devirtualizes a call it
also removes the check, so recover mode no longer reports at
devirtualized call sites. compiler-rt CFI tests that expect a report in
devirt mode now use multiple implementations (`-DB32`).

Assisted-by: Gemini
Co-authored-by: Benedict Schlüter <bschlueter@<!-- -->google.com>

---

Patch is 46.61 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/241647.diff


9 Files Affected:

- (modified) clang/lib/CodeGen/CGClass.cpp (+1-5) 
- (modified) clang/test/CodeGenCXX/cfi-ignorelist.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp (+1-1) 
- (modified) clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp (+33-33) 
- (modified) clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp (+104-101) 
- (modified) compiler-rt/test/cfi/anon-namespace.cpp (+2-2) 
- (modified) compiler-rt/test/cfi/overwrite.cpp (+9-1) 
- (modified) compiler-rt/test/cfi/simple-fail.cpp (+1-1) 
- (modified) compiler-rt/test/cfi/vdtor.cpp (+1-1) 


``````````diff
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 580ed18fc99b5..6f0577472c9ba 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -3000,11 +3000,7 @@ bool CodeGenFunction::ShouldEmitVTableTypeCheckedLoad(const CXXRecordDecl *RD) {
 
   // 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;
-
-  return ShouldEmitCFICheck &&
-         CGM.getCodeGenOpts().SanitizeTrap.has(SanitizerKind::CFIVCall);
+  return CGM.getCodeGenOpts().VirtualFunctionElimination || ShouldEmitCFICheck;
 }
 
 llvm::Value *CodeGenFunction::EmitVTableTypeCheckedLoad(
diff --git a/clang/test/CodeGenCXX/cfi-ignorelist.cpp b/clang/test/CodeGenCXX/cfi-ignorelist.cpp
index f7083e3d600f4..8522ded521cdd 100644
--- a/clang/test/CodeGenCXX/cfi-ignorelist.cpp
+++ b/clang/test/CodeGenCXX/cfi-ignorelist.cpp
@@ -35,7 +35,7 @@ struct S2 {
 // NOSTD-VFE-LABEL: define{{.*}}s1f
 // NOBL: llvm.type.test
 // NOSTD: llvm.type.test
-// NOSTD-WPD: call i1 @llvm.type.test
+// NOSTD-WPD: call { ptr, i1 } @llvm.type.checked.load
 // 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(ptr
diff --git a/clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp b/clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp
index b3db3dac90fdb..5bb4e0ef6da5a 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp
@@ -7,7 +7,7 @@ struct S1 {
 };
 
 // CHECK: define{{.*}}s1f
-// CFI: llvm.type.test(ptr {{.*}}, metadata !"{{.*}}S1{{.*}}")
+// CFI: llvm.type.checked.load(ptr {{.*}}, i32 0, metadata !"{{.*}}S1{{.*}}")
 // CFI: llvm.type.test(ptr {{.*}}, metadata !"all-vtables")
 // CFI-NOT: llvm.assume
 // NOCFI: llvm.type.test(ptr {{.*}}, metadata !"{{.*}}S1{{.*}}")
diff --git a/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp b/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp
index 498f3820e1162..7acc6976e22cd 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp
@@ -43,18 +43,18 @@ struct S1 {
 // 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 [[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-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS2S1"), !nosanitize [[META8:![0-9]+]]
+// ABORT-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META8]]
+// ABORT-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META8]]
+// ABORT-NEXT:    br i1 [[TMP2]], 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 [[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:    [[TMP4:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META8]]
+// ABORT-NEXT:    [[TMP5:%.*]] = zext i1 [[TMP3]] to i64, !nosanitize [[META8]]
+// ABORT-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.00e38160576ab76122d2f8d139d2e390.1, i64 [[TMP4]], i64 [[TMP5]]) #[[ATTR4:[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
-// ABORT-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// ABORT-NEXT:    [[TMP6:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META8]]
+// ABORT-NEXT:    call void [[TMP6]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // ABORT-NEXT:    ret void
 //
 // RECOVER-LABEL: define hidden void @_Z3s1fP2S1(
@@ -64,18 +64,18 @@ struct S1 {
 // 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 [[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-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS2S1"), !nosanitize [[META8:![0-9]+]]
+// RECOVER-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META8]]
+// RECOVER-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META8]]
+// RECOVER-NEXT:    br i1 [[TMP2]], 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 [[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:    [[TMP4:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META8]]
+// RECOVER-NEXT:    [[TMP5:%.*]] = zext i1 [[TMP3]] to i64, !nosanitize [[META8]]
+// RECOVER-NEXT:    call void @__ubsan_handle_cfi_check_fail(ptr @anon.00e38160576ab76122d2f8d139d2e390.1, i64 [[TMP4]], i64 [[TMP5]]) #[[ATTR4:[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
-// RECOVER-NEXT:    call void [[TMP5]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// RECOVER-NEXT:    [[TMP6:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META8]]
+// RECOVER-NEXT:    call void [[TMP6]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // RECOVER-NEXT:    ret void
 //
 // ABORT_MIN-LABEL: define hidden void @_Z3s1fP2S1(
@@ -85,15 +85,15 @@ struct S1 {
 // 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:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6:![0-9]+]], !nosanitize [[META5]]
+// ABORT_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS2S1"), !nosanitize [[META5:![0-9]+]]
+// ABORT_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
+// ABORT_MIN-NEXT:    br i1 [[TMP2]], 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:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
-// ABORT_MIN-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// ABORT_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
+// ABORT_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // ABORT_MIN-NEXT:    ret void
 //
 // RECOVER_MIN-LABEL: define hidden void @_Z3s1fP2S1(
@@ -103,15 +103,15 @@ struct S1 {
 // 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:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6:![0-9]+]], !nosanitize [[META5]]
+// RECOVER_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS2S1"), !nosanitize [[META5:![0-9]+]]
+// RECOVER_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
+// RECOVER_MIN-NEXT:    br i1 [[TMP2]], 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:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
-// RECOVER_MIN-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// RECOVER_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
+// RECOVER_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // RECOVER_MIN-NEXT:    ret void
 //
 // PRESERVE_MIN-LABEL: define hidden void @_Z3s1fP2S1(
@@ -121,15 +121,15 @@ struct S1 {
 // 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:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6:![0-9]+]], !nosanitize [[META5]]
+// PRESERVE_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS2S1"), !nosanitize [[META5:![0-9]+]]
+// PRESERVE_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
+// PRESERVE_MIN-NEXT:    br i1 [[TMP2]], 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:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
-// PRESERVE_MIN-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// PRESERVE_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
+// PRESERVE_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // PRESERVE_MIN-NEXT:    ret void
 //
 void s1f(S1 *s1) {
diff --git a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
index 9e5dabe4fbc9e..f1d58e2d56496 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
@@ -39,15 +39,15 @@ struct DerivedSameLayoutFromPublic : Public {};
 // 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-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META16:![0-9]+]]
+// XDSO-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META16]]
+// XDSO-NEXT:    br i1 [[TMP2]], 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:    call void @__cfi_slowpath_diag(i64 2113178649093603051, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.1) #[[ATTR8:[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:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META16]]
+// XDSO-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // XDSO-NEXT:    ret void
 //
 // XDSOT-LABEL: define hidden void @call_hidden(
@@ -114,18 +114,18 @@ struct DerivedSameLayoutFromPublic : Public {};
 // 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-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"?AUHidden@@"), !nosanitize [[META13:![0-9]+]]
+// MS-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META13]]
+// MS-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META13]]
+// MS-NEXT:    br i1 [[TMP2]], 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:    [[TMP4:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META13]]
+// MS-NEXT:    [[TMP5:%.*]] = zext i1 [[TMP3]] to i64, !nosanitize [[META13]]
+// MS-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.1, i64 [[TMP4]], i64 [[TMP5]]) #[[ATTR5:[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:    [[TMP6:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META13]]
+// MS-NEXT:    call void [[TMP6]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // MS-NEXT:    ret void
 //
 // REL-LABEL: define hidden void @call_hidden(
@@ -135,17 +135,18 @@ struct DerivedSameLayoutFromPublic : Public {};
 // 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-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load.relative(ptr [[VTABLE]], i32 4, metadata !"_ZTS6Hidden"), !nosanitize [[META11:![0-9]+]]
+// REL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
+// REL-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META11]]
+// REL-NEXT:    br i1 [[TMP2]], 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:    [[TMP4:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META11]]
+// REL-NEXT:    [[TMP5:%.*]] = zext i1 [[TMP3]] to i64, !nosanitize [[META11]]
+// REL-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.1, i64 [[TMP4]], i64 [[TMP5]]) #[[ATTR6:[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:    [[TMP6:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
+// REL-NEXT:    call void [[TMP6]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // REL-NEXT:    ret void
 //
 // SPEC-LABEL: define hidden void @call_hidden(
@@ -188,18 +189,18 @@ struct DerivedSameLayoutFromPublic : Public {};
 // 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-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META14:![0-9]+]]
+// STRICT-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], ...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/241647


More information about the llvm-branch-commits mailing list