Skip to content

Commit 8cae343

Browse files
authored
Rollup merge of rust-lang#114102 - compiler-errors:fulldeps-stage1-hack, r=pnkfelix
Dont pass `-Zwrite-long-types-to-disk=no` for `ui-fulldeps --stage=1` Due to this hack: https://github.com/rust-lang/rust/blob/601a34de8c10458b72a7781eb0b44a7981e4a2b1/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 rust-lang#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.
2 parents dea5b4f + 1794466 commit 8cae343

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/tools/compiletest/src/runtest.rs

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

0 commit comments

Comments
 (0)