Skip to content

Commit

Permalink
Rollup merge of rust-lang#122645 - saethlin:portable-mir-opt-tests, r…
Browse files Browse the repository at this point in the history
…=Nadrieril

Remove some only- clauses from mir-opt tests

Derived from rust-lang#122295

Many of these tests were originally codegen tests, and MIR is more trivially portable than LLVM IR. We simply don't need to restrict the platform in most cases.

r? Nadrieril
  • Loading branch information
matthiaskrgr authored Mar 17, 2024
2 parents 8697d8f + 6828f0c commit 36006b2
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 12 deletions.
1 change: 0 additions & 1 deletion tests/mir-opt/asm_unwind_panic_abort.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//! Tests that unwinding from an asm block is caught and forced to abort
//! when `-C panic=abort`.

//@ only-x86_64
//@ compile-flags: -C panic=abort
//@ no-prefer-dynamic

Expand Down
1 change: 0 additions & 1 deletion tests/mir-opt/pre-codegen/checked_ops.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// skip-filecheck
//@ compile-flags: -O -Zmir-opt-level=2 -Cdebuginfo=2
//@ needs-unwind
//@ only-x86_64

#![crate_type = "lib"]
#![feature(step_trait)]
Expand Down
1 change: 0 additions & 1 deletion tests/mir-opt/pre-codegen/intrinsics.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// skip-filecheck
//@ compile-flags: -O -C debuginfo=0 -Zmir-opt-level=2
//@ only-64bit

// Checks that we do not have any branches in the MIR for the two tested functions.

Expand Down
1 change: 0 additions & 1 deletion tests/mir-opt/pre-codegen/loops.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// skip-filecheck
//@ compile-flags: -O -Zmir-opt-level=2 -g
//@ needs-unwind
//@ only-64bit

#![crate_type = "lib"]

Expand Down
1 change: 0 additions & 1 deletion tests/mir-opt/pre-codegen/mem_replace.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// skip-filecheck
//@ compile-flags: -O -C debuginfo=0 -Zmir-opt-level=2 -Zinline-mir
//@ only-64bit
//@ ignore-debug the standard library debug assertions leak into this test
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY

Expand Down
1 change: 0 additions & 1 deletion tests/mir-opt/pre-codegen/range_iter.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// skip-filecheck
//@ compile-flags: -O -C debuginfo=0 -Zmir-opt-level=2
//@ only-64bit
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY

#![crate_type = "lib"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
fn ezmap(_1: Option<i32>) -> Option<i32> {
debug x => _1;
let mut _0: std::option::Option<i32>;
scope 1 (inlined map::<i32, i32, {closure@$DIR/simple_option_map.rs:18:12: 18:15}>) {
scope 1 (inlined map::<i32, i32, {closure@$DIR/simple_option_map.rs:17:12: 17:15}>) {
debug slf => _1;
debug f => const ZeroSized: {closure@$DIR/simple_option_map.rs:18:12: 18:15};
debug f => const ZeroSized: {closure@$DIR/simple_option_map.rs:17:12: 17:15};
let mut _2: isize;
let _3: i32;
let mut _4: i32;
Expand Down
1 change: 0 additions & 1 deletion tests/mir-opt/pre-codegen/simple_option_map.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// skip-filecheck
//@ compile-flags: -O -C debuginfo=0 -Zmir-opt-level=2
//@ only-64bit

#[inline(always)]
fn map<T, U, F>(slf: Option<T>, f: F) -> Option<U>
Expand Down
1 change: 0 additions & 1 deletion tests/mir-opt/pre-codegen/slice_index.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// skip-filecheck
//@ compile-flags: -O -C debuginfo=0 -Zmir-opt-level=2
//@ only-64bit
//@ ignore-debug the standard library debug assertions leak into this test
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY

Expand Down
1 change: 0 additions & 1 deletion tests/mir-opt/pre-codegen/slice_iter.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// skip-filecheck
//@ compile-flags: -O -C debuginfo=0 -Zmir-opt-level=2
//@ only-64bit
//@ ignore-debug the standard library debug assertions leak into this test
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY

Expand Down
1 change: 0 additions & 1 deletion tests/mir-opt/pre-codegen/try_identity.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// skip-filecheck
//@ compile-flags: -O -C debuginfo=0 -Zmir-opt-level=2
//@ only-64bit

// Track the status of MIR optimizations simplifying `Ok(res?)` for both the old and new desugarings
// of that syntax.
Expand Down

0 comments on commit 36006b2

Please sign in to comment.