Skip to content

Commit 44c8a01

Browse files
fmayerfmayer
authored
[compiler-rt] [UBSan] remove unneeded test cases (#169594)
the target handling will be done in the driver, so removing codegen tests.
1 parent d889b97 commit 44c8a01

File tree

2 files changed

+0
-59
lines changed

2 files changed

+0
-59
lines changed

‎clang/test/CodeGen/cfi-icall-trap-recover-runtime.c‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
// 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
1313

14-
// 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
15-
1614
// 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
1715

1816

@@ -46,11 +44,6 @@
4644
// PRESERVE_MIN-NEXT: [[ENTRY:.*:]]
4745
// PRESERVE_MIN-NEXT: ret void
4846
//
49-
// RECOVER_MIN_I386-LABEL: define hidden void @f(
50-
// RECOVER_MIN_I386-SAME: ) #[[ATTR0:[0-9]+]] !type [[META10:![0-9]+]] !type [[META11:![0-9]+]] {
51-
// RECOVER_MIN_I386-NEXT: [[ENTRY:.*:]]
52-
// RECOVER_MIN_I386-NEXT: ret void
53-
//
5447
void f() {
5548
}
5649

@@ -184,27 +177,6 @@ void xf();
184177
// PRESERVE_MIN-NEXT: call void (...) [[TMP2]]()
185178
// PRESERVE_MIN-NEXT: ret void
186179
//
187-
// RECOVER_MIN_I386-LABEL: define hidden void @g(
188-
// RECOVER_MIN_I386-SAME: i32 noundef signext [[B:%.*]]) #[[ATTR0]] !type [[META12:![0-9]+]] !type [[META13:![0-9]+]] {
189-
// RECOVER_MIN_I386-NEXT: [[ENTRY:.*:]]
190-
// RECOVER_MIN_I386-NEXT: [[B_ADDR:%.*]] = alloca i32, align 4
191-
// RECOVER_MIN_I386-NEXT: [[FP:%.*]] = alloca ptr, align 8
192-
// RECOVER_MIN_I386-NEXT: store i32 [[B]], ptr [[B_ADDR]], align 4
193-
// RECOVER_MIN_I386-NEXT: [[TMP0:%.*]] = load i32, ptr [[B_ADDR]], align 4
194-
// RECOVER_MIN_I386-NEXT: [[TOBOOL:%.*]] = icmp ne i32 [[TMP0]], 0
195-
// RECOVER_MIN_I386-NEXT: [[TMP1:%.*]] = zext i1 [[TOBOOL]] to i64
196-
// RECOVER_MIN_I386-NEXT: [[COND:%.*]] = select i1 [[TOBOOL]], ptr @f, ptr @xf
197-
// RECOVER_MIN_I386-NEXT: store ptr [[COND]], ptr [[FP]], align 8
198-
// RECOVER_MIN_I386-NEXT: [[TMP2:%.*]] = load ptr, ptr [[FP]], align 8
199-
// RECOVER_MIN_I386-NEXT: [[TMP3:%.*]] = call i1 @llvm.type.test(ptr [[TMP2]], metadata !"_ZTSFvE"), !nosanitize [[META14:![0-9]+]]
200-
// RECOVER_MIN_I386-NEXT: br i1 [[TMP3]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF15:![0-9]+]], !nosanitize [[META14]]
201-
// RECOVER_MIN_I386: [[HANDLER_CFI_CHECK_FAIL]]:
202-
// RECOVER_MIN_I386-NEXT: call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR4:[0-9]+]], !nosanitize [[META14]]
203-
// RECOVER_MIN_I386-NEXT: br label %[[CONT]], !nosanitize [[META14]]
204-
// RECOVER_MIN_I386: [[CONT]]:
205-
// RECOVER_MIN_I386-NEXT: call void [[TMP2]]()
206-
// RECOVER_MIN_I386-NEXT: ret void
207-
//
208180
void g(int b) {
209181
void (*fp)() = b ? f : xf;
210182
fp();
@@ -252,10 +224,3 @@ void g(int b) {
252224
// PRESERVE_MIN: [[META10]] = !{}
253225
// PRESERVE_MIN: [[PROF11]] = !{!"branch_weights", i32 1048575, i32 1}
254226
//.
255-
// RECOVER_MIN_I386: [[META10]] = !{i64 0, !"_ZTSFvE"}
256-
// RECOVER_MIN_I386: [[META11]] = !{i64 0, !"_ZTSFvE.generalized"}
257-
// RECOVER_MIN_I386: [[META12]] = !{i64 0, !"_ZTSFviE"}
258-
// RECOVER_MIN_I386: [[META13]] = !{i64 0, !"_ZTSFviE.generalized"}
259-
// RECOVER_MIN_I386: [[META14]] = !{}
260-
// RECOVER_MIN_I386: [[PROF15]] = !{!"branch_weights", i32 1048575, i32 1}
261-
//.

‎clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
// 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
1313

14-
// 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
15-
1614
// 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
1715

1816

@@ -137,25 +135,6 @@ struct S1 {
137135
// PRESERVE_MIN-NEXT: call void [[TMP3]](ptr noundef nonnull align 8 dereferenceable(8) [[TMP0]])
138136
// PRESERVE_MIN-NEXT: ret void
139137
//
140-
// RECOVER_MIN_I386-LABEL: define hidden void @_Z3s1fP2S1(
141-
// RECOVER_MIN_I386-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] {
142-
// RECOVER_MIN_I386-NEXT: [[ENTRY:.*:]]
143-
// RECOVER_MIN_I386-NEXT: [[S1_ADDR:%.*]] = alloca ptr, align 4
144-
// RECOVER_MIN_I386-NEXT: store ptr [[S1]], ptr [[S1_ADDR]], align 4
145-
// RECOVER_MIN_I386-NEXT: [[TMP0:%.*]] = load ptr, ptr [[S1_ADDR]], align 4
146-
// RECOVER_MIN_I386-NEXT: [[VTABLE:%.*]] = load ptr, ptr [[TMP0]], align 4
147-
// RECOVER_MIN_I386-NEXT: [[TMP1:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"_ZTS2S1"), !nosanitize [[META6:![0-9]+]]
148-
// RECOVER_MIN_I386-NEXT: [[TMP2:%.*]] = call i1 @llvm.type.test(ptr [[VTABLE]], metadata !"all-vtables"), !nosanitize [[META6]]
149-
// RECOVER_MIN_I386-NEXT: br i1 [[TMP1]], label %[[CONT:.*]], label %[[HANDLER_CFI_CHECK_FAIL:.*]], !prof [[PROF7:![0-9]+]], !nosanitize [[META6]]
150-
// RECOVER_MIN_I386: [[HANDLER_CFI_CHECK_FAIL]]:
151-
// RECOVER_MIN_I386-NEXT: call void @__ubsan_handle_cfi_check_fail_minimal() #[[ATTR3:[0-9]+]], !nosanitize [[META6]]
152-
// RECOVER_MIN_I386-NEXT: br label %[[CONT]], !nosanitize [[META6]]
153-
// RECOVER_MIN_I386: [[CONT]]:
154-
// RECOVER_MIN_I386-NEXT: [[VFN:%.*]] = getelementptr inbounds ptr, ptr [[VTABLE]], i64 0
155-
// RECOVER_MIN_I386-NEXT: [[TMP3:%.*]] = load ptr, ptr [[VFN]], align 4
156-
// RECOVER_MIN_I386-NEXT: call void [[TMP3]](ptr noundef nonnull align 4 dereferenceable(4) [[TMP0]])
157-
// RECOVER_MIN_I386-NEXT: ret void
158-
//
159138
void s1f(S1 *s1) {
160139
s1->f();
161140
}
@@ -178,6 +157,3 @@ void s1f(S1 *s1) {
178157
// PRESERVE_MIN: [[META5]] = !{}
179158
// PRESERVE_MIN: [[PROF6]] = !{!"branch_weights", i32 1048575, i32 1}
180159
//.
181-
// RECOVER_MIN_I386: [[META6]] = !{}
182-
// RECOVER_MIN_I386: [[PROF7]] = !{!"branch_weights", i32 1048575, i32 1}
183-
//.

0 commit comments

Comments
 (0)