Skip to content

Conversation

@Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Mar 9, 2024

Fixes #119789.

@rustbot
Copy link
Collaborator

rustbot commented Mar 9, 2024

r? @Nadrieril

rustbot has assigned @Nadrieril.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Mar 9, 2024
@Zoxc Zoxc force-pushed the no-interleave-panics branch from 82a4bef to 288380d Compare March 9, 2024 02:45
@Nadrieril
Copy link
Member

Is there a risk of deadlock with this? Because of another part of the compiler taking the lock, or a double-panic maybe?

@Nadrieril
Copy link
Member

I don't know enough about parallel trickery to approve this

r? compiler

@rustbot rustbot assigned michaelwoerister and unassigned Nadrieril Mar 9, 2024
@Zoxc
Copy link
Contributor Author

Zoxc commented Mar 9, 2024

It uses a re-entrant lock, so that should avoid issues happening on the same thread.

There's some risk of deadlock due to usages of queries sneaking in, but those already carry a deadlock risk due to using the query system in an invalid state.

@michaelwoerister
Copy link
Member

Let's give it a try. It's easy enough to revert if the approach causes trouble.

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Mar 11, 2024

📌 Commit 288380d has been approved by michaelwoerister

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 Mar 11, 2024
@bors
Copy link
Collaborator

bors commented Mar 12, 2024

⌛ Testing commit 288380d with merge 7de1a1f...

@bors
Copy link
Collaborator

bors commented Mar 12, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 12, 2024
@bors bors merged commit 7de1a1f into rust-lang:master Mar 12, 2024
@rustbot rustbot added this to the 1.78.0 milestone Mar 12, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (7de1a1f): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 674.911s -> 672.776s (-0.32%)
Artifact size: 310.31 MiB -> 310.29 MiB (-0.00%)

@Zoxc Zoxc deleted the no-interleave-panics branch March 12, 2024 23:54
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

parallel compiler: panic output and compiler warnings are interleaved

6 participants