mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #116374 - ouz-a:correct_message, r=RalfJung

Browse Source 
Print normalized ty

Inside `mir_assign_valid_types` we are comparing normalized type of `mir_place` but in debug message we are not printing the normalized value, this changes that.
This commit is contained in:
Matthias Krüger 2023-10-03 12:24:13 +02:00 committed by GitHub
commit 7ba649806f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/rustc_const_eval/src/interpret/operand.rs
View File

@ -670,19 +670,24 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
trace!("eval_place_to_op: got {:?}", op); trace!("eval_place_to_op: got {:?}", op);
// Sanity-check the type we ended up with. // Sanity-check the type we ended up with.
debug_assert!( if cfg!(debug_assertions) {
mir_assign_valid_types( let normalized_place_ty = self.subst_from_current_frame_and_normalize_erasing_regions(
mir_place.ty(&self.frame().body.local_decls, *self.tcx).ty,
)?;
if !mir_assign_valid_types(
*self.tcx, *self.tcx,
self.param_env, self.param_env,
self.layout_of(self.subst_from_current_frame_and_normalize_erasing_regions( self.layout_of(normalized_place_ty)?,
mir_place.ty(&self.frame().body.local_decls, *self.tcx).ty
)?)?,
op.layout, op.layout,
), ) {
"eval_place of a MIR place with type {:?} produced an interpreter operand with type {}", span_bug!(
mir_place.ty(&self.frame().body.local_decls, *self.tcx).ty, self.cur_span(),
op.layout.ty, "eval_place of a MIR place with type {} produced an interpreter operand with type {}",
); normalized_place_ty,
op.layout.ty,
)
}
}
Ok(op) Ok(op)
} }

25
compiler/rustc_const_eval/src/interpret/place.rs
View File

@ -573,19 +573,24 @@ where
trace!("{:?}", self.dump_place(&place)); trace!("{:?}", self.dump_place(&place));
// Sanity-check the type we ended up with. // Sanity-check the type we ended up with.
debug_assert!( if cfg!(debug_assertions) {
mir_assign_valid_types( let normalized_place_ty = self.subst_from_current_frame_and_normalize_erasing_regions(
mir_place.ty(&self.frame().body.local_decls, *self.tcx).ty,
)?;
if !mir_assign_valid_types(
*self.tcx, *self.tcx,
self.param_env, self.param_env,
self.layout_of(self.subst_from_current_frame_and_normalize_erasing_regions( self.layout_of(normalized_place_ty)?,
mir_place.ty(&self.frame().body.local_decls, *self.tcx).ty
)?)?,
place.layout, place.layout,
), ) {
"eval_place of a MIR place with type {:?} produced an interpreter place with type {}", span_bug!(
mir_place.ty(&self.frame().body.local_decls, *self.tcx).ty, self.cur_span(),
place.layout.ty, "eval_place of a MIR place with type {} produced an interpreter place with type {}",
); normalized_place_ty,
place.layout.ty,
)
}
}
Ok(place) Ok(place)
} }