Skip to content

Commit

Permalink
Auto merge of #115734 - tmiasko:kcfi-no-core, r=compiler-errors
Browse files Browse the repository at this point in the history
Use no_core for KCFI tests to exercise them in CI
  • Loading branch information
bors committed Sep 20, 2023
2 parents 4b91288 + ce19bc3 commit 0e11725
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 6 deletions.
13 changes: 12 additions & 1 deletion tests/codegen/sanitizer/kcfi-add-kcfi-flag.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
// Verifies that "kcfi" module flag is added.
//
// needs-sanitizer-kcfi
// revisions: aarch64 x86_64
// [aarch64] compile-flags: --target aarch64-unknown-none
// [aarch64] needs-llvm-components: aarch64
// [x86_64] compile-flags: --target x86_64-unknown-none
// [x86_64] needs-llvm-components: x86
// compile-flags: -Ctarget-feature=-crt-static -Zsanitizer=kcfi

#![feature(no_core, lang_items)]
#![crate_type="lib"]
#![no_core]

#[lang="sized"]
trait Sized { }
#[lang="copy"]
trait Copy { }

pub fn foo() {
}
Expand Down
21 changes: 16 additions & 5 deletions tests/ui/sanitize/cfg.rs
Original file line number Diff line number Diff line change
@@ -1,23 +1,30 @@
// Verifies that when compiling with -Zsanitizer=option,
// the `#[cfg(sanitize = "option")]` attribute is configured.

// needs-sanitizer-support
// check-pass
// revisions: address cfi kcfi leak memory thread
//[address]needs-sanitizer-address
//[address]compile-flags: -Zsanitizer=address --cfg address
//[cfi]needs-sanitizer-cfi
//[cfi]compile-flags: -Zsanitizer=cfi --cfg cfi -Clto
//[kcfi]needs-sanitizer-kcfi
//[kcfi]compile-flags: -Zsanitizer=kcfi --cfg kcfi
//[cfi]compile-flags: -Zsanitizer=cfi --cfg cfi
//[cfi]compile-flags: -Clto -Ccodegen-units=1 -Ctarget-feature=-crt-static
//[kcfi]needs-llvm-components: x86
//[kcfi]compile-flags: -Zsanitizer=kcfi --cfg kcfi --target x86_64-unknown-none
//[leak]needs-sanitizer-leak
//[leak]compile-flags: -Zsanitizer=leak --cfg leak
//[memory]needs-sanitizer-memory
//[memory]compile-flags: -Zsanitizer=memory --cfg memory
//[thread]needs-sanitizer-thread
//[thread]compile-flags: -Zsanitizer=thread --cfg thread

#![feature(cfg_sanitize)]
#![feature(cfg_sanitize, no_core, lang_items)]
#![crate_type="lib"]
#![no_core]

#[lang="sized"]
trait Sized { }
#[lang="copy"]
trait Copy { }

#[cfg(all(sanitize = "address", address))]
fn main() {}
Expand All @@ -36,3 +43,7 @@ fn main() {}

#[cfg(all(sanitize = "thread", thread))]
fn main() {}

pub fn check() {
main();
}

0 comments on commit 0e11725

Please sign in to comment.