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.

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

Encode CrateNum using the StableCrateId for incr. comp. #85834

Merged
merged 3 commits into from
Jun 17, 2021
Merged

Encode CrateNum using the StableCrateId for incr. comp. #85834

merged 3 commits into from
Jun 17, 2021

Conversation

cjgillot
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

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 May 30, 2021
@cjgillot
Copy link
Contributor Author

@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 May 30, 2021
@bors
Copy link
Contributor

bors commented May 30, 2021

⌛ Trying commit 16f14ce3c06befe9cec6816e2b6a58116ec727d1 with merge dcfa6edd50bc82bf09cf95ed74f9333e58748b93...

@bors
Copy link
Contributor

bors commented May 30, 2021

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

@rust-timer
Copy link
Collaborator

Queued dcfa6edd50bc82bf09cf95ed74f9333e58748b93 with parent 5957990, future comparison URL.

bjorn3
bjorn3 reviewed May 30, 2021
View reviewed changes
compiler/rustc_middle/src/ty/query/on_disk_cache.rs Outdated
if *self != LOCAL_CRATE {
s.latest_foreign_def_path_hashes
.insert(def_path_hash, RawDefId { krate: self.as_u32(), index: 0 });
}
Copy link
Member

Choose a reason for hiding this comment

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

Is this necessary?

bjorn3
bjorn3 reviewed May 30, 2021
View reviewed changes
compiler/rustc_middle/src/ty/context.rs
} else {
self.cstore.stable_crate_id_untracked(cnum)
}
}
Copy link
Member

Choose a reason for hiding this comment

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

This could be used in many places. I would guess it happens like 20-30 times.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (dcfa6edd50bc82bf09cf95ed74f9333e58748b93): comparison url.

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

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

bjorn3 commented May 31, 2021

Mixed small improvements and regressions.

@cjgillot
Copy link
Contributor Author

r? @michaelwoerister (as a stepping stone for the odht PR)

@bors
Copy link
Contributor

bors commented Jun 7, 2021

☔ The latest upstream changes (presumably #85891) made this pull request unmergeable. Please resolve the merge conflicts.

@michaelwoerister
Copy link
Member

It's on my todo list :)

@bjorn3 bjorn3 mentioned this pull request Jun 8, 2021
Merged
@bors
Copy link
Contributor

bors commented Jun 9, 2021

☔ The latest upstream changes (presumably #86150) made this pull request unmergeable. Please resolve the merge conflicts.

@michaelwoerister
Copy link
Member

Looks good to me - thanks, @cjgillot!

The performance changes are in the noise and the code is simpler than before.

@bors r+

@bors
Copy link
Contributor

bors commented Jun 17, 2021

📌 Commit f387cff has been approved by michaelwoerister

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 17, 2021
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 17, 2021
@bors
Copy link
Contributor

bors commented Jun 17, 2021

⌛ Testing commit f387cff with merge b17d9c1...

@bors
Copy link
Contributor

bors commented Jun 17, 2021

☀️ Test successful - checks-actions
Approved by: michaelwoerister
Pushing b17d9c1 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 17, 2021
@bors bors merged commit b17d9c1 into rust-lang:master Jun 17, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 17, 2021
@bors bors mentioned this pull request Jun 17, 2021
Merged
@cjgillot cjgillot deleted the save-sbi branch June 17, 2021 16:55
@michaelwoerister michaelwoerister mentioned this pull request Jun 21, 2021
Merged
@michaelwoerister michaelwoerister mentioned this pull request Jul 23, 2021
Merged
@Mark-Simulacrum Mark-Simulacrum added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 23, 2021
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.55.0, 1.54.0 Jul 23, 2021
@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jul 23, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2021
@bors
Auto merge of rust-lang#87393 - michaelwoerister:backport-85834-and-8…
c8fb0b5 
…6368, r=Mark-Simulacrum

Backport rust-lang#85834 and rust-lang#86368

As per discussion in https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/backport.20.2386368, backporting rust-lang#85834 too seems like the safest option for cleanly backporting rust-lang#86368.

r? `@Mark-Simulacrum`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

Assignees

@michaelwoerister michaelwoerister

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. 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.54.0
Development

Successfully merging this pull request may close these issues.
9 participants
@cjgillot @rust-highfive @rust-timer @bors @bjorn3 @michaelwoerister @Mark-Simulacrum @matthewjasper @rustbot