diff options
| author | Ralf Jung <post@ralfj.de> | 2020-06-13 13:55:01 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2020-06-13 13:55:01 +0200 |
| commit | c6512fd4e959d1c19ee7b428a78696a53ab28bc6 (patch) | |
| tree | 102ed89a61f3df2e6b5ec48ac604a0b3d1a0cfc8 /src | |
| parent | 60496504ac635b3f805e8afed5eb6130b620f790 (diff) | |
| download | rust-c6512fd4e959d1c19ee7b428a78696a53ab28bc6.tar.gz rust-c6512fd4e959d1c19ee7b428a78696a53ab28bc6.zip | |
run const_eval_raw with root_span
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_mir/interpret/eval_context.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/infinite/infinite-recursion-const-fn.stderr | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs index 4a0981a95a6..5d344e9b372 100644 --- a/src/librustc_mir/interpret/eval_context.rs +++ b/src/librustc_mir/interpret/eval_context.rs @@ -891,7 +891,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { // FIXME: We can hit delay_span_bug if this is an invalid const, interning finds // that problem, but we never run validation to show an error. Can we ensure // this does not happen? - let val = self.tcx.at(self.cur_span()).const_eval_raw(param_env.and(gid))?; + let val = self.tcx_at().const_eval_raw(param_env.and(gid))?; self.raw_const_to_mplace(val) } diff --git a/src/test/ui/infinite/infinite-recursion-const-fn.stderr b/src/test/ui/infinite/infinite-recursion-const-fn.stderr index 6bd5e035f57..de0c579f630 100644 --- a/src/test/ui/infinite/infinite-recursion-const-fn.stderr +++ b/src/test/ui/infinite/infinite-recursion-const-fn.stderr @@ -1,14 +1,14 @@ error[E0391]: cycle detected when const-evaluating `a` - --> $DIR/infinite-recursion-const-fn.rs:3:25 + --> $DIR/infinite-recursion-const-fn.rs:3:1 | LL | const fn a() -> usize { b() } - | ^^^ + | ^^^^^^^^^^^^^^^^^^^^^ | note: ...which requires const-evaluating `b`... - --> $DIR/infinite-recursion-const-fn.rs:4:25 + --> $DIR/infinite-recursion-const-fn.rs:4:1 | LL | const fn b() -> usize { a() } - | ^^^ + | ^^^^^^^^^^^^^^^^^^^^^ = note: ...which again requires const-evaluating `a`, completing the cycle note: cycle used when const-evaluating `ARR::{{constant}}#0` --> $DIR/infinite-recursion-const-fn.rs:5:18 |