Skip to content
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.

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

Remove some only- clauses from mir-opt tests #122645

Merged
merged 1 commit into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions tests/mir-opt/asm_unwind_panic_abort.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
//! 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
//@ needs-asm-support

#![feature(asm_unwind)]

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
Loading