From ad15c2a3b343199c1a13ad53537b33c179d2320e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E6=9D=B0=E5=8F=8B=20Jieyou=20Xu=20=28Joe=29?=
 <39484203+jieyouxu@users.noreply.github.com>
Date: Sat, 8 Mar 2025 12:15:36 +0800
Subject: [PATCH 1/3] [DO NOT MERGE] Enable bootstrap tracing

---
 src/ci/github-actions/jobs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 6b88c26e3a276..6d2de102c37f7 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -437,7 +437,7 @@ auto:
 
   - name: aarch64-apple
     env:
-      SCRIPT: ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
+      SCRIPT: BOOTSTRAP_TRACING=bootstrap=trace ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
       RUST_CONFIGURE_ARGS: >-
         --enable-sanitizers
         --enable-profiler

From ede18ab2d1fcb13509b3c9757cb14ea7f7731722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E6=9D=B0=E5=8F=8B=20Jieyou=20Xu=20=28Joe=29?=
 <39484203+jieyouxu@users.noreply.github.com>
Date: Sat, 8 Mar 2025 11:57:46 +0800
Subject: [PATCH 2/3] [DO NOT MERGE] Allow changes to bootstrap for ci-rustc

---
 src/bootstrap/src/core/config/config.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index ac24da9f86b25..1cdce8fd77842 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -48,6 +48,7 @@ pub(crate) const RUSTC_IF_UNCHANGED_ALLOWED_PATHS: &[&str] = &[
     ":!src/rustdoc-json-types",
     ":!tests",
     ":!triagebot.toml",
+    ":!src/bootstrap",
 ];
 
 macro_rules! check_ci_llvm {

From aa77c6af83a3b0dee0a4579afafb4fa020ad4fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E6=9D=B0=E5=8F=8B=20Jieyou=20Xu=20=28Joe=29?=
 <39484203+jieyouxu@users.noreply.github.com>
Date: Sat, 8 Mar 2025 12:14:01 +0800
Subject: [PATCH 3/3] [DO NOT MERGE] Try coerce to `&dyn Any`

---
 src/bootstrap/src/core/builder/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs
index 801894e9ff1bf..b1b3db92acb22 100644
--- a/src/bootstrap/src/core/builder/mod.rs
+++ b/src/bootstrap/src/core/builder/mod.rs
@@ -1500,6 +1500,7 @@ impl<'a> Builder<'a> {
                 let mut out = String::new();
                 out += &format!("\n\nCycle in build detected when adding {step:?}\n");
                 for el in stack.iter().rev() {
+                    let el = el as &dyn Any;
                     out += &format!("\t{el:?}\n");
                 }
                 panic!("{}", out);