0d15d46362
https://github.com/llvm/llvm-project/pull/65972 (continuation of https://reviews.llvm.org/D148654) had considered adding nomerge to ubsantrap, but did not proceed with that because of https://github.com/llvm/llvm-project/issues/53011. Instead, it added a counter (based on TrapBB->getParent()->size()) to each ubsantrap call. However, this counter is not guaranteed to be unique after inlining, as shown by https://github.com/llvm/llvm-project/pull/83470, which can result in ubsantraps being merged by the backend. https://github.com/llvm/llvm-project/pull/101549 has since fixed the nomerge limitation ("It sets nomerge flag for the node if the instruction has nomerge arrtibute."). This patch therefore takes advantage of nomerge instead of using the counter, guaranteeing that the ubsantraps are not merged. This patch is equivalent to https://github.com/llvm/llvm-project/pull/83470 but also adds nomerge and updates tests (https://github.com/llvm/llvm-project/pull/117649: ubsan-trap-merge.c; https://github.com/llvm/llvm-project/pull/117657: ubsan-trap-merge.ll, ubsan-trap-nomerge.ll; catch-undef-behavior.c).
93 lines
2.4 KiB
C
93 lines
2.4 KiB
C
// RUN: %clang_cc1 -fsanitize=local-bounds -emit-llvm -triple x86_64-apple-darwin10 %s -o - | FileCheck %s
|
|
// RUN: %clang_cc1 -fsanitize=array-bounds -O -fsanitize-trap=array-bounds -emit-llvm -triple x86_64-apple-darwin10 -DNO_DYNAMIC %s -o - | FileCheck %s
|
|
// RUN: %clang_cc1 -fsanitize=local-bounds -fsanitize-trap=local-bounds -O3 -mllvm -bounds-checking-unique-traps -emit-llvm -triple x86_64-apple-darwin10 %s -o - | FileCheck %s --check-prefixes=NOOPTLOCAL
|
|
// RUN: %clang_cc1 -fsanitize=array-bounds -fsanitize-trap=array-bounds -O3 -mllvm -ubsan-unique-traps -emit-llvm -triple x86_64-apple-darwin10 %s -o - | FileCheck %s --check-prefixes=NOOPTARRAY
|
|
//
|
|
// REQUIRES: x86-registered-target
|
|
|
|
// CHECK-LABEL: @f1
|
|
double f1(int b, int i) {
|
|
double a[b];
|
|
// CHECK: call {{.*}} @llvm.{{(ubsan)?trap}}
|
|
return a[i];
|
|
}
|
|
|
|
// CHECK-LABEL: @f2
|
|
void f2(void) {
|
|
// everything is constant; no trap possible
|
|
// CHECK-NOT: call {{.*}} @llvm.{{(ubsan)?trap}}
|
|
int a[2];
|
|
a[1] = 42;
|
|
|
|
#ifndef NO_DYNAMIC
|
|
extern void *malloc(__typeof__(sizeof(0)));
|
|
short *b = malloc(64);
|
|
b[5] = *a + a[1] + 2;
|
|
#endif
|
|
}
|
|
|
|
// CHECK-LABEL: @f3
|
|
void f3(void) {
|
|
int a[1];
|
|
// CHECK: call {{.*}} @llvm.{{(ubsan)?trap}}
|
|
a[2] = 1;
|
|
}
|
|
|
|
// CHECK-LABEL: @f4
|
|
__attribute__((no_sanitize("bounds")))
|
|
int f4(int i) {
|
|
int b[64];
|
|
// CHECK-NOT: call void @llvm.trap()
|
|
// CHECK-NOT: trap:
|
|
// CHECK-NOT: cont:
|
|
return b[i];
|
|
}
|
|
|
|
// Union flexible-array memebers are a C99 extension. All array members with a
|
|
// constant size should be considered FAMs.
|
|
|
|
union U { int a[0]; int b[1]; int c[2]; };
|
|
|
|
// CHECK-LABEL: @f5
|
|
int f5(union U *u, int i) {
|
|
// a is treated as a flexible array member.
|
|
// CHECK-NOT: @llvm.ubsantrap
|
|
return u->a[i];
|
|
}
|
|
|
|
// CHECK-LABEL: @f6
|
|
int f6(union U *u, int i) {
|
|
// b is treated as a flexible array member.
|
|
// CHECK-NOT: call {{.*}} @llvm.{{(ubsan)?trap}}
|
|
return u->b[i];
|
|
}
|
|
|
|
// CHECK-LABEL: @f7
|
|
int f7(union U *u, int i) {
|
|
// c is treated as a flexible array member.
|
|
// CHECK-NOT: @llvm.ubsantrap
|
|
return u->c[i];
|
|
}
|
|
|
|
char B[10];
|
|
char B2[10];
|
|
// CHECK-LABEL: @f8
|
|
void f8(int i, int k) {
|
|
// NOOPTLOCAL: call void @llvm.ubsantrap(i8 3)
|
|
// NOOPTARRAY: call void @llvm.ubsantrap(i8 18)
|
|
B[i] = '\0';
|
|
|
|
// NOOPTLOCAL: call void @llvm.ubsantrap(i8 5)
|
|
// NOOPTARRAY: call void @llvm.ubsantrap(i8 18)
|
|
B2[k] = '\0';
|
|
}
|
|
|
|
// See commit 9a954c6 that caused a SEGFAULT in this code.
|
|
struct S {
|
|
__builtin_va_list ap;
|
|
} *s;
|
|
// CHECK-LABEL: @f9
|
|
struct S *f9(int i) {
|
|
return &s[i];
|
|
}
|