OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avoid computing precise span for const_eval query

This commit is contained in:
Ralf Jung 2020-06-13 13:47:37 +02:00
parent 32b01c78d0
commit 60496504ac
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc_mir/interpret/eval_context.rs
View File

@ -860,7 +860,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
} else { } else {
self.param_env self.param_env
}; };
let val = self.tcx.const_eval_global_id(param_env, gid, Some(self.cur_span()))?; let val = self.tcx.const_eval_global_id(param_env, gid, Some(self.root_span))?;
// Even though `ecx.const_eval` is called from `eval_const_to_op` we can never have a // Even though `ecx.const_eval` is called from `eval_const_to_op` we can never have a
// recursion deeper than one level, because the `tcx.const_eval` above is guaranteed to not // recursion deeper than one level, because the `tcx.const_eval` above is guaranteed to not

4
src/test/ui/consts/const-size_of-cycle.stderr
View File

@ -17,8 +17,8 @@ LL | bytes: [u8; std::mem::size_of::<Foo>()]
note: ...which requires const-evaluating `std::mem::size_of`... note: ...which requires const-evaluating `std::mem::size_of`...
--> $SRC_DIR/libcore/mem/mod.rs:LL:COL --> $SRC_DIR/libcore/mem/mod.rs:LL:COL
| |
LL | intrinsics::size_of::<T>() LL | pub const fn size_of<T>() -> usize {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: ...which requires const-evaluating + checking `std::intrinsics::size_of`... note: ...which requires const-evaluating + checking `std::intrinsics::size_of`...
--> $SRC_DIR/libcore/intrinsics.rs:LL:COL --> $SRC_DIR/libcore/intrinsics.rs:LL:COL
| |