Skip to content

Avoid cloning LocalDecls #86362

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Aug 31, 2021
Merged

Avoid cloning LocalDecls #86362

merged 1 commit into from
Aug 31, 2021

Conversation

ptrojahn
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Contributor

r? @matthewjasper

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 16, 2021
@JohnTitor
Copy link
Member

In case this is perf-sensitive,
@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 2, 2021
@bors
Copy link
Collaborator

bors commented Jul 2, 2021

⌛ Trying commit 52841487e503ffb430d8b79b0cfdeab1e93a569e with merge 52547bf071f62d79d15178ef168074a0a84e30a1...

@bors
Copy link
Collaborator

bors commented Jul 2, 2021

☀️ Try build successful - checks-actions
Build commit: 52547bf071f62d79d15178ef168074a0a84e30a1 (52547bf071f62d79d15178ef168074a0a84e30a1)

@rust-timer
Copy link
Collaborator

Queued 52547bf071f62d79d15178ef168074a0a84e30a1 with parent ce331ee, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (52547bf071f62d79d15178ef168074a0a84e30a1): comparison url.

Summary: This benchmark run did not return any significant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 2, 2021
@JohnTitor
Copy link
Member

Looks like it's perf-insensitive.
@bors rollup=maybe

r? @eddyb as FIXME is yours.

@rust-highfive rust-highfive assigned eddyb and unassigned matthewjasper Jul 2, 2021
@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 18, 2021
@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 9, 2021
@jackh726
Copy link
Member

@ptrojahn can you rebase? I'll take the review here. r? @jackh726

@rust-highfive rust-highfive assigned jackh726 and unassigned eddyb Aug 22, 2021
@jackh726 jackh726 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 22, 2021
@ptrojahn ptrojahn force-pushed the insert_vars_and_temps branch from 5284148 to ce6296e Compare August 23, 2021 18:21
@ptrojahn
Copy link
Contributor Author

Didn't see the conflict. Rebased

jackh726
jackh726 requested changes Aug 23, 2021
View reviewed changes
compiler/rustc_mir/src/transform/inline.rs Outdated
);
caller_body
.local_decls
.extend(callee_body.local_decls.drain(callee_body.arg_count + 1..)); // vars and temps
Copy link
Member

Choose a reason for hiding this comment

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

So, I don't think "exposing" the internal logic of arg_count + 1.. is all that great. Could you add a new function on Body, drain_vars_and_temps?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed

@ptrojahn ptrojahn force-pushed the insert_vars_and_temps branch from ce6296e to e09ab5f Compare August 31, 2021 12:48
@ptrojahn ptrojahn force-pushed the insert_vars_and_temps branch from e09ab5f to 7bcc9ae Compare August 31, 2021 12:52
@ptrojahn ptrojahn requested a review from jackh726 August 31, 2021 12:55
@jackh726
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Aug 31, 2021

📌 Commit 7bcc9ae has been approved by jackh726

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 31, 2021
@m-ou-se m-ou-se mentioned this pull request Aug 31, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2021
@bors
Auto merge of rust-lang#88535 - m-ou-se:rollup-jeusxbo, r=m-ou-se
0a84708 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#85017 (Add carrying_add, borrowing_sub, widening_mul, carrying_mul methods to integers)
 - rust-lang#86362 (Avoid cloning LocalDecls)
 - rust-lang#88391 (Fix json tuple struct enum variant )
 - rust-lang#88399 (Disallow the aapcs CC on Aarch64)
 - rust-lang#88418 (Allow `~const` bounds on trait assoc functions)
 - rust-lang#88445 (Clean up the lowering of AST items)
 - rust-lang#88495 (Add `TcpStream::set_linger` and `TcpStream::linger`)
 - rust-lang#88501 (Use right span in prelude collision suggestions with macros. )
 - rust-lang#88504 (Keep turbofish in prelude collision lint.)
 - rust-lang#88524 (Remove unnecessary `mut` from udp doctests)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 175c8cb into rust-lang:master Aug 31, 2021
@rustbot rustbot added this to the 1.56.0 milestone Aug 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackh726 jackh726 Awaiting requested review from jackh726

Assignees

@jackh726 jackh726

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.56.0
Development

Successfully merging this pull request may close these issues.
10 participants
@ptrojahn @rust-highfive @JohnTitor @rust-timer @bors @jackh726 @eddyb @JohnCSimon @matthewjasper @rustbot