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

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


llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang-codegen

Author: Vitaly Buka (vitalybuka)

<details>
<summary>Changes</summary>

Non-trapping `cfi-vcall` reported a failed `llvm.type.checked.load`
(used with `-fvirtual-function-elimination`) with a bare `EmitCheck`:
the diagnostic handler got no arguments and printed no report, and
cross-DSO CFI never called `__cfi_slowpath_diag`.

Report it with `EmitVTableCheck`, like the `llvm.type.test` path.
Checked loads without a check no longer get `!nosanitize`.

Needed by #<!-- -->241647.

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

---

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


5 Files Affected:

- (modified) clang/lib/CodeGen/CGClass.cpp (+13-12) 
- (modified) clang/test/CodeGenCXX/cfi-ignorelist.cpp (+3-3) 
- (modified) clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp (+124-123) 
- (modified) clang/test/DebugInfo/Generic/cfi-vcall-debuginfo.cpp (+62-61) 
- (modified) compiler-rt/test/cfi/vfe-diag.cpp (-3) 


``````````diff
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 4fbe06314c9a3..580ed18fc99b5 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -3009,31 +3009,32 @@ bool CodeGenFunction::ShouldEmitVTableTypeCheckedLoad(const CXXRecordDecl *RD) {
 
 llvm::Value *CodeGenFunction::EmitVTableTypeCheckedLoad(
     const CXXRecordDecl *RD, llvm::Value *VTable, llvm::Type *VTableTy,
-    uint64_t VTableByteOffset, SourceLocation /*Loc*/) {
+    uint64_t VTableByteOffset, SourceLocation Loc) {
   auto [TargetRD, ShouldEmitCFICheck] = getCFIVCallTarget(*this, RD);
 
-  auto CheckOrdinal = SanitizerKind::SO_CFIVCall;
-  auto CheckHandler = SanitizerHandler::CFICheckFail;
-  SanitizerDebugLocation SanScope(this, {CheckOrdinal}, CheckHandler);
-
   CanQualType T = CGM.getContext().getCanonicalTagType(TargetRD);
   llvm::Metadata *MD = CGM.CreateMetadataIdentifierForType(T);
   llvm::Value *TypeId = llvm::MetadataAsValue::get(CGM.getLLVMContext(), MD);
-
   auto CheckedLoadIntrinsic = CGM.getLangOpts().RelativeCXXABIVTables
                                   ? llvm::Intrinsic::type_checked_load_relative
                                   : llvm::Intrinsic::type_checked_load;
+
+  std::optional<SanitizerDebugLocation> SanScope;
+  if (ShouldEmitCFICheck) {
+    SanScope.emplace(this, SanitizerKind::SO_CFIVCall,
+                     SanitizerHandler::CFICheckFail);
+  }
   llvm::Value *CheckedLoad = Builder.CreateCall(
       CGM.getIntrinsic(CheckedLoadIntrinsic),
       {VTable, llvm::ConstantInt::get(Int32Ty, VTableByteOffset), TypeId});
-
-  llvm::Value *CheckResult = Builder.CreateExtractValue(CheckedLoad, 1);
-
   if (ShouldEmitCFICheck) {
-    EmitSanitizerStatReport(llvm::SanStat_CFI_VCall);
-    EmitCheck(std::make_pair(CheckResult, CheckOrdinal), CheckHandler, {}, {});
+    llvm::Value *CheckResult = Builder.CreateExtractValue(CheckedLoad, 1);
+    bool UseCrossDsoSlowPath =
+        CGM.getCodeGenOpts().SanitizeCfiCrossDso &&
+        !CGM.getCodeGenOpts().SanitizeTrap.has(SanitizerKind::CFIVCall);
+    EmitVTableCheck(CFITCK_VCall, T, MD, VTable, CheckResult, Loc,
+                    UseCrossDsoSlowPath);
   }
-
   return Builder.CreateBitCast(Builder.CreateExtractValue(CheckedLoad, 0),
                                VTableTy);
 }
diff --git a/clang/test/CodeGenCXX/cfi-ignorelist.cpp b/clang/test/CodeGenCXX/cfi-ignorelist.cpp
index 2732d30ad1ff4..f7083e3d600f4 100644
--- a/clang/test/CodeGenCXX/cfi-ignorelist.cpp
+++ b/clang/test/CodeGenCXX/cfi-ignorelist.cpp
@@ -38,7 +38,7 @@ struct S2 {
 // NOSTD-WPD: call i1 @llvm.type.test
 // NOSTD-WPD: call void @__ubsan_handle_cfi_check_fail_abort(ptr
 // NOSTD-VFE: call { ptr, i1 } @llvm.type.checked.load
-// NOSTD-VFE: call void @__ubsan_handle_cfi_check_fail_abort()
+// NOSTD-VFE: call void @__ubsan_handle_cfi_check_fail_abort(ptr
 void s1f(S1 *s1) {
   s1->f();
 }
@@ -53,7 +53,7 @@ void s1f(S1 *s1) {
 // NOSTD-WPD-NOT: call void @__ubsan_handle_cfi_check_fail
 // NOSTD-WPD: ret void
 // NOSTD-VFE: call { ptr, i1 } @llvm.type.checked.load
-// NOSTD-VFE: extractvalue { ptr, i1 } {{.*}}, 1
+// NOSTD-VFE-NOT: extractvalue { ptr, i1 } {{.*}}, 1
 // NOSTD-VFE-NOT: call void @__ubsan_handle_cfi_check_fail
 // NOSTD-VFE: ret void
 void s2f(std::S2 *s2) {
@@ -73,7 +73,7 @@ struct DerivedFromS2 : std::S2 {};
 // NOSTD-WPD-NOT: call void @__ubsan_handle_cfi_check_fail
 // NOSTD-WPD: ret void
 // NOSTD-VFE: call { ptr, i1 } @llvm.type.checked.load(ptr {{.*}}, i32 0, metadata !"_ZTSSt2S2")
-// NOSTD-VFE: extractvalue { ptr, i1 } {{.*}}, 1
+// NOSTD-VFE-NOT: extractvalue { ptr, i1 } {{.*}}, 1
 // NOSTD-VFE-NOT: call void @__ubsan_handle_cfi_check_fail
 // NOSTD-VFE: ret void
 void d2f(DerivedFromS2 *d) {
diff --git a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
index 9c1f5014ddb52..9e5dabe4fbc9e 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-type-checked-load.cpp
@@ -69,38 +69,41 @@ struct DerivedSameLayoutFromPublic : Public {};
 // XDSOT-NEXT:    ret void
 //
 // VFEFULL-LABEL: define hidden void @call_hidden(
-// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META4:![0-9]+]] {
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META10:![0-9]+]] {
 // VFEFULL-NEXT:  [[ENTRY:.*:]]
 // VFEFULL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFEFULL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFEFULL-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFEFULL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META5:![0-9]+]]
-// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFEFULL-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6:![0-9]+]], !nosanitize [[META5]]
+// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META11:![0-9]+]]
+// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META11]]
+// VFEFULL-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12:![0-9]+]], !nosanitize [[META11]]
 // VFEFULL:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFEFULL-NEXT:    call void @__ubsan_handle_cfi_check_fail() #[[ATTR3:[0-9]+]], !nosanitize [[META5]]
-// VFEFULL-NEXT:    br label %[[CONT]], !nosanitize [[META5]]
+// VFEFULL-NEXT:    [[TMP4:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP5:%.*]] = zext i1 [[TMP3]] to i64, !nosanitize [[META11]]
+// VFEFULL-NEXT:    call void @__ubsan_handle_cfi_check_fail(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.1, i64 [[TMP4]], i64 [[TMP5]]) #[[ATTR4:[0-9]+]], !nosanitize [[META11]]
+// VFEFULL-NEXT:    br label %[[CONT]], !nosanitize [[META11]]
 // VFEFULL:       [[CONT]]:
-// VFEFULL-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFEFULL-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// VFEFULL-NEXT:    [[TMP6:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
+// VFEFULL-NEXT:    call void [[TMP6]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_hidden(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META10:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0:[0-9]+]] !guid [[META15:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META11:![0-9]+]]
-// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12:![0-9]+]], !nosanitize [[META11]]
-// VFECROSS_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFECROSS_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR7:[0-9]+]], !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META11]]
-// VFECROSS_MIN:       [[CONT]]:
-// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META16:![0-9]+]]
+// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br i1 [[TMP2]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF17:![0-9]+]], !nosanitize [[META16]]
+// VFECROSS_MIN:       [[CFI_SLOWPATH]]:
+// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 2113178649093603051, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.1) #[[ATTR7:[0-9]+]], !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META16]]
+// VFECROSS_MIN:       [[CFI_CONT]]:
+// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META16]]
 // VFECROSS_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFECROSS_MIN-NEXT:    ret void
 //
@@ -173,10 +176,9 @@ struct DerivedSameLayoutFromPublic : Public {};
 // VFE_NOCFI-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFE_NOCFI-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFE_NOCFI-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META5:![0-9]+]]
-// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden")
+// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0
+// VFE_NOCFI-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFE_NOCFI-NEXT:    ret void
 //
 // STRICT-LABEL: define hidden void @call_hidden(
@@ -241,7 +243,7 @@ extern "C" void call_hidden(Hidden *p) {
 // XDSOT-NEXT:    ret void
 //
 // VFEFULL-LABEL: define hidden void @call_public(
-// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META7:![0-9]+]] {
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META13:![0-9]+]] {
 // VFEFULL-NEXT:  [[ENTRY:.*:]]
 // VFEFULL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFEFULL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -253,17 +255,17 @@ extern "C" void call_hidden(Hidden *p) {
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_public(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META13:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META18:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF12]], !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS6Public"), !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br i1 [[TMP1]], label %[[CFI_CONT:.*]], label %[[CFI_SLOWPATH:.*]], !prof [[PROF17]], !nosanitize [[META16]]
 // VFECROSS_MIN:       [[CFI_SLOWPATH]]:
-// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 7659278028533726273, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.1) #[[ATTR8:[0-9]+]], !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META11]]
+// VFECROSS_MIN-NEXT:    call void @__cfi_slowpath_diag(i64 7659278028533726273, ptr [[VTABLE]], ptr @anon.93ff3a23323713a2f8f8fa200a6533af.3) #[[ATTR7]], !nosanitize [[META16]]
+// VFECROSS_MIN-NEXT:    br label %[[CFI_CONT]], !nosanitize [[META16]]
 // VFECROSS_MIN:       [[CFI_CONT]]:
 // VFECROSS_MIN-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
 // VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[VFN]], align 8
@@ -306,7 +308,7 @@ extern "C" void call_hidden(Hidden *p) {
 // SPEC-NEXT:    ret void
 //
 // VFE_NOCFI-LABEL: define hidden void @call_public(
-// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META6:![0-9]+]] {
+// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META5:![0-9]+]] {
 // VFE_NOCFI-NEXT:  [[ENTRY:.*:]]
 // VFE_NOCFI-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFE_NOCFI-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -362,29 +364,27 @@ extern "C" void call_public(Public *p) {
 // XDSOT-NEXT:    ret void
 //
 // VFEFULL-LABEL: define hidden void @call_no_sanitize(
-// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META8:![0-9]+]] {
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META14:![0-9]+]] {
 // VFEFULL-NEXT:  [[ENTRY:.*:]]
 // VFEFULL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFEFULL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFEFULL-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFEFULL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META5]]
-// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFEFULL-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFEFULL-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden")
+// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0
+// VFEFULL-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_no_sanitize(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META14:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META19:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFECROSS_MIN-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
-// VFECROSS_MIN-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// VFECROSS_MIN-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden")
+// VFECROSS_MIN-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0
+// VFECROSS_MIN-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFECROSS_MIN-NEXT:    ret void
 //
 // MS-LABEL: define dso_local void @call_no_sanitize(
@@ -429,16 +429,15 @@ extern "C" void call_public(Public *p) {
 // SPEC-NEXT:    ret void
 //
 // VFE_NOCFI-LABEL: define hidden void @call_no_sanitize(
-// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META7:![0-9]+]] {
+// VFE_NOCFI-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META6:![0-9]+]] {
 // VFE_NOCFI-NEXT:  [[ENTRY:.*:]]
 // VFE_NOCFI-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFE_NOCFI-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
 // VFE_NOCFI-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[P_ADDR]], align 8
 // VFE_NOCFI-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden"), !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFE_NOCFI-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// VFE_NOCFI-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 8, metadata !"_ZTS6Hidden")
+// VFE_NOCFI-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0
+// VFE_NOCFI-NEXT:    call void [[TMP2]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
 // VFE_NOCFI-NEXT:    ret void
 //
 // STRICT-LABEL: define hidden void @call_no_sanitize(
@@ -506,7 +505,7 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidde
 // XDSOT-NEXT:    ret void
 //
 // VFEFULL-LABEL: define hidden void @call_derived_same_layout(
-// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META9:![0-9]+]] {
+// VFEFULL-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META15:![0-9]+]] {
 // VFEFULL-NEXT:  [[ENTRY:.*:]]
 // VFEFULL-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFEFULL-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -515,21 +514,24 @@ extern "C" __attribute__((no_sanitize("cfi-vcall"))) void call_no_sanitize(Hidde
 // VFEFULL-NEXT:    br i1 [[ISNULL]], label %[[DELETE_END:.*]], label %[[DELETE_NOTNULL:.*]]
 // VFEFULL:       [[DELETE_NOTNULL]]:
 // VFEFULL-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
-// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS6Hidden"), !nosanitize [[META5]]
-// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
-// VFEFULL-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF6]], !nosanitize [[META5]]
+// VFEFULL-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 24, metadata !"_ZTS6Hidden"), !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META11]]
+// VFEFULL-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF12]], !nosanitize [[META11]]
 // VFEFULL:       [[HANDLER_CFI_CHECK_FAIL]]:
-// VFEFULL-NEXT:    call void @__ubsan_handle_cfi_check_fail() #[[ATTR3]], !nosanitize [[META5]]
-// VFEFULL-NEXT:    br label %[[CONT]], !nosanitize [[META5]]
+// VFEFULL-NEXT:    [[TMP4:%.*]] = ptrtoint ptr [[VTABLE]] to i64, !nosanitize [[META11]]
+// VFEFULL-NEXT:    [[TMP5:%.*]] = zext i1 [[TMP3]] to i64, !nosanitize [[META11]]
+// VFEFULL-NEXT:    call void @__ubsan_handle_cfi_check_fail(ptr @anon.d9643cf6d96f91e01d1bcbfe408e7c5c.2, i64 [[TMP4]], i64 [[TMP5]]) #[[ATTR4]], !nosanitize [[META11]]
+// VFEFULL-NEXT:    br label %[[CONT]], !nosanitize [[META11]]
 // VFEFULL:       [[CONT]]:
-// VFEFULL-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
-// VFEFULL-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR4:[0-9]+]]
+// VFEFULL-NEXT:    [[TMP6:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META11]]
+// VFEFULL-NEXT:    call void [[TMP6]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]]) #[[ATTR5:[0-9]+]]
 // VFEFULL-NEXT:    br label %[[DELETE_END]]
 // VFEFULL:       [[DELETE_END]]:
 // VFEFULL-NEXT:    ret void
 //
 // VFECROSS_MIN-LABEL: define hidden void @call_derived_same_layout(
-// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META15:![0-9]+]] {
+// VFECROSS_MIN-SAME: ptr noundef [[P:%.*]]) #[[ATTR0]] !guid [[META20:![0-9]+]] {
 // VFECROSS_MIN-NEXT:  [[ENTRY:.*:]]
 // VFECROSS_MIN-NEXT:    [[P_ADDR:%.*]] = alloca ptr, align 8
 // VFECROSS_MIN-NEXT:    store ptr [[P]], ptr [[P_ADDR]], align 8
@@ -538...
[truncated]

``````````

</details>


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


More information about the llvm-branch-commits mailing list