Skip to content

[cfi][test] use more robust test patterns #165982

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[cfi][test] use more robust test patterns #165982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler-rt/test/cfi/anon-namespace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ int main() {
A *a = mkb();
break_optimization(a);

// CFI: 1
// NCFI: 1
// CFI: {{^1$}}
// NCFI: {{^1$}}
fprintf(stderr, "1\n");

// CFI-DIAG: runtime error: control flow integrity check for type '(anonymous namespace)::B' failed during base-to-derived cast
Expand Down
4 changes: 2 additions & 2 deletions compiler-rt/test/cfi/bad-cast.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ int main(int argc, char **argv) {
B *b = new B;
break_optimization(b);

// FAIL: 1
// PASS: 1
// FAIL: {{^1$}}
// PASS: {{^1$}}
fprintf(stderr, "1\n");

A a;
Expand Down
4 changes: 2 additions & 2 deletions compiler-rt/test/cfi/base-derived-destructor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ class B : public A<B> {
};

int main() {
// CFI: 1
// NCFI: 1
// CFI: {{^1$}}
// NCFI: {{^1$}}
fprintf(stderr, "1\n");

// CFI-DIAG: runtime error: control flow integrity check for type 'B' failed during base-to-derived cast
Expand Down
8 changes: 4 additions & 4 deletions compiler-rt/test/cfi/icall/bad-signature.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ void f() {
}

int main() {
// CFI: 1
// NCFI: 1
// CFI: {{^1$}}
// NCFI: {{^1$}}
fprintf(stderr, "1\n");

// CFI-DIAG: runtime error: control flow integrity check for type 'void (int)' failed during indirect function call
// CFI-DIAG: f defined here
((void (*)(int))f)(42); // UB here

// CFI-NOT: 2
// NCFI: 2
// CFI-NOT: {{^2$}}
// NCFI: {{^2$}}
fprintf(stderr, "2\n");
}
4 changes: 2 additions & 2 deletions compiler-rt/test/cfi/icall/external-call.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <math.h>

int main(int argc, char **argv) {
// CFI: 1
// CFI: {{^1$}}
fprintf(stderr, "1\n");

double (*fn)(double);
Expand All @@ -23,6 +23,6 @@ int main(int argc, char **argv) {

fn(atof(argv[2]));

// CFI: 2
// CFI: {{^2$}}
fprintf(stderr, "2\n");
}
4 changes: 2 additions & 2 deletions compiler-rt/test/cfi/icall/wrong-signature-mixed-lto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ int f() {
void f();

int main() {
// CFI: 1
// CFI: {{^1$}}
fprintf(stderr, "1\n");

void (*volatile p)() = &f;
p();

// CFI-NOT: 2
// CFI-NOT: {{^2$}}
fprintf(stderr, "2\n");
}
#endif
4 changes: 2 additions & 2 deletions compiler-rt/test/cfi/multiple-inheritance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ int main(int argc, char **argv) {
C *c = new C;
break_optimization(c);

// CFI: 1
// NCFI: 1
// CFI: {{^1$}}
// NCFI: {{^1$}}
fprintf(stderr, "1\n");

if (argc > 1) {
Expand Down
4 changes: 2 additions & 2 deletions compiler-rt/test/cfi/nvcall.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ int main() {
A *a = new A;
break_optimization(a);

// CFI: 1
// NCFI: 1
// CFI: {{^1$}}
// NCFI: {{^1$}}
fprintf(stderr, "1\n");

// CFI-DIAG: runtime error: control flow integrity check for type 'B' failed during non-virtual call
Expand Down
4 changes: 2 additions & 2 deletions compiler-rt/test/cfi/overwrite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ int main() {
*((void **)a) = fake_vtable + 2; // UB here
break_optimization(a);

// CFI: 1
// NCFI: 1
// CFI: {{^1$}}
// NCFI: {{^1$}}
fprintf(stderr, "1\n");

// CFI-NOT: foo
Expand Down
8 changes: 4 additions & 4 deletions compiler-rt/test/cfi/sibling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ int main() {
B *b = new B;
break_optimization(b);

// CFI: 1
// NCFI: 1
// CFI: {{^1$}}
// NCFI: {{^1$}}
fprintf(stderr, "1\n");

((C *)b)->f(); // UB here

// CFI-NOT: 2
// NCFI: 2
// CFI-NOT: {{^2$}}
// NCFI: {{^2$}}
fprintf(stderr, "2\n");
}
4 changes: 2 additions & 2 deletions compiler-rt/test/cfi/simple-fail.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ int main() {
A *a = new A;
break_optimization(a);

// CFI: 1
// NCFI: 1
// CFI: {{^1$}}
// NCFI: {{^1$}}
fprintf(stderr, "1\n");

// CFI-DIAG: runtime error: control flow integrity check for type 'B' failed during cast to unrelated type
Expand Down
4 changes: 2 additions & 2 deletions compiler-rt/test/cfi/vdtor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ int main() {
A *a = new A;
break_optimization(a);

// CFI: 1
// NCFI: 1
// CFI: {{^1$}}
// NCFI: {{^1$}}
fprintf(stderr, "1\n");

// CFI-DIAG: runtime error: control flow integrity check for type 'B' failed during virtual call
Expand Down