nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

ICEs should print the top of the query stack

Browse Source
This commit is contained in:
hosseind75 2020-09-19 17:51:24 +04:30 committed by hosseind88
parent be719d11e5
commit 17eb8d8b34
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_driver/src/lib.rs
View File

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

5
compiler/rustc_middle/src/ty/query/plumbing.rs
View File

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

7
src/tools/clippy/src/driver.rs
View File

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