Skip to content

[NFC][CFI] Add tests for different reporting settings #137225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 24, 2025
Merged

[NFC][CFI] Add tests for different reporting settings #137225

merged 1 commit into from
Apr 24, 2025

Conversation

@vitalybuka
Copy link
Collaborator

@vitalybuka vitalybuka commented Apr 24, 2025

  1. Trap
  2. Abort from runtime
  3. Recover from runtime
  4. Abort from minimal runtime
  5. Recover from minimal runtime

They already work as expected.

@vitalybuka
[𝘀𝗽𝗿] initial version
af97f1d 
Created using spr 1.3.4
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Apr 24, 2025
@llvmbot
Copy link
Member

llvmbot commented Apr 24, 2025

@llvm/pr-subscribers-clang

Author: Vitaly Buka (vitalybuka)

Changes
  1. Trap
  2. Abort from runtime
  3. Recover from runtime
  4. Abort from minimal runtime
  5. Recover from minimal runtime

They already work as expected.

Full diff: https://github.com/llvm/llvm-project/pull/137225.diff

2 Files Affected:

  • (added) clang/test/CodeGen/cfi-icall-trap-recover-runtime.c (+188)
  • (added) clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp (+132)
diff --git a/clang/test/CodeGen/cfi-icall-trap-recover-runtime.c b/clang/test/CodeGen/cfi-icall-trap-recover-runtime.c
new file mode 100644
index 0000000000000..117672a9d4368
--- /dev/null
+++ b/clang/test/CodeGen/cfi-icall-trap-recover-runtime.c
@@ -0,0 +1,188 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5
+// RUN: %clang_cc1 -fsanitize=cfi-icall -fsanitize-trap=cfi-icall -flto -fvisibility=hidden -triple x86_64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=TRAP %s
+
+// RUN: %clang_cc1 -fsanitize=cfi-icall -fno-sanitize-trap=cfi-icall -flto -fvisibility=hidden -triple x86_64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=ABORT %s
+
+// RUN: %clang_cc1 -fsanitize=cfi-icall -fno-sanitize-trap=cfi-icall -fsanitize-recover=cfi-icall -flto -fvisibility=hidden -triple x86_64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=RECOVER %s
+
+// RUN: %clang_cc1 -fsanitize=cfi-icall -fno-sanitize-trap=cfi-icall -fsanitize-minimal-runtime -flto -fvisibility=hidden -triple x86_64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=ABORT_MIN %s
+
+// RUN: %clang_cc1 -fsanitize=cfi-icall -fno-sanitize-trap=cfi-icall -fsanitize-recover=cfi-icall -fsanitize-minimal-runtime -flto -fvisibility=hidden -triple x86_64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=RECOVER_MIN %s
+
+// TRAP-LABEL: define hidden void @f(
+// TRAP-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
+// TRAP-NEXT:  [[ENTRY:.*:]]
+// TRAP-NEXT:    ret void
+//
+// ABORT-LABEL: define hidden void @f(
+// ABORT-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
+// ABORT-NEXT:  [[ENTRY:.*:]]
+// ABORT-NEXT:    ret void
+//
+// RECOVER-LABEL: define hidden void @f(
+// RECOVER-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
+// RECOVER-NEXT:  [[ENTRY:.*:]]
+// RECOVER-NEXT:    ret void
+//
+// ABORT_MIN-LABEL: define hidden void @f(
+// ABORT_MIN-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
+// ABORT_MIN-NEXT:  [[ENTRY:.*:]]
+// ABORT_MIN-NEXT:    ret void
+//
+// RECOVER_MIN-LABEL: define hidden void @f(
+// RECOVER_MIN-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
+// RECOVER_MIN-NEXT:  [[ENTRY:.*:]]
+// RECOVER_MIN-NEXT:    ret void
+//
+void f() {
+}
+
+void xf();
+
+// TRAP-LABEL: define hidden void @g(
+// TRAP-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]] {
+// TRAP-NEXT:  [[ENTRY:.*:]]
+// TRAP-NEXT:    [[B_ADDR:%.*]] = alloca i32, align 4
+// TRAP-NEXT:    [[FP:%.*]] = alloca ptr, align 8
+// TRAP-NEXT:    store i32 [[B]], ptr [[B_ADDR]], align 4
+// TRAP-NEXT:    [[TMP0:%.*]] = load i32, ptr [[B_ADDR]], align 4
+// TRAP-NEXT:    [[TOBOOL:%.*]] = icmp ne i32 [[TMP0]], 0
+// TRAP-NEXT:    [[TMP1:%.*]] = zext i1 [[TOBOOL]] to i64
+// TRAP-NEXT:    [[COND:%.*]] = select i1 [[TOBOOL]], ptr @f, ptr @xf
+// TRAP-NEXT:    store ptr [[COND]], ptr [[FP]], align 8
+// TRAP-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[FP]], align 8
+// TRAP-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[TMP2]], metadata !"_ZTSFvE"), !nosanitize [[META10:![0-9]+]]
+// TRAP-NEXT:    br i1 [[TMP3]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF11:![0-9]+]], !nosanitize [[META10]]
+// TRAP:       [[TRAP]]:
+// TRAP-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR4:[0-9]+]], !nosanitize [[META10]]
+// TRAP-NEXT:    unreachable, !nosanitize [[META10]]
+// TRAP:       [[CONT]]:
+// TRAP-NEXT:    call void (...) [[TMP2]]()
+// TRAP-NEXT:    ret void
+//
+// ABORT-LABEL: define hidden void @g(
+// ABORT-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]] {
+// ABORT-NEXT:  [[ENTRY:.*:]]
+// ABORT-NEXT:    [[B_ADDR:%.*]] = alloca i32, align 4
+// ABORT-NEXT:    [[FP:%.*]] = alloca ptr, align 8
+// ABORT-NEXT:    store i32 [[B]], ptr [[B_ADDR]], align 4
+// ABORT-NEXT:    [[TMP0:%.*]] = load i32, ptr [[B_ADDR]], align 4
+// ABORT-NEXT:    [[TOBOOL:%.*]] = icmp ne i32 [[TMP0]], 0
+// ABORT-NEXT:    [[TMP1:%.*]] = zext i1 [[TOBOOL]] to i64
+// ABORT-NEXT:    [[COND:%.*]] = select i1 [[TOBOOL]], ptr @f, ptr @xf
+// ABORT-NEXT:    store ptr [[COND]], ptr [[FP]], align 8
+// ABORT-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[FP]], align 8
+// ABORT-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[TMP2]], metadata !"_ZTSFvE"), !nosanitize [[META10:![0-9]+]]
+// ABORT-NEXT:    br i1 [[TMP3]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF11:![0-9]+]], !nosanitize [[META10]]
+// ABORT:       [[HANDLER_CFI_CHECK_FAIL]]:
+// ABORT-NEXT:    [[TMP4:%.*]] = ptrtoint ptr [[TMP2]] to i64, !nosanitize [[META10]]
+// ABORT-NEXT:    call void @__ubsan_handle_cfi_check_fail_abort(ptr @anon.3d4044d65abdda407a92991f1300ec97.1, i64 [[TMP4]], i64 undef) #[[ATTR4:[0-9]+]], !nosanitize [[META10]]
+// ABORT-NEXT:    unreachable, !nosanitize [[META10]]
+// ABORT:       [[CONT]]:
+// ABORT-NEXT:    call void (...) [[TMP2]]()
+// ABORT-NEXT:    ret void
+//
+// RECOVER-LABEL: define hidden void @g(
+// RECOVER-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]] {
+// RECOVER-NEXT:  [[ENTRY:.*:]]
+// RECOVER-NEXT:    [[B_ADDR:%.*]] = alloca i32, align 4
+// RECOVER-NEXT:    [[FP:%.*]] = alloca ptr, align 8
+// RECOVER-NEXT:    store i32 [[B]], ptr [[B_ADDR]], align 4
+// RECOVER-NEXT:    [[TMP0:%.*]] = load i32, ptr [[B_ADDR]], align 4
+// RECOVER-NEXT:    [[TOBOOL:%.*]] = icmp ne i32 [[TMP0]], 0
+// RECOVER-NEXT:    [[TMP1:%.*]] = zext i1 [[TOBOOL]] to i64
+// RECOVER-NEXT:    [[COND:%.*]] = select i1 [[TOBOOL]], ptr @f, ptr @xf
+// RECOVER-NEXT:    store ptr [[COND]], ptr [[FP]], align 8
+// RECOVER-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[FP]], align 8
+// RECOVER-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[TMP2]], metadata !"_ZTSFvE"), !nosanitize [[META10:![0-9]+]]
+// RECOVER-NEXT:    br i1 [[TMP3]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF11:![0-9]+]], !nosanitize [[META10]]
+// RECOVER:       [[HANDLER_CFI_CHECK_FAIL]]:
+// RECOVER-NEXT:    [[TMP4:%.*]] = ptrtoint ptr [[TMP2]] to i64, !nosanitize [[META10]]
+// RECOVER-NEXT:    call void @__ubsan_handle_cfi_check_fail(ptr @anon.3d4044d65abdda407a92991f1300ec97.1, i64 [[TMP4]], i64 undef) #[[ATTR4:[0-9]+]], !nosanitize [[META10]]
+// RECOVER-NEXT:    br label %[[CONT]], !nosanitize [[META10]]
+// RECOVER:       [[CONT]]:
+// RECOVER-NEXT:    call void (...) [[TMP2]]()
+// RECOVER-NEXT:    ret void
+//
+// ABORT_MIN-LABEL: define hidden void @g(
+// ABORT_MIN-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]] {
+// ABORT_MIN-NEXT:  [[ENTRY:.*:]]
+// ABORT_MIN-NEXT:    [[B_ADDR:%.*]] = alloca i32, align 4
+// ABORT_MIN-NEXT:    [[FP:%.*]] = alloca ptr, align 8
+// ABORT_MIN-NEXT:    store i32 [[B]], ptr [[B_ADDR]], align 4
+// ABORT_MIN-NEXT:    [[TMP0:%.*]] = load i32, ptr [[B_ADDR]], align 4
+// ABORT_MIN-NEXT:    [[TOBOOL:%.*]] = icmp ne i32 [[TMP0]], 0
+// ABORT_MIN-NEXT:    [[TMP1:%.*]] = zext i1 [[TOBOOL]] to i64
+// ABORT_MIN-NEXT:    [[COND:%.*]] = select i1 [[TOBOOL]], ptr @f, ptr @xf
+// ABORT_MIN-NEXT:    store ptr [[COND]], ptr [[FP]], align 8
+// ABORT_MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[FP]], align 8
+// ABORT_MIN-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[TMP2]], metadata !"_ZTSFvE"), !nosanitize [[META10:![0-9]+]]
+// ABORT_MIN-NEXT:    br i1 [[TMP3]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF11:![0-9]+]], !nosanitize [[META10]]
+// ABORT_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
+// ABORT_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal_abort() #[[ATTR4:[0-9]+]], !nosanitize [[META10]]
+// ABORT_MIN-NEXT:    unreachable, !nosanitize [[META10]]
+// ABORT_MIN:       [[CONT]]:
+// ABORT_MIN-NEXT:    call void (...) [[TMP2]]()
+// ABORT_MIN-NEXT:    ret void
+//
+// RECOVER_MIN-LABEL: define hidden void @g(
+// RECOVER_MIN-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]] {
+// RECOVER_MIN-NEXT:  [[ENTRY:.*:]]
+// RECOVER_MIN-NEXT:    [[B_ADDR:%.*]] = alloca i32, align 4
+// RECOVER_MIN-NEXT:    [[FP:%.*]] = alloca ptr, align 8
+// RECOVER_MIN-NEXT:    store i32 [[B]], ptr [[B_ADDR]], align 4
+// RECOVER_MIN-NEXT:    [[TMP0:%.*]] = load i32, ptr [[B_ADDR]], align 4
+// RECOVER_MIN-NEXT:    [[TOBOOL:%.*]] = icmp ne i32 [[TMP0]], 0
+// RECOVER_MIN-NEXT:    [[TMP1:%.*]] = zext i1 [[TOBOOL]] to i64
+// RECOVER_MIN-NEXT:    [[COND:%.*]] = select i1 [[TOBOOL]], ptr @f, ptr @xf
+// RECOVER_MIN-NEXT:    store ptr [[COND]], ptr [[FP]], align 8
+// RECOVER_MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[FP]], align 8
+// RECOVER_MIN-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[TMP2]], metadata !"_ZTSFvE"), !nosanitize [[META10:![0-9]+]]
+// RECOVER_MIN-NEXT:    br i1 [[TMP3]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF11:![0-9]+]], !nosanitize [[META10]]
+// RECOVER_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
+// RECOVER_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR4:[0-9]+]], !nosanitize [[META10]]
+// RECOVER_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META10]]
+// RECOVER_MIN:       [[CONT]]:
+// RECOVER_MIN-NEXT:    call void (...) [[TMP2]]()
+// RECOVER_MIN-NEXT:    ret void
+//
+void g(int b) {
+  void (*fp)() = b ? f : xf;
+  fp();
+}
+//.
+// TRAP: [[META6]] = !{i64 0, !"_ZTSFvE"}
+// TRAP: [[META7]] = !{i64 0, !"_ZTSFvE.generalized"}
+// TRAP: [[META8]] = !{i64 0, !"_ZTSFviE"}
+// TRAP: [[META9]] = !{i64 0, !"_ZTSFviE.generalized"}
+// TRAP: [[META10]] = !{}
+// TRAP: [[PROF11]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// ABORT: [[META6]] = !{i64 0, !"_ZTSFvE"}
+// ABORT: [[META7]] = !{i64 0, !"_ZTSFvE.generalized"}
+// ABORT: [[META8]] = !{i64 0, !"_ZTSFviE"}
+// ABORT: [[META9]] = !{i64 0, !"_ZTSFviE.generalized"}
+// ABORT: [[META10]] = !{}
+// ABORT: [[PROF11]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// RECOVER: [[META6]] = !{i64 0, !"_ZTSFvE"}
+// RECOVER: [[META7]] = !{i64 0, !"_ZTSFvE.generalized"}
+// RECOVER: [[META8]] = !{i64 0, !"_ZTSFviE"}
+// RECOVER: [[META9]] = !{i64 0, !"_ZTSFviE.generalized"}
+// RECOVER: [[META10]] = !{}
+// RECOVER: [[PROF11]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// ABORT_MIN: [[META6]] = !{i64 0, !"_ZTSFvE"}
+// ABORT_MIN: [[META7]] = !{i64 0, !"_ZTSFvE.generalized"}
+// ABORT_MIN: [[META8]] = !{i64 0, !"_ZTSFviE"}
+// ABORT_MIN: [[META9]] = !{i64 0, !"_ZTSFviE.generalized"}
+// ABORT_MIN: [[META10]] = !{}
+// ABORT_MIN: [[PROF11]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// RECOVER_MIN: [[META6]] = !{i64 0, !"_ZTSFvE"}
+// RECOVER_MIN: [[META7]] = !{i64 0, !"_ZTSFvE.generalized"}
+// RECOVER_MIN: [[META8]] = !{i64 0, !"_ZTSFviE"}
+// RECOVER_MIN: [[META9]] = !{i64 0, !"_ZTSFviE.generalized"}
+// RECOVER_MIN: [[META10]] = !{}
+// RECOVER_MIN: [[PROF11]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
diff --git a/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp b/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp
new file mode 100644
index 0000000000000..3e9328ac0e3ca
--- /dev/null
+++ b/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp
@@ -0,0 +1,132 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5
+// RUN: %clang_cc1 -fsanitize=cfi-vcall -fsanitize-trap=cfi-vcall -flto -fvisibility=hidden -triple x86_64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=TRAP %s
+
+// RUN: %clang_cc1 -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -flto -fvisibility=hidden -triple x86_64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=ABORT %s
+
+// RUN: %clang_cc1 -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-recover=cfi-vcall -flto -fvisibility=hidden -triple x86_64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=RECOVER %s
+
+// RUN: %clang_cc1 -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-minimal-runtime -flto -fvisibility=hidden -triple x86_64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=ABORT_MIN %s
+
+// RUN: %clang_cc1 -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-recover=cfi-vcall -fsanitize-minimal-runtime -flto -fvisibility=hidden -triple x86_64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=RECOVER_MIN %s
+
+struct S1 {
+  virtual void f();
+};
+
+// TRAP-LABEL: define hidden void @_Z3s1fP2S1(
+// TRAP-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] {
+// TRAP-NEXT:  [[ENTRY:.*:]]
+// TRAP-NEXT:    [[S1_ADDR:%.*]] = alloca ptr, align 8
+// TRAP-NEXT:    store ptr [[S1]], ptr [[S1_ADDR]], align 8
+// TRAP-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S1_ADDR]], align 8
+// TRAP-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 8
+// TRAP-NEXT:    [[TMP1:%.*]] = call { ptr, i1 } @llvm.type.checked.load(ptr [[VTABLE]], i32 0, metadata !"_ZTS2S1"), !nosanitize [[META5:![0-9]+]]
+// TRAP-NEXT:    [[TMP2:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 1, !nosanitize [[META5]]
+// TRAP-NEXT:    br i1 [[TMP2]], label %[[CONT:.*]], label %[[TRAP:.*]], !prof [[PROF6:![0-9]+]], !nosanitize [[META5]]
+// TRAP:       [[TRAP]]:
+// TRAP-NEXT:    call void @llvm.ubsantrap(i8 2) #[[ATTR3:[0-9]+]], !nosanitize [[META5]]
+// TRAP-NEXT:    unreachable, !nosanitize [[META5]]
+// TRAP:       [[CONT]]:
+// TRAP-NEXT:    [[TMP3:%.*]] = extractvalue { ptr, i1 } [[TMP1]], 0, !nosanitize [[META5]]
+// TRAP-NEXT:    call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
+// TRAP-NEXT:    ret void
+//
+// ABORT-LABEL: define hidden void @_Z3s1fP2S1(
+// ABORT-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[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:       [[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:       [[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:    ret void
+//
+// RECOVER-LABEL: define hidden void @_Z3s1fP2S1(
+// RECOVER-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[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:       [[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:       [[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:    ret void
+//
+// ABORT_MIN-LABEL: define hidden void @_Z3s1fP2S1(
+// ABORT_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[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:    ret void
+//
+// RECOVER_MIN-LABEL: define hidden void @_Z3s1fP2S1(
+// RECOVER_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[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:    ret void
+//
+void s1f(S1 *s1) {
+  s1->f();
+}
+//.
+// TRAP: [[META5]] = !{}
+// TRAP: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// ABORT: [[META5]] = !{}
+// ABORT: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// RECOVER: [[META5]] = !{}
+// RECOVER: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// ABORT_MIN: [[META5]] = !{}
+// ABORT_MIN: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// RECOVER_MIN: [[META5]] = !{}
+// RECOVER_MIN: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
+//.

@vitalybuka vitalybuka requested review from fmayer, pcc and thurstond April 24, 2025 18:21
thurstond
thurstond reviewed Apr 24, 2025
View reviewed changes
@vitalybuka vitalybuka merged commit 73ddbd3 into main Apr 24, 2025
11 of 13 checks passed
@vitalybuka vitalybuka deleted the users/vitalybuka/spr/nfccfi-add-tests-for-different-reporting-settings branch April 24, 2025 19:29
@vitalybuka vitalybuka mentioned this pull request Apr 24, 2025
Merged
IanWood1 pushed a commit to IanWood1/llvm-project that referenced this pull request May 6, 2025
@vitalybuka @IanWood1
[NFC][CFI] Add tests for different reporting settings (llvm#137225)
b4bf345 
1. Trap
2. Abort from runtime
3. Recover from runtime
4. Abort from minimal runtime
5. Recover from minimal runtime

They already work as expected.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thurstond thurstond thurstond left review comments

@fmayer fmayer fmayer approved these changes

@pcc pcc Awaiting requested review from pcc

Assignees

No one assigned

Labels

clang Clang issues not falling into any other category

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@vitalybuka @llvmbot @fmayer @thurstond