OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests 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 2124e9b50e
commit 2b91b7fba9
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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