Skip to content

Dont pass -Zwrite-long-types-to-disk=no for ui-fulldeps --stage=1 #114102

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jul 27, 2023

Conversation

compiler-errors
Copy link
Member

Due to this hack:

rust/src/bootstrap/test.rs

Lines 1473 to 1484 in 601a34d

// Support stage 1 ui-fulldeps. This is somewhat complicated: ui-fulldeps tests for the most
// part test the *API* of the compiler, not how it compiles a given file. As a result, we
// can run them against the stage 1 sources as long as we build them with the stage 0
// bootstrap compiler.
// NOTE: Only stage 1 is special cased because we need the rustc_private artifacts to match the
// running compiler in stage 2 when plugins run.
let stage_id = if suite == "ui-fulldeps" && compiler.stage == 1 {
compiler = builder.compiler(compiler.stage - 1, target);
format!("stage{}-{}", compiler.stage + 1, target)
} else {
format!("stage{}-{}", compiler.stage, target)
};

We use the stage 0 compiler to build the stage 1 fulldeps tests. That means that we don't have -Zwrite-long-types-to-disk=no which was added in #113893.

Add a temporary hack to fix this (https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/Some.20tests.20failing.20with.20--stage.201) until the next beta bump.

@rustbot
Copy link
Collaborator

rustbot commented Jul 26, 2023

r? @Mark-Simulacrum

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

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 Jul 26, 2023
@pnkfelix
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 26, 2023

📌 Commit 1794466 has been approved by pnkfelix

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 Jul 26, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#113872 (Tweak CGU sorting in a couple of places.)
 - rust-lang#114053 (CI: fix CMake installation for 32/64 bit `dist` Linux)
 - rust-lang#114075 (inline format!() args from rustc_codegen_llvm to the end (4))
 - rust-lang#114081 (`desugar_doc_comments` cleanups)
 - rust-lang#114082 (add stable NullaryOp)
 - rust-lang#114098 (replace atty crate with std's IsTerminal)
 - rust-lang#114102 (Dont pass `-Zwrite-long-types-to-disk=no` for `ui-fulldeps --stage=1`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8cae343 into rust-lang:master Jul 27, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 27, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Aug 5, 2023
Fix ui-fulldeps missing the `internal_features` lint on stage 0

Similar to rust-lang#114102, `ui-fulldeps --stage=1` builds using the the stage 0 compiler instead of the stage 1 compiler. That means that the new `internal_features` lint is referencing a lint that does not exist. Gate the flag it properly until the next feature bump.

Maybe we should just add ui-fulldeps stage 1 into CI somewhere so this is flagged before landing.
@compiler-errors compiler-errors deleted the fulldeps-stage1-hack branch August 11, 2023 20:02
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant 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.

5 participants