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

Only unpack tupled args in inliner if we expect args to be unpacked #110833

Merged
merged 4 commits into from
Aug 4, 2023
Merged
Changes from 1 commit
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
Prev Previous commit
bless
compiler-errors committed Aug 3, 2023
commit e43649fdc3946558a94a7ab57d399413fc2bb2b5
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
- // MIR for `call` before Inline
+ // MIR for `call` after Inline

fn call(_1: Box<dyn FnMut<I, Output = ()>>, _2: I) -> () {
debug mock => _1;
debug input => _2;
let mut _0: ();
let mut _3: &mut std::boxed::Box<dyn std::ops::FnMut<I, Output = ()>>;
let mut _4: I;

bb0: {
StorageLive(_3);
_3 = &mut _1;
StorageLive(_4);
_4 = move _2;
_0 = <Box<dyn FnMut<I, Output = ()>> as FnMut<I>>::call_mut(move _3, move _4) -> [return: bb1, unwind: bb3];
}

bb1: {
StorageDead(_4);
StorageDead(_3);
drop(_1) -> [return: bb2, unwind: bb4];
}

bb2: {
return;
}

bb3 (cleanup): {
drop(_1) -> [return: bb4, unwind terminate];
}

bb4 (cleanup): {
resume;
}
}

1 change: 1 addition & 0 deletions tests/mir-opt/inline/dont_ice_on_generic_rust_call.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
// compile-flags: -Zmir-enable-passes=+Inline --crate-type=lib
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// compile-flags: -Zmir-enable-passes=+Inline --crate-type=lib
// unit-test: Inline
// compile-flags: --crate-type=lib


#![feature(fn_traits, tuple_trait, unboxed_closures)]
40 changes: 40 additions & 0 deletions tests/mir-opt/inline/inline_box_fn.call.Inline.panic-unwind.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
- // MIR for `call` before Inline
+ // MIR for `call` after Inline

fn call(_1: Box<dyn Fn(i32)>) -> () {
debug x => _1;
let mut _0: ();
let _2: ();
let mut _3: &std::boxed::Box<dyn std::ops::Fn(i32)>;
let mut _4: (i32,);

bb0: {
StorageLive(_2);
StorageLive(_3);
_3 = &_1;
StorageLive(_4);
_4 = (const 1_i32,);
_2 = <Box<dyn Fn(i32)> as Fn<(i32,)>>::call(move _3, move _4) -> [return: bb1, unwind: bb3];
}

bb1: {
StorageDead(_4);
StorageDead(_3);
StorageDead(_2);
_0 = const ();
drop(_1) -> [return: bb2, unwind: bb4];
}

bb2: {
return;
}

bb3 (cleanup): {
drop(_1) -> [return: bb4, unwind terminate];
}

bb4 (cleanup): {
resume;
}
}

1 change: 1 addition & 0 deletions tests/mir-opt/inline/inline_box_fn.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
// unit-test: Inline
// compile-flags: --crate-type=lib