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