Skip to content

Conversation

@fmayer
Copy link
Contributor

@fmayer fmayer commented Nov 25, 2025

No description provided.

Created using spr 1.3.7
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Nov 25, 2025
@llvmbot
Copy link
Member

llvmbot commented Nov 25, 2025

@llvm/pr-subscribers-clang

Author: Florian Mayer (fmayer)

Changes

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

2 Files Affected:

  • (modified) clang/test/CodeGen/cfi-icall-trap-recover-runtime.c (+73)
  • (modified) clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp (+51)
diff --git a/clang/test/CodeGen/cfi-icall-trap-recover-runtime.c b/clang/test/CodeGen/cfi-icall-trap-recover-runtime.c
index 117672a9d4368..1fb8d489e4a3b 100644
--- a/clang/test/CodeGen/cfi-icall-trap-recover-runtime.c
+++ b/clang/test/CodeGen/cfi-icall-trap-recover-runtime.c
@@ -9,6 +9,13 @@
 
 // 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
 
+// RUN: %clang_cc1 -fsanitize=cfi-icall -fno-sanitize-trap=cfi-icall -fsanitize-recover=cfi-icall -fsanitize-minimal-runtime -fsanitize-handler-preserve-all-regs -flto -fvisibility=hidden -triple x86_64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=PRESERVE_MIN %s
+
+// RUN: %clang_cc1 -fsanitize=cfi-icall -fno-sanitize-trap=cfi-icall -fsanitize-recover=cfi-icall -fsanitize-minimal-runtime -fsanitize-handler-preserve-all-regs -flto -fvisibility=hidden -triple riscv64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=RECOVER_MIN_I386 %s
+
+// RUN: %clang_cc1 -fsanitize=cfi-icall -fno-sanitize-trap=cfi-icall -fsanitize-minimal-runtime -fsanitize-handler-preserve-all-regs -flto -fvisibility=hidden -triple x86_64-unknown-linux -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=ABORT_MIN %s
+
+
 // TRAP-LABEL: define hidden void @f(
 // TRAP-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
 // TRAP-NEXT:  [[ENTRY:.*:]]
@@ -34,6 +41,16 @@
 // RECOVER_MIN-NEXT:  [[ENTRY:.*:]]
 // RECOVER_MIN-NEXT:    ret void
 //
+// PRESERVE_MIN-LABEL: define hidden void @f(
+// PRESERVE_MIN-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
+// PRESERVE_MIN-NEXT:  [[ENTRY:.*:]]
+// PRESERVE_MIN-NEXT:    ret void
+//
+// RECOVER_MIN_I386-LABEL: define hidden void @f(
+// RECOVER_MIN_I386-SAME: ) #[[ATTR0:[0-9]+]] !type [[META10:![0-9]+]] !type [[META11:![0-9]+]] {
+// RECOVER_MIN_I386-NEXT:  [[ENTRY:.*:]]
+// RECOVER_MIN_I386-NEXT:    ret void
+//
 void f() {
 }
 
@@ -146,6 +163,48 @@ void xf();
 // RECOVER_MIN-NEXT:    call void (...) [[TMP2]]()
 // RECOVER_MIN-NEXT:    ret void
 //
