nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 09:14:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #91815 - RalfJung:span, r=oli-obk

Browse Source 
better span for unexpected normalization failure in CTFE engine

No reason to use `DUMMY_SP` here.
This commit is contained in:
Matthias Krüger 2021-12-12 07:45:31 +01:00 committed by GitHub
commit 6d9d8de029
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_const_eval/src/interpret/eval_context.rs
View File

@ -15,7 +15,7 @@ use rustc_middle::ty::{
use rustc_mir_dataflow::storage::AlwaysLiveLocals; use rustc_mir_dataflow::storage::AlwaysLiveLocals;
use rustc_query_system::ich::StableHashingContext; use rustc_query_system::ich::StableHashingContext;
use rustc_session::Limit; use rustc_session::Limit;
use rustc_span::{Pos, Span, DUMMY_SP}; use rustc_span::{Pos, Span};
use rustc_target::abi::{Align, HasDataLayout, Size, TargetDataLayout}; use rustc_target::abi::{Align, HasDataLayout, Size, TargetDataLayout};
use super::{ use super::{
@ -525,7 +525,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
.try_subst_mir_and_normalize_erasing_regions(*self.tcx, self.param_env, value) .try_subst_mir_and_normalize_erasing_regions(*self.tcx, self.param_env, value)
.or_else(|e| { .or_else(|e| {
self.tcx.sess.delay_span_bug( self.tcx.sess.delay_span_bug(
DUMMY_SP, self.cur_span(),
format!("failed to normalize {}", e.get_type_for_failure()).as_str(), format!("failed to normalize {}", e.get_type_for_failure()).as_str(),
); );