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 jobserver ICE "jobserver check should have been called earlier" #118589

Closed
wants to merge 0 commits into from

Conversation

oksbsb
Copy link
Contributor

@oksbsb oksbsb commented Dec 4, 2023

Fix #118588

@rustbot
Copy link
Collaborator

rustbot commented Dec 4, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @WaffleLapkin (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@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 Dec 4, 2023
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@SparrowLii
Copy link
Member

@oksbsb Thanks! It looks like #113730 has made the parallel frontend completely unusable : ( Hoping this to land as soon as possible

@petrochenkov
Copy link
Contributor

I'll r+ after #118589 (comment) and #118589 (comment) are addressed, and the tidy issue #118589 (comment) is fixed (x.py test --bless tidy).

r? @petrochenkov
@rustbot author

@rustbot rustbot assigned petrochenkov and unassigned WaffleLapkin Dec 7, 2023
@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 7, 2023
@petrochenkov
Copy link
Contributor

@oksbsb
It would be good to fix this today if you have time, because the issue seems critical.
If not, then it's also fine, I'll just resubmit the fix myself tomorrow.

@petrochenkov
Copy link
Contributor

While we are at here, could you also introduce

impl EarlyErrorHandler {
    pub fn initialize_checked_jobserver(&self) {
        jobserver::check(|err| {
            self.early_warn_with_note(err, "the build environment is likely misconfigured")
        });
    }
}

to share the code?

(The current setup exists because jobserver lives in rustc_data_structures and therefore cannot use the error handler types.)

@rust-log-analyzer

This comment has been minimized.

@petrochenkov
Copy link
Contributor

r=me after making CI green and squashing commits into one.

@oksbsb
Copy link
Contributor Author

oksbsb commented Dec 7, 2023

@petrochenkov updated, thanks a lot.

@oksbsb
Copy link
Contributor Author

oksbsb commented Dec 7, 2023

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Dec 7, 2023

@oksbsb: 🔑 Insufficient privileges: Not in reviewers

@SparrowLii
Copy link
Member

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Dec 7, 2023

📌 Commit 4f5355a has been approved by petrochenkov

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 7, 2023
@bors
Copy link
Contributor

bors commented Dec 7, 2023

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout master (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self master --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging compiler/rustc_session/src/session.rs
CONFLICT (content): Merge conflict in compiler/rustc_session/src/session.rs
Auto-merging compiler/rustc_interface/src/tests.rs
Auto-merging compiler/rustc_interface/src/interface.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 7, 2023
@oksbsb oksbsb closed this Dec 7, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 7, 2023
fix jobserver GLOBAL_CLIENT_CHECKED uninitialized before use

override rust-lang#118589, resolve merge conflict

`@petrochenkov` `@SparrowLii`

Thanks!
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 8, 2023
fix jobserver GLOBAL_CLIENT_CHECKED uninitialized before use

override rust-lang#118589, resolve merge conflict

`@petrochenkov` `@SparrowLii`

Thanks!
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 8, 2023
Rollup merge of rust-lang#118709 - oksbsb:fix-job-server, r=SparrowLii

fix jobserver GLOBAL_CLIENT_CHECKED uninitialized before use

override rust-lang#118589, resolve merge conflict

`@petrochenkov` `@SparrowLii`

Thanks!
@WaffleLapkin
Copy link
Member

@oksbsb try not to push after closing a PR but before reopening it, github is somewhat broken with this IIRC

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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.

jobserver client called before set and panic
9 participants