squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

run full query stack print just when RUST_BACKTRACE is set

Browse source
This commit is contained in:
hosseind75 2020-09-19 18:37:58 +04:30 committed by hosseind88
parent 17eb8d8b34
commit 20ea9290ed
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_driver/src/lib.rs
View file

@ -1211,7 +1211,10 @@ pub fn report_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str) {
handler.note_without_error(&note);
}
TyCtxt::try_print_query_stack(&handler, Some(2));
// If backtraces are enabled, also print the query stack
let backtrace = env::var_os("RUST_BACKTRACE").map(|x| &x != "0").unwrap_or(false);
TyCtxt::try_print_query_stack(&handler, Some(2), Some(backtrace));
#[cfg(windows)]
unsafe {

10
compiler/rustc_middle/src/ty/query/plumbing.rs
View file

@ -124,7 +124,11 @@ impl<'tcx> TyCtxt<'tcx> {
})
}
pub fn try_print_query_stack(handler: &Handler, num_frames: Option<usize>) {
pub fn try_print_query_stack(
handler: &Handler,
num_frames: Option<usize>,
backtrace: Option<bool>,
) {
eprintln!("query stack during panic:");
// Be careful reyling on global state here: this code is called from
@ -138,9 +142,9 @@ impl<'tcx> TyCtxt<'tcx> {
let mut i = 0;
while let Some(query) = current_query {
if i == num_frames.unwrap() {
if backtrace.unwrap() == false && i == num_frames.unwrap() {
break;
}
}
let query_info =
if let Some(info) = query_map.as_ref().and_then(|map| map.get(&query)) {
info

5
src/tools/clippy/src/driver.rs
View file

@ -274,7 +274,10 @@ fn report_clippy_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str) {
handler.note_without_error(&note);
}
TyCtxt::try_print_query_stack(&handler, Some(2));
// If backtraces are enabled, also print the query stack
let backtrace = env::var_os("RUST_BACKTRACE").map_or(false, |x| &x != "0");
TyCtxt::try_print_query_stack(&handler, Some(2), Some(backtrace));
}
fn toolchain_path(home: Option<String>, toolchain: Option<String>) -> Option<PathBuf> {