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

equate the user_ty of a constant with its declared ty

Browse Source
This commit is contained in:
Niko Matsakis 2018-08-09 06:23:52 -04:00
parent e23ad83fbc
commit 5f1643d2ea
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/librustc_mir/borrow_check/nll/type_check/mod.rs
View File

@ -15,7 +15,7 @@ use borrow_check::borrow_set::BorrowSet;
use borrow_check::location::LocationTable; use borrow_check::location::LocationTable;
use borrow_check::nll::constraints::{ConstraintSet, OutlivesConstraint}; use borrow_check::nll::constraints::{ConstraintSet, OutlivesConstraint};
use borrow_check::nll::facts::AllFacts; use borrow_check::nll::facts::AllFacts;
use borrow_check::nll::region_infer::values::{RegionValueElements, LivenessValues}; use borrow_check::nll::region_infer::values::{LivenessValues, RegionValueElements};
use borrow_check::nll::region_infer::{ClosureRegionRequirementsExt, TypeTest}; use borrow_check::nll::region_infer::{ClosureRegionRequirementsExt, TypeTest};
use borrow_check::nll::type_check::free_region_relations::{CreateResult, UniversalRegionRelations}; use borrow_check::nll::type_check::free_region_relations::{CreateResult, UniversalRegionRelations};
use borrow_check::nll::type_check::liveness::liveness_map::NllLivenessMap; use borrow_check::nll::type_check::liveness::liveness_map::NllLivenessMap;
@ -256,6 +256,22 @@ impl<'a, 'b, 'gcx, 'tcx> Visitor<'tcx> for TypeVerifier<'a, 'b, 'gcx, 'tcx> {
self.super_constant(constant, location); self.super_constant(constant, location);
self.sanitize_constant(constant, location); self.sanitize_constant(constant, location);
self.sanitize_type(constant, constant.ty); self.sanitize_type(constant, constant.ty);
if let Some(user_ty) = constant.user_ty {
if let Err(terr) =
self.cx
.eq_canonical_type_and_type(user_ty, constant.ty, location.boring())
{
span_mirbug!(
self,
constant,
"bad constant user type {:?} vs {:?}: {:?}",
user_ty,
constant.ty,
terr,
);
}
}
} }
fn visit_rvalue(&mut self, rvalue: &Rvalue<'tcx>, location: Location) { fn visit_rvalue(&mut self, rvalue: &Rvalue<'tcx>, location: Location) {
@ -343,8 +359,7 @@ impl<'a, 'b, 'gcx, 'tcx> TypeVerifier<'a, 'b, 'gcx, 'tcx> {
debug!("sanitize_constant: expected_ty={:?}", constant.literal.ty); debug!("sanitize_constant: expected_ty={:?}", constant.literal.ty);
if let Err(terr) = self if let Err(terr) = self.cx
.cx
.eq_types(constant.literal.ty, constant.ty, location.boring()) .eq_types(constant.literal.ty, constant.ty, location.boring())
{ {
span_mirbug!( span_mirbug!(