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

[beta] backports #71258

Merged
merged 6 commits into from
Apr 18, 2020
Merged

[beta] backports #71258

merged 6 commits into from
Apr 18, 2020

Conversation

Mark-Simulacrum
Copy link
Member

This includes:

r? @ghost

pnkfelix and others added 5 commits April 17, 2020 15:28
…file in

incremental compilation.

This is symmetric to PR rust-lang#67020, which handled the case where the LLVM module's
*imports* changed. This commit builds upon the infrastructure added there; the
export map is just the inverse of the import map, so we can build the export map
at the same time that we load the serialized import map.

Fix rust-lang#69798
Namely, a regression test for issue rust-lang#69798 (export added), and the inverse of
that test (export removd).
Renamed the struct to make it a little clearer that it doesn't just hold one
imports map. (I couldn't bring myself to write it as `ThinLTOImportsExports`
though, mainly since the exports map is literally derived from the imports map
data.) Added some doc to the struct too.

Revised comments to add link to the newer issue that discusses why the exports
are relevant.

Renamed a few of the methods so that the two character difference is more
apparent (because 1. the method name is shorter and, perhaps more importantly,
the changed characters now lie at the beginning of the method name.)
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Apr 17, 2020

📌 Commit 1189706 has been approved by Mark-Simulacrum

@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 Apr 17, 2020
@Dylan-DPC-zz
Copy link

@bors p=2

@bors
Copy link
Contributor

bors commented Apr 18, 2020

⌛ Testing commit 1189706 with merge 034e0df7e4cef1bace21744241922549aa0cc05f...

@bors
Copy link
Contributor

bors commented Apr 18, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 18, 2020
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=2 rollup=never

@bors
Copy link
Contributor

bors commented Apr 18, 2020

📌 Commit 6d0fbd1 has been approved by Mark-Simulacrum

@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 Apr 18, 2020
@bors
Copy link
Contributor

bors commented Apr 18, 2020

⌛ Testing commit 6d0fbd1 with merge 062dea0...

@bors
Copy link
Contributor

bors commented Apr 18, 2020

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 062dea0 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 18, 2020
@bors bors merged commit 062dea0 into rust-lang:beta Apr 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

None yet

6 participants