Auto merge of rust-lang#112049 - Kobzol:pgo-omit-benchmarks, r=<try>

[do not merge] CI experiments Various CI experiments for try/dist builds. r? `@ghost`
rust-lang-ci · Jan 14, 2025 · aceb712 · aceb712
2 parents e491cae + 16f3a28
commit aceb712
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
@@ -2096,7 +2096,7 @@ fn parse_opt_level(
             if let Some("opt-level") = s.split('=').next() { Some(i) } else { None }
         })
         .max();
-    if max_o > max_c {
+    let level = if max_o > max_c {
         OptLevel::Default
     } else {
         match cg.opt_level.as_ref() {
@@ -2113,7 +2113,8 @@ fn parse_opt_level(
                 ));
             }
         }
-    }
+    };
+    if level == OptLevel::Aggressive { OptLevel::Default } else { level }
 }
 
 fn select_debuginfo(matches: &getopts::Matches, cg: &CodegenOptions) -> DebugInfo {