Auto merge of rust-lang#138197 - Zalathar:assemble-cycle, r=<try>

(DO NOT MERGE) Investigating bootstrap cycle

r? ghost

try-job: aarch64-apple

Author: bors

src/bootstrap/src/core/build_steps/compile.rs

@@ -994,9 +994,7 @@ impl Step for Rustc {
     fn make_run(run: RunConfig<'_>) {
         let crates = run.cargo_crates_in_set();
         run.builder.ensure(Rustc {
-            compiler: run
-                .builder
-                .compiler(run.builder.top_stage.saturating_sub(1), run.build_triple()),
+            compiler: run.builder.compiler(run.builder.top_stage, run.build_triple()),
             target: run.target,
             crates,
         });
@@ -1913,7 +1911,7 @@ impl Step for Assemble {
 
     fn make_run(run: RunConfig<'_>) {
         run.builder.ensure(Assemble {
-            target_compiler: run.builder.compiler(run.builder.top_stage, run.target),
+            target_compiler: run.builder.compiler(run.builder.top_stage + 1, run.target),
         });
     }
 

src/bootstrap/src/core/builder/tests.rs

@@ -652,20 +652,6 @@ mod dist {
             &["compiler/rustc".into(), "library".into()],
         );
 
-        assert_eq!(builder.config.stage, 2);
-
-        // `compile::Rustc` includes one-stage-off compiler information as the target compiler
-        // artifacts get copied from there to the target stage sysroot.
-        // For example, `stage2/bin/rustc` gets copied from the `stage1-rustc` build directory.
-        assert_eq!(
-            first(builder.cache.all::<compile::Rustc>()),
-            &[
-                rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 0),
-                rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 1),
-                rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_2, stage = 1),
-            ]
-        );
-
         assert_eq!(
             first(builder.cache.all::<compile::Std>()),
             &[
@@ -677,22 +663,15 @@ mod dist {
                 std!(TEST_TRIPLE_1 => TEST_TRIPLE_3, stage = 2),
             ]
         );
-
+        assert_eq!(builder.cache.all::<compile::Assemble>().len(), 5);
         assert_eq!(
-            first(builder.cache.all::<compile::Assemble>()),
+            first(builder.cache.all::<compile::Rustc>()),
             &[
-                compile::Assemble {
-                    target_compiler: Compiler::new(0, TargetSelection::from_user(TEST_TRIPLE_1),)
-                },
-                compile::Assemble {
-                    target_compiler: Compiler::new(1, TargetSelection::from_user(TEST_TRIPLE_1),)
-                },
-                compile::Assemble {
-                    target_compiler: Compiler::new(2, TargetSelection::from_user(TEST_TRIPLE_1),)
-                },
-                compile::Assemble {
-                    target_compiler: Compiler::new(2, TargetSelection::from_user(TEST_TRIPLE_2),)
-                },
+                rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 0),
+                rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 1),
+                rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 2),
+                rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_2, stage = 1),
+                rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_2, stage = 2),
             ]
         );
     }

tests/ui/instrument-coverage/bad-value.rs

@@ -1,5 +1,5 @@
 //@ revisions: blank bad
-//@ [blank] compile-flags: -Cinstrument-coverage=
+//@ [blank] compile-flags: -Cinstrument-coverage=_
 //@ [bad] compile-flags: -Cinstrument-coverage=bad-value
 
 fn main() {}