Skip to content

Fix race condition when allocating source files in SourceMap - #69266

Merged
bors merged 1 commit into
rust-lang:masterfrom
Zoxc:fix-source-map-race
Feb 20, 2020
Merged

Fix race condition when allocating source files in SourceMap#69266
bors merged 1 commit into
rust-lang:masterfrom
Zoxc:fix-source-map-race

Conversation

@Zoxc

@ZoxcZoxc commented Feb 18, 2020

Copy link
Copy Markdown
Contributor

This makes allocating address space in the source map an atomic operation. rustc does not currently do this in parallel, so this bug can't trigger, but parsing files in parallel could trigger it, and that is something we want to do.

Fixes#69261.

r? @wesleywiser

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 18, 2020
@Zoxc

Zoxc commented Feb 18, 2020

Copy link
Copy Markdown
ContributorAuthor

cc @petrochenkov

wesleywiser
wesleywiser approved these changes Feb 18, 2020
View reviewed changes

@wesleywiserwesleywiser left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

One small comment. If you don't think it's worthwhile, feel free to r=me this.

Comment threadsrc/librustc_span/source_map.rs Outdated
@petrochenkov

petrochenkov commented Feb 18, 2020

Copy link
Copy Markdown
Contributor

cc @matklad

mlodato517
mlodato517 reviewed Feb 18, 2020
View reviewed changes

@mlodato517mlodato517 left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Found a minor typo and am interested in trying to learn a little more about rust if you have the time to answer some questions :-) Also, I don't see any notes in CONTRIBUTING.md about reviewing PRs so I hope I'm not out of line in reviewing this. If there are some docs regarding when/how to review PRs - please link me to them so I don't make the mistake again.

Comment threadsrc/librustc_span/source_map.rs Outdated
Comment threadsrc/librustc_span/source_map.rs Outdated
Comment threadsrc/librustc_span/source_map.rs Outdated
Comment threadsrc/librustc_span/lib.rs Outdated
@wesleywiser

wesleywiser commented Feb 18, 2020

Copy link
Copy Markdown
Member

@mlodato517 If you have additional questions feel free to ask! Otherwise I'm going to mark those parts of your review resolved to keep this PR clean.

@Zoxc
Zoxcforce-pushed the fix-source-map-race branch from cc4375b to 437f56eCompareFebruary 18, 2020 21:29
@Zoxc

Zoxc commented Feb 18, 2020

Copy link
Copy Markdown
ContributorAuthor

@bors r=wesleywiser

@bors

bors commented Feb 18, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 437f56e has been approved by wesleywiser

@borsbors 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 Feb 18, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 20, 2020
@Dylan-DPC
Rollup merge ofrust-lang#69266- Zoxc:fix-source-map-race, r=wesleyw…
f755684
…iser
Fix race condition when allocating source files in SourceMap
This makes allocating address space in the source map an atomic operation. `rustc` does not currently do this in parallel, so this bug can't trigger, but parsing files in parallel could trigger it, and that is something we want to do.
Fixesrust-lang#69261.
r? @wesleywiser
This was referenced Feb 20, 2020
Closed
Merged
bors added a commit that referenced this pull request Feb 20, 2020
@bors
Auto merge of#69309- Dylan-DPC:rollup-gjdqx7l, r=Dylan-DPC
93711d0
Rollup of 5 pull requests
Successful merges:
- #68705 (Add LinkedList::remove())
- #68945 (Stabilize Once::is_completed)
- #68978 (Make integer exponentiation methods unstably const)
- #69266 (Fix race condition when allocating source files in SourceMap)
- #69287 (Clean up E0317 explanation)
Failed merges:
r? @ghost
@bors
bors merged commit 5d285dc into rust-lang:masterFeb 20, 2020
@Zoxc
Zoxc deleted the fix-source-map-race branch February 20, 2020 15:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wesleywiserwesleywiserwesleywiser approved these changes
+1 more reviewer
@mlodato517mlodato517mlodato517 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@wesleywiserwesleywiser

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

librustc_span has a concurrency bug

6 participants

@Zoxc@petrochenkov@wesleywiser@bors@mlodato517@rust-highfive