https://github.com/fmayer created https://github.com/llvm/llvm-project/pull/169594
the target handling will be done in the driver, so removing codegen tests. >From db729584bd26defd5c07c4bc899f0b0ca7fd886b Mon Sep 17 00:00:00 2001 From: Florian Mayer <[email protected]> Date: Tue, 25 Nov 2025 18:09:34 -0800 Subject: [PATCH] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20initia?= =?UTF-8?q?l=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.7 --- .../CodeGen/cfi-icall-trap-recover-runtime.c | 35 ------------------- .../cfi-vcall-trap-recover-runtime.cpp | 24 ------------- 2 files changed, 59 deletions(-) diff --git a/clang/test/CodeGen/cfi-icall-trap-recover-runtime.c b/clang/test/CodeGen/cfi-icall-trap-recover-runtime.c index 1fb8d489e4a3b..9fbb1221ab39a 100644 --- a/clang/test/CodeGen/cfi-icall-trap-recover-runtime.c +++ b/clang/test/CodeGen/cfi-icall-trap-recover-runtime.c @@ -11,8 +11,6 @@ // 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 @@ -46,11 +44,6 @@ // 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() { } @@ -184,27 +177,6 @@ void xf(); // 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(); @@ -252,10 +224,3 @@ void g(int b) { // 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 f6d9e6f6dd079..0130d9e33cd9d 100644 --- a/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp +++ b/clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp @@ -11,8 +11,6 @@ // 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 @@ -137,25 +135,6 @@ struct S1 { // 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(); } @@ -178,6 +157,3 @@ void s1f(S1 *s1) { // 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} -//. _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
