Skip to content

Commit

Permalink
Rollup merge of rust-lang#117082 - fortanix:raoul/fix_closure_inherit…
Browse files Browse the repository at this point in the history
…_target_feature_sgx, r=Mark-Simulacrum

Fix closure-inherit-target-feature test for SGX platform

PR rust-lang#116078 adds the `closure-inherit-target-feature.rs` test that checks the generated assembly code for closures. These checks explicitly check the presence of `ret` instructions. This is incompatible with the SGX target as it explicitly rewrites all `ret` instructions to mitigate LVI vulnerabilities of certain processors. This PR simply ignores these tests for the SGX platform.

cc: ``@jethrogb``
  • Loading branch information
GuillaumeGomez authored Oct 29, 2023
2 parents 806492a + c094ba0 commit 8dd890d
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions tests/assembly/closure-inherit-target-feature.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// only-x86_64
// ignore-sgx Tests incompatible with LVI mitigations
// assembly-output: emit-asm
// make sure the feature is not enabled at compile-time
// compile-flags: -C opt-level=3 -C target-feature=-sse4.1 -C llvm-args=-x86-asm-syntax=intel
Expand Down

0 comments on commit 8dd890d

Please sign in to comment.