Skip to content

Commit

Permalink
put file and line into miri backtrace
Browse files Browse the repository at this point in the history
  • Loading branch information
@RalfJung
RalfJung committed Nov 14, 2018
1 parent fb5135a commit b396505
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 54 deletions.
11 changes: 8 additions & 3 deletions src/librustc/mir/interpret/error.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use backtrace::Backtrace;
use ty::query::TyCtxtAt;
use errors::DiagnosticBuilder;

use syntax_pos::Span;
use syntax_pos::{Pos, Span};
use syntax::ast;
use syntax::symbol::Symbol;

Expand Down Expand Up @@ -68,10 +68,15 @@ impl<'tcx> fmt::Display for FrameInfo<'tcx> {
if tcx.def_key(self.instance.def_id()).disambiguated_data.data
== DefPathData::ClosureExpr
{
write!(f, "inside call to closure")
write!(f, "inside call to closure")?;
} 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(())
})
}
}
Expand Down
102 changes: 51 additions & 51 deletions src/test/ui/infinite/infinite-recursion-const-fn.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,61 +5,61 @@ LL | const fn a() -> usize { b() } //~ ERROR evaluation of constant value failed
| ^^^
| |
| 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() }
| ---
| |
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a`
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
| inside call to `a` at $DIR/infinite-recursion-const-fn.rs:14:25
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

Expand Down

0 comments on commit b396505

Please sign in to comment.