bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

put file and line into miri backtrace

Browse source
This commit is contained in:
Ralf Jung 2018-11-14 23:14:57 +01:00
parent fb5135a6fc
commit b396505425
2 changed files with 59 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/librustc/mir/interpret/error.rs
View file

@ -23,7 +23,7 @@ use backtrace::Backtrace;
use ty::query::TyCtxtAt; use ty::query::TyCtxtAt;
use errors::DiagnosticBuilder; use errors::DiagnosticBuilder;
use syntax_pos::Span; use syntax_pos::{Pos, Span};
use syntax::ast; use syntax::ast;
use syntax::symbol::Symbol; use syntax::symbol::Symbol;
@ -68,10 +68,15 @@ impl<'tcx> fmt::Display for FrameInfo<'tcx> {
if tcx.def_key(self.instance.def_id()).disambiguated_data.data if tcx.def_key(self.instance.def_id()).disambiguated_data.data
== DefPathData::ClosureExpr == DefPathData::ClosureExpr
{ {
write!(f, "inside call to closure") write!(f, "inside call to closure")?;
} else { } else {
write!(f, "inside call to `{}`", self.instance) write!(f, "inside call to `{}`", self.instance)?;
} }
if !self.span.is_dummy() {
let lo = tcx.sess.source_map().lookup_char_pos_adj(self.span.lo());
write!(f, " at {}:{}:{}", lo.filename, lo.line, lo.col.to_usize() + 1)?;
}
Ok(())
}) })
} }
} }

102
src/test/ui/infinite/infinite-recursion-const-fn.stderr
View file

@ -5,61 +5,61 @@ LL | const fn a() -> usize { b() } //~ ERROR evaluation of constant value failed
| ^^^ | ^^^
| | | |
| reached the configured maximum number of stack frames | reached the configured maximum number of stack frames
| inside call to `b` | inside call to `b` at $DIR/infinite-recursion-const-fn.rs:13:25
LL | const fn b() -> usize { a() } LL | const fn b() -> usize { a() }
| --- | ---
| | | |
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` | inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
LL | const ARR: [i32; a()] = [5; 6]; LL | const ARR: [i32; a()] = [5; 6];
| --- inside call to `a` | --- inside call to `a` at $DIR/infinite-recursion-const-fn.rs:15:18
error: aborting due to previous error error: aborting due to previous error