-
Notifications
You must be signed in to change notification settings - Fork 13.2k
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
+255
−159
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
2fd4c28
Negative test for inlining `<Box<dyn Fn()> as Fn<()>>::call`
compiler-errors 0391af0
Only unpack tupled args in inliner if we expect args to be unpacked
compiler-errors 3c9549b
Explicitly don't inline user-written rust-call fns
compiler-errors e43649f
bless
compiler-errors File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
37 changes: 37 additions & 0 deletions
37
tests/mir-opt/inline/dont_ice_on_generic_rust_call.call.Inline.panic-unwind.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
40 changes: 40 additions & 0 deletions
40
tests/mir-opt/inline/inline_box_fn.call.Inline.panic-unwind.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.