Skip to content

Revert "Enable incremental independent of stage" - #111982

Merged
bors merged 1 commit into
rust-lang:masterfrom
jyn514:disable-incremental
Jun 4, 2023
Merged

Revert "Enable incremental independent of stage"#111982
bors merged 1 commit into
rust-lang:masterfrom
jyn514:disable-incremental

Conversation

@jyn514

Copy link
Copy Markdown
Member

This reverts commit 827f656.

Incremental is not sound to use across stages. Arbitrary changes to the compiler can invalidate the incremental cache - even changes to normal queries, not incremental itself! - and we do not currently enable incremental-verify-ich in bootstrap. Since 2018, we highly recommend and nudge users towards stage 1 builds instead of stage 2, and using keep-stage for anything other than libstd is very rare.

I don't think the risk of unsoundness is worth the very minor speedup when building libstd. Disable incremental to avoid spurious panics and miscompilations when building with the stage 1 and 2 sysroot.

Combined with #111329, this should fix#76720.

r? @Mark-Simulacrum

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 26, 2023
This reverts commit 827f656.
Incremental is not sound to use across stages. Arbitrary changes to the compiler can invalidate the
incremental cache - even changes to normal queries, not incremental itself! - and we do not
currently enable `incremental-verify-ich` in bootstrap. Since 2018, we highly recommend and nudge
users towards stage 1 builds instead of stage 2, and using `keep-stage` for anything other than
libstd is very rare.
I don't think the risk of unsoundness is worth the very minor speedup when building libstd. Disable
incremental to avoid spurious panics and miscompilations when building with the stage 1 and 2
sysroot.
@jyn514
jyn514force-pushed the disable-incremental branch from 06f7cc9 to b42ff20CompareMay 26, 2023 05:01
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jun 3, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit b42ff20 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 Jun 3, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 4, 2023
…iaskrgr
Rollup of 6 pull requests
Successful merges:
- rust-lang#109093 (add `#[doc(alias="flatmap")]` to `Option::and_then`)
- rust-lang#110701 (Fix `x test core` when download-rustc is enabled)
- rust-lang#111982 (Revert "Enable incremental independent of stage")
- rust-lang#112158 (Add portable-simd mention)
- rust-lang#112172 (doc: improve explanation)
- rust-lang#112178 (Fix bug where private item with intermediate doc hidden re-export was not inlined)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit d545220 into rust-lang:masterJun 4, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 4, 2023
@jyn514
jyn514 deleted the disable-incremental branch December 8, 2023 15:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ICE: stage2 builds of rustc itself see metadata serialized by a different rustc

4 participants

@jyn514@Mark-Simulacrum@bors@rustbot