Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions compiler/rustc_session/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2303,16 +2303,22 @@ fn parse_opt_level(
}

fn select_debuginfo(matches: &getopts::Matches, cg: &CodegenOptions) -> DebugInfo {
let max_g = matches.opt_positions("g").into_iter().max();
let max_c = matches
let _max_g = matches.opt_positions("g").into_iter().max();
let _max_c = matches
.opt_strs_pos("C")
.into_iter()
.flat_map(|(i, s)| {
// NB: This can match a string without `=`.
if let Some("debuginfo") = s.split('=').next() { Some(i) } else { None }
})
.max();
if max_g > max_c { DebugInfo::Full } else { cg.debuginfo }
match cg.debuginfo {
DebugInfo::None => DebugInfo::None,
DebugInfo::LineDirectivesOnly => DebugInfo::LineDirectivesOnly,
DebugInfo::LineTablesOnly => DebugInfo::LineTablesOnly,
DebugInfo::Limited => DebugInfo::LineTablesOnly,
DebugInfo::Full => DebugInfo::LineTablesOnly,
}
}

fn parse_assert_incr_state(
Expand Down
4 changes: 3 additions & 1 deletion src/tools/opt-dist/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(unused, warnings)]

use anyhow::Context;
use camino::{Utf8Path, Utf8PathBuf};
use clap::Parser;
Expand Down Expand Up @@ -396,7 +398,7 @@ fn execute_pipeline(
// possible regressions.
// The tests are not executed for fast try builds, which can be broken and might not pass them.
if !is_fast_try_build() && env.run_tests() {
timer.section("Run tests", |_| run_tests(env))?;
// timer.section("Run tests", |_| run_tests(env))?;
}

Ok(())
Expand Down
Loading