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

Fix loading large rlibs #88506

Merged
merged 2 commits into from
Aug 31, 2021
Merged

Fix loading large rlibs #88506

merged 2 commits into from
Aug 31, 2021

Conversation

Mark-Simulacrum
Copy link
Member

Bumps object crate to permit parsing archives with 64-bit table entries. These
are primarily encountered when there's more than 4GB of archive data.

cc gimli-rs/object#365

Helps with #88351, but will also need a beta backport

r? @ehuss (mostly for the test)

Bumps object crate to permit parsing archives with 64-bit table entries. These
are primarily encountered when there's more than 4GB of archive data.
@Mark-Simulacrum Mark-Simulacrum added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Aug 30, 2021
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 30, 2021
@Mark-Simulacrum
Copy link
Member Author

beta-accepting myself since if we're OK with master we're probably good with backporting, small patch and fixes a clear regression.

@ehuss
Copy link
Contributor

ehuss commented Aug 31, 2021

Hm, maybe I'm confused, but I don't think this test can be checked in as-is? On my relatively fast system it takes almost 15 minutes to finish, and uses 16 GB of disk space. Was this just to demonstrate that it is fixed?

I don't have any particular ideas on how to make a test that could be feasible. Perhaps write some hand-crafted ELF files that circumvents cc, but it'll still be pretty slow and probably take an excessive amount of disk space.

Otherwise, seems like the test passes locally for me.

@Mark-Simulacrum
Copy link
Member Author

Yeah, I think the test as-is does likely take too long. I'll probably drop it from this PR later today- I sort of want a slow test mode but 11-15 minutes seems excessive on any system for a singles test.

This is kept to a separate commit so that the test itself is preserved in the
commit history.
@Mark-Simulacrum
Copy link
Member Author

@ehuss would you be up for r+'ing this now? I just pushed a commit that deletes the test; I opted for a separate commit because it seems nice to keep the test around in the commit history so we can cherry-pick just the first commit for testing purposes. Happy to squash if you disagree though.

@ehuss
Copy link
Contributor

ehuss commented Aug 31, 2021

👍
@bors r+

Not sure if you want to adjust the priority.

@bors
Copy link
Contributor

bors commented Aug 31, 2021

📌 Commit 84df1ed has been approved by ehuss

@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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 31, 2021
@Mark-Simulacrum
Copy link
Member Author

@bors p=1

Yeah, I'd like to get this landed so we can have the backport this week without too much hassle.

@bors
Copy link
Contributor

bors commented Aug 31, 2021

⌛ Testing commit 84df1ed with merge 29ef6cf...

@bors
Copy link
Contributor

bors commented Aug 31, 2021

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 29ef6cf to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 31, 2021
@bors bors merged commit 29ef6cf into rust-lang:master Aug 31, 2021
@rustbot rustbot added this to the 1.56.0 milestone Aug 31, 2021
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 4, 2021
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.56.0, 1.55.0 Sep 4, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 4, 2021
…ulacrum

[beta] backports

This PR backports:

* Concrete regions can show up in mir borrowck if the originated from there rust-lang#88533 (fixes rust-lang#83190)
* Fix loading large rlibs rust-lang#88506 (fixes rust-lang#88351)
* Display associated types of implementors rust-lang#88490 (fixes rust-lang#86631)
* Tracking issue for UNSUPPORTED_CALLING_CONVENTIONS rust-lang#88397

r? `@Mark-Simulacrum`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

5 participants