mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #114102 - compiler-errors:fulldeps-stage1-hack, r=pnkfelix

Browse Source 
Dont pass `-Zwrite-long-types-to-disk=no` for `ui-fulldeps --stage=1`

Due to this hack:

601a34de8c/src/bootstrap/test.rs (L1473-L1484)

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.
This commit is contained in:
Matthias Krüger 2023-07-27 06:04:15 +02:00 committed by GitHub
commit 8cae3439b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/compiletest/src/runtest.rs
View File

@ -2330,7 +2330,14 @@ impl<'test> TestCx<'test> {
// Hide line numbers to reduce churn
rustc.arg("-Zui-testing");
rustc.arg("-Zdeduplicate-diagnostics=no");
rustc.arg("-Zwrite-long-types-to-disk=no");
// #[cfg(not(bootstrap)] unconditionally pass flag after beta bump
// since `ui-fulldeps --stage=1` builds using the stage 0 compiler,
// which doesn't have this flag.
if !(self.config.stage_id.starts_with("stage1-")
&& self.config.suite == "ui-fulldeps")
{
rustc.arg("-Zwrite-long-types-to-disk=no");
}
// FIXME: use this for other modes too, for perf?
rustc.arg("-Cstrip=debuginfo");
}