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

Allow overwriting ExpnId for concurrent decoding #115081

Merged
merged 2 commits into from Aug 25, 2023
Merged

Allow overwriting ExpnId for concurrent decoding #115081

merged 2 commits into from Aug 25, 2023

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Aug 21, 2023

These assertions only hold for the single threaded compiler. They were triggered in #115003.

@rustbot
Copy link
Collaborator

rustbot commented Aug 21, 2023

r? @b-naber

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 21, 2023
@cjgillot
Copy link
Contributor

For the parallel compiler, should we still assert that the old and new values match?

@cjgillot cjgillot self-assigned this Aug 23, 2023
@Zoxc
Copy link
Contributor Author

Zoxc commented Aug 23, 2023

I did that with 2 of the values. The other lacks Eq.

The function register_local_expn_id above also seems very questionable as it unconditionally generates a new ExpnId for the same input. I'm not familiar with this code, but that doesn't seem right for even the serial compiler.

@cjgillot
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Aug 24, 2023

📌 Commit 6101ddd has been approved by cjgillot

It is now in the queue for this repository.

@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 24, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 25, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2023
@bors
Auto merge of rust-lang#115204 - matthiaskrgr:rollup-avsp3t3, r=matth…
4535d33 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#114754 (Name what ln_gamma does)
 - rust-lang#115081 (Allow overwriting ExpnId for concurrent decoding)
 - rust-lang#115151 (Fix CFI: f32 and f64 are encoded incorrectly for cross-language CFI)
 - rust-lang#115169 (remove some unnecessary ignore-debug clauses)
 - rust-lang#115190 (Add comment to the push_trailing function)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 49cdf06 into rust-lang:master Aug 25, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Aug 25, 2023
@Zoxc Zoxc deleted the expn-id-decode branch August 25, 2023 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cjgillot cjgillot

@b-naber b-naber

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.74.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Zoxc @rustbot @cjgillot @bors @b-naber