From 93f80bff940c4269e18836b3f4c5cefed19b361a Mon Sep 17 00:00:00 2001
From: Tyson Nottingham <tgnottingham@gmail.com>
Date: Mon, 18 Oct 2021 16:25:21 -0700
Subject: [PATCH 1/2] Remove comment saying that we don't build debug rustc in
 CI, since we do

---
 src/test/ui/rustc-rust-log.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/test/ui/rustc-rust-log.rs b/src/test/ui/rustc-rust-log.rs
index 8ceb24dd2afd2..52e7dcf4499a8 100644
--- a/src/test/ui/rustc-rust-log.rs
+++ b/src/test/ui/rustc-rust-log.rs
@@ -1,9 +1,6 @@
 // run-pass
 // This test is just checking that we won't ICE if logging is turned
-// on; don't bother trying to compare that (copious) output. (Note
-// also that this test potentially silly, since we do not build+test
-// debug versions of rustc as part of our continuous integration
-// process...)
+// on; don't bother trying to compare that (copious) output.
 //
 // dont-check-compiler-stdout
 // dont-check-compiler-stderr

From aefbd401408769fbca1c486546b8dc3fce9e0d9b Mon Sep 17 00:00:00 2001
From: Tyson Nottingham <tgnottingham@gmail.com>
Date: Mon, 18 Oct 2021 14:00:29 -0700
Subject: [PATCH 2/2] Add test for debug logging during incremental compilation

Debug logging during incremental compilation had been broken for some
time, until #89343 fixed it (among other things). Add a test so this is
less likely to break without being noticed. This test is nearly a copy
of the `src/test/ui/rustc-rust-log.rs` test, but tests debug logging in
the incremental compliation code paths.
---
 .../incremental/auxiliary/rustc-rust-log-aux.rs  |  8 ++++++++
 src/test/incremental/rustc-rust-log.rs           | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 src/test/incremental/auxiliary/rustc-rust-log-aux.rs
 create mode 100644 src/test/incremental/rustc-rust-log.rs

diff --git a/src/test/incremental/auxiliary/rustc-rust-log-aux.rs b/src/test/incremental/auxiliary/rustc-rust-log-aux.rs
new file mode 100644
index 0000000000000..a361373dc1955
--- /dev/null
+++ b/src/test/incremental/auxiliary/rustc-rust-log-aux.rs
@@ -0,0 +1,8 @@
+// rustc-env:RUSTC_LOG=debug
+#[cfg(rpass1)]
+pub fn foo() {}
+
+#[cfg(rpass2)]
+pub fn foo() {
+    println!();
+}
diff --git a/src/test/incremental/rustc-rust-log.rs b/src/test/incremental/rustc-rust-log.rs
new file mode 100644
index 0000000000000..566f0d96d9732
--- /dev/null
+++ b/src/test/incremental/rustc-rust-log.rs
@@ -0,0 +1,16 @@
+// revisions: rpass1 rpass2
+// This test is just checking that we won't ICE if logging is turned
+// on; don't bother trying to compare that (copious) output.
+//
+// dont-check-compiler-stdout
+// dont-check-compiler-stderr
+// aux-build: rustc-rust-log-aux.rs
+// rustc-env:RUSTC_LOG=debug
+
+#[cfg(rpass1)]
+fn main() {}
+
+#[cfg(rpass2)]
+fn main() {
+    println!();
+}