Unrolled build for rust-lang#117082

rust-timer · web-flow · commit 65d5affb558b · 2023-10-29T10:50:56.000-04:00
Rollup merge of rust-lang#117082 - fortanix:raoul/fix_closure_inherit_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```
diff --git a/tests/assembly/closure-inherit-target-feature.rs b/tests/assembly/closure-inherit-target-feature.rs
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// only-x86_64`
	`2`	`+// ignore-sgx Tests incompatible with LVI mitigations`
`2`	`3`	`// assembly-output: emit-asm`
`3`	`4`	`// make sure the feature is not enabled at compile-time`
`4`	`5`	`// compile-flags: -C opt-level=3 -C target-feature=-sse4.1 -C llvm-args=-x86-asm-syntax=intel`