+// PRESERVE_MIN-LABEL: define hidden void @g(
+// PRESERVE_MIN-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]] {
+// PRESERVE_MIN-NEXT:  [[ENTRY:.*:]]
+// PRESERVE_MIN-NEXT:    [[B_ADDR:%.*]] = alloca i32, align 4
+// PRESERVE_MIN-NEXT:    [[FP:%.*]] = alloca ptr, align 8
+// PRESERVE_MIN-NEXT:    store i32 [[B]], ptr [[B_ADDR]], align 4
+// PRESERVE_MIN-NEXT:    [[TMP0:%.*]] = load i32, ptr [[B_ADDR]], align 4
+// PRESERVE_MIN-NEXT:    [[TOBOOL:%.*]] = icmp ne i32 [[TMP0]], 0
+// PRESERVE_MIN-NEXT:    [[TMP1:%.*]] = zext i1 [[TOBOOL]] to i64
+// PRESERVE_MIN-NEXT:    [[COND:%.*]] = select i1 [[TOBOOL]], ptr @f, ptr @xf
+// PRESERVE_MIN-NEXT:    store ptr [[COND]], ptr [[FP]], align 8
+// PRESERVE_MIN-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[FP]], align 8
+// PRESERVE_MIN-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[TMP2]], metadata !"_ZTSFvE"), !nosanitize [[META10:![0-9]+]]
+// PRESERVE_MIN-NEXT:    br i1 [[TMP3]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF11:![0-9]+]], !nosanitize [[META10]]
+// PRESERVE_MIN:       [[HANDLER_CFI_CHECK_FAIL]]:
+// PRESERVE_MIN-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR4:[0-9]+]], !nosanitize [[META10]]
+// PRESERVE_MIN-NEXT:    br label %[[CONT]], !nosanitize [[META10]]
+// PRESERVE_MIN:       [[CONT]]:
+// PRESERVE_MIN-NEXT:    call void (...) [[TMP2]]()
+// PRESERVE_MIN-NEXT:    ret void
+//
+// RECOVER_MIN_I386-LABEL: define hidden void @g(
+// RECOVER_MIN_I386-SAME: i32 noundef signext [[B:%.*]]) #[[ATTR0]] !type [[META12:![0-9]+]] !type [[META13:![0-9]+]] {
+// RECOVER_MIN_I386-NEXT:  [[ENTRY:.*:]]
+// RECOVER_MIN_I386-NEXT:    [[B_ADDR:%.*]] = alloca i32, align 4
+// RECOVER_MIN_I386-NEXT:    [[FP:%.*]] = alloca ptr, align 8
+// RECOVER_MIN_I386-NEXT:    store i32 [[B]], ptr [[B_ADDR]], align 4
+// RECOVER_MIN_I386-NEXT:    [[TMP0:%.*]] = load i32, ptr [[B_ADDR]], align 4
+// RECOVER_MIN_I386-NEXT:    [[TOBOOL:%.*]] = icmp ne i32 [[TMP0]], 0
+// RECOVER_MIN_I386-NEXT:    [[TMP1:%.*]] = zext i1 [[TOBOOL]] to i64
+// RECOVER_MIN_I386-NEXT:    [[COND:%.*]] = select i1 [[TOBOOL]], ptr @f, ptr @xf
+// RECOVER_MIN_I386-NEXT:    store ptr [[COND]], ptr [[FP]], align 8
+// RECOVER_MIN_I386-NEXT:    [[TMP2:%.*]] = load ptr, ptr [[FP]], align 8
+// RECOVER_MIN_I386-NEXT:    [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[TMP2]], metadata !"_ZTSFvE"), !nosanitize [[META14:![0-9]+]]
+// RECOVER_MIN_I386-NEXT:    br i1 [[TMP3]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF15:![0-9]+]], !nosanitize [[META14]]
+// RECOVER_MIN_I386:       [[HANDLER_CFI_CHECK_FAIL]]:
+// RECOVER_MIN_I386-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR4:[0-9]+]], !nosanitize [[META14]]
+// RECOVER_MIN_I386-NEXT:    br label %[[CONT]], !nosanitize [[META14]]
+// RECOVER_MIN_I386:       [[CONT]]:
+// RECOVER_MIN_I386-NEXT:    call void [[TMP2]]()
+// RECOVER_MIN_I386-NEXT:    ret void
+//
 void g(int b) {
   void (*fp)() = b ? f : xf;
   fp();
@@ -186,3 +245,17 @@ void g(int b) {
 // RECOVER_MIN: [[META10]] = !{}
 // RECOVER_MIN: [[PROF11]] = !{!"branch_weights", i32 1048575, i32 1}
 //.
+// PRESERVE_MIN: [[META6]] = !{i64 0, !"_ZTSFvE"}
+// PRESERVE_MIN: [[META7]] = !{i64 0, !"_ZTSFvE.generalized"}
+// PRESERVE_MIN: [[META8]] = !{i64 0, !"_ZTSFviE"}
+// PRESERVE_MIN: [[META9]] = !{i64 0, !"_ZTSFviE.generalized"}
+// PRESERVE_MIN: [[META10]] = !{}
+// PRESERVE_MIN: [[PROF11]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// RECOVER_MIN_I386: [[META10]] = !{i64 0, !"_ZTSFvE"}
+// RECOVER_MIN_I386: [[META11]] = !{i64 0, !"_ZTSFvE.generalized"}
+// RECOVER_MIN_I386: [[META12]] = !{i64 0, !"_ZTSFviE"}
+// RECOVER_MIN_I386: [[META13]] = !{i64 0, !"_ZTSFviE.generalized"}
+// RECOVER_MIN_I386: [[META14]] = !{}
+// RECOVER_MIN_I386: [[PROF15]] = !{!"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
index 3e9328ac0e3ca..f6d9e6f6dd079 100644
--- a/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp
+++ b/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp
@@ -9,6 +9,13 @@
 
 // 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
 
+// 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 -fsanitize-handler-preserve-all-regs -emit-llvm -o - %s | FileCheck --check-prefix=PRESERVE_MIN %s
+
+// RUN: %clang_cc1 -fsanitize=cfi-vcall -fno-sanitize-trap=cfi-vcall -fsanitize-recover=cfi-vcall -fsanitize-minimal-runtime -flto -fvisibility=hidden -triple i386-unknown-linux -fwhole-program-vtables -fsanitize-handler-preserve-all-regs -emit-llvm -o - %s | FileCheck --check-prefix=RECOVER_MIN_I386 %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 -fsanitize-handler-preserve-all-regs -emit-llvm -o - %s | FileCheck --check-prefix=ABORT_MIN %s
+
+
 struct S1 {
   virtual void f();
 };
@@ -111,6 +118,44 @@ struct S1 {
 // 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(
+// PRESERVE_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[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 void @__ubsan_handle_cfi_check_fail_minimal() #[[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:    ret void
+//
+// RECOVER_MIN_I386-LABEL: define hidden void @_Z3s1fP2S1(
+// RECOVER_MIN_I386-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] {
+// RECOVER_MIN_I386-NEXT:  [[ENTRY:.*:]]
+// RECOVER_MIN_I386-NEXT:    [[S1_ADDR:%.*]] = alloca ptr, align 4
+// RECOVER_MIN_I386-NEXT:    store ptr [[S1]], ptr [[S1_ADDR]], align 4
+// RECOVER_MIN_I386-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[S1_ADDR]], align 4
+// RECOVER_MIN_I386-NEXT:    [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 4
+// RECOVER_MIN_I386-NEXT:    [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS2S1"), !nosanitize [[META6:![0-9]+]]
+// RECOVER_MIN_I386-NEXT:    [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META6]]
+// RECOVER_MIN_I386-NEXT:    br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF7:![0-9]+]], !nosanitize [[META6]]
+// RECOVER_MIN_I386:       [[HANDLER_CFI_CHECK_FAIL]]:
+// RECOVER_MIN_I386-NEXT:    call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR3:[0-9]+]], !nosanitize [[META6]]
+// RECOVER_MIN_I386-NEXT:    br label %[[CONT]], !nosanitize [[META6]]
+// RECOVER_MIN_I386:       [[CONT]]:
+// RECOVER_MIN_I386-NEXT:    [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
+// RECOVER_MIN_I386-NEXT:    [[TMP3:%.*]] = load ptr, ptr [[VFN]], align 4
+// RECOVER_MIN_I386-NEXT:    call void [[TMP3]](ptr noundef nonnull align 4 dereferenceable(4) [[TMP0]])
+// RECOVER_MIN_I386-NEXT:    ret void
+//
 void s1f(S1 *s1) {
   s1->f();
 }
@@ -130,3 +175,9 @@ void s1f(S1 *s1) {
 // RECOVER_MIN: [[META5]] = !{}
 // RECOVER_MIN: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
 //.
+// PRESERVE_MIN: [[META5]] = !{}
+// PRESERVE_MIN: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
+//.
+// RECOVER_MIN_I386: [[META6]] = !{}
+// RECOVER_MIN_I386: [[PROF7]] = !{!"branch_weights", i32 1048575, i32 1}
+//.

@fmayer fmayer requested a review from vitalybuka November 25, 2025 22:56
@fmayer fmayer merged commit 1c034a3 into main Nov 25, 2025
10 of 11 checks passed
@fmayer fmayer deleted the users/fmayer/spr/compiler-rt-ubsan-precommit-test branch November 25, 2025 23:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clang Clang issues not falling into any other category

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants