From f71923942499124357b9005ea3567b20f4f5ab26 Mon Sep 17 00:00:00 2001
From: The 8472 <git@infinite-source.de>
Date: Sat, 2 Jul 2022 22:19:49 +0200
Subject: [PATCH] move optimize-tests flag handling from bootstrap to
 compiletest

---
 src/bootstrap/test.rs                |  8 +-----
 src/tools/compiletest/src/common.rs  |  5 ++--
 src/tools/compiletest/src/main.rs    |  2 +-
 src/tools/compiletest/src/runtest.rs | 37 +++++++++++++++++++---------
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 65d7a264edd..f3395507bb0 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -1363,16 +1363,10 @@ fn run(self, builder: &Builder<'_>) {
         if let Some(ref npm) = builder.config.npm {
             cmd.arg("--npm").arg(npm);
         }
-
-        let mut flags = if is_rustdoc { Vec::new() } else { vec!["-Crpath".to_string()] };
-        if !is_rustdoc && mode != "ui" {
-            if builder.config.rust_optimize_tests {
-                flags.push("-O".to_string());
-            }
-        }
         if builder.config.rust_optimize_tests {
             cmd.arg("--optimize-tests");
         }
+        let mut flags = if is_rustdoc { Vec::new() } else { vec!["-Crpath".to_string()] };
         flags.push(format!("-Cdebuginfo={}", builder.config.rust_debuginfo_level_tests));
         flags.push(builder.config.cmd.rustc_args().join(" "));
 
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
index bd058bcda41..be81ff881f3 100644
--- a/src/tools/compiletest/src/common.rs
+++ b/src/tools/compiletest/src/common.rs
@@ -269,9 +269,8 @@ pub struct Config {
     /// Flags to pass to the compiler when building for the target
     pub target_rustcflags: Option<String>,
 
-    /// Whether tests should be optimized.
-    /// Currently only provides a default for UI-tests that are run-pass.
-    /// Other tests are controlled by rustcflags or the testfiles themselves.
+    /// Whether tests should be optimized by default. Individual test-suites and test files may
+    /// override this setting.
     pub optimize_tests: bool,
 
     /// What panic strategy the target is built with.  Unwind supports Abort, but
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
index 28ab3a72ef6..a8a151ca114 100644
--- a/src/tools/compiletest/src/main.rs
+++ b/src/tools/compiletest/src/main.rs
@@ -102,7 +102,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
         )
         .optmulti("", "host-rustcflags", "flags to pass to rustc for host", "FLAGS")
         .optmulti("", "target-rustcflags", "flags to pass to rustc for target", "FLAGS")
-        .optflag("", "optimize-tests", "build UI tests with optimization enabled")
+        .optflag("", "optimize-tests", "run tests with optimizations enabled")
         .optopt("", "target-panic", "what panic strategy the target supports", "unwind | abort")
         .optflag("", "verbose", "run tests verbosely, showing all output")
         .optflag(
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 8c98f87c48c..35ed4e8c957 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1862,6 +1862,31 @@ fn make_compile_args(
             }
         }
 
+        if self.config.optimize_tests && !is_rustdoc {
+            match self.config.mode {
+                Ui => {
+                    // If optimize-tests is true we still only want to optimize tests that actually get
+                    // executed and that don't specify their own optimization levels.
+                    // Note: aux libs don't have a pass-mode, so they won't get optimized
+                    // unless compile-flags are set in the aux file.
+                    if self.config.optimize_tests
+                        && self.props.pass_mode(&self.config) == Some(PassMode::Run)
+                        && !self
+                            .props
+                            .compile_flags
+                            .iter()
+                            .any(|arg| arg == "-O" || arg.contains("opt-level"))
+                    {
+                        rustc.arg("-O");
+                    }
+                }
+                DebugInfo => { /* debuginfo tests must be unoptimized */ }
+                _ => {
+                    rustc.arg("-O");
+                }
+            }
+        }
+
         match self.config.mode {
             Incremental => {
                 // If we are extracting and matching errors in the new
@@ -1875,18 +1900,6 @@ fn make_compile_args(
                 rustc.arg("-Zdeduplicate-diagnostics=no");
             }
             Ui => {
-                // If optimize-tests is true we still only want to optimize tests that actually get
-                // executed and that don't specify their own optimization levels
-                if self.config.optimize_tests
-                    && self.props.pass_mode(&self.config) == Some(PassMode::Run)
-                    && !self
-                        .props
-                        .compile_flags
-                        .iter()
-                        .any(|arg| arg == "-O" || arg.contains("opt-level"))
-                {
-                    rustc.arg("-O");
-                }
                 if !self.props.compile_flags.iter().any(|s| s.starts_with("--error-format")) {
                     rustc.args(&["--error-format", "json"]);
                     rustc.args(&["--json", "future-incompat"]);
-- 
GitLab