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

Modified how constraint classification happens to upvars, can now handle function call case.

Browse Source
This commit is contained in:
David Wood 2018-07-21 15:03:47 +01:00
parent ce4f446aa8
commit b6dfa8cba3
No known key found for this signature in database
GPG Key ID: 01760B4F9F53F154
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/librustc_mir/borrow_check/nll/region_infer/error_reporting/mod.rs
View File

@ -33,6 +33,7 @@ enum ConstraintCategory {
Assignment, Assignment,
AssignmentToUpvar, AssignmentToUpvar,
Return, Return,
CallArgumentToUpvar,
CallArgument, CallArgument,
Other, Other,
Boring, Boring,
@ -45,7 +46,8 @@ impl fmt::Display for ConstraintCategory {
ConstraintCategory::AssignmentToUpvar => write!(f, "assignment"), ConstraintCategory::AssignmentToUpvar => write!(f, "assignment"),
ConstraintCategory::Return => write!(f, "return"), ConstraintCategory::Return => write!(f, "return"),
ConstraintCategory::Cast => write!(f, "cast"), ConstraintCategory::Cast => write!(f, "cast"),
ConstraintCategory::CallArgument => write!(f, "argument"), ConstraintCategory::CallArgument |
ConstraintCategory::CallArgumentToUpvar => write!(f, "argument"),
_ => write!(f, "free region"), _ => write!(f, "free region"),
} }
} }
@ -133,7 +135,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
&self, &self,
index: ConstraintIndex, index: ConstraintIndex,
mir: &Mir<'tcx>, mir: &Mir<'tcx>,
infcx: &InferCtxt<'_, '_, 'tcx>, _infcx: &InferCtxt<'_, '_, 'tcx>,
) -> (ConstraintCategory, Span) { ) -> (ConstraintCategory, Span) {
let constraint = self.constraints[index]; let constraint = self.constraints[index];
debug!("classify_constraint: constraint={:?}", constraint); debug!("classify_constraint: constraint={:?}", constraint);
@ -163,7 +165,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
match statement.kind { match statement.kind {
StatementKind::Assign(ref place, ref rvalue) => { StatementKind::Assign(ref place, ref rvalue) => {
debug!("classify_constraint: place={:?} rvalue={:?}", place, rvalue); debug!("classify_constraint: place={:?} rvalue={:?}", place, rvalue);
let initial_category = if *place == Place::Local(mir::RETURN_PLACE) { if *place == Place::Local(mir::RETURN_PLACE) {
ConstraintCategory::Return ConstraintCategory::Return
} else { } else {
match rvalue { match rvalue {
@ -172,13 +174,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
Rvalue::Aggregate(..) => ConstraintCategory::Assignment, Rvalue::Aggregate(..) => ConstraintCategory::Assignment,
_ => ConstraintCategory::Other, _ => ConstraintCategory::Other,
} }
};
if initial_category == ConstraintCategory::Assignment
&& place.is_upvar_field_projection(mir, &infcx.tcx).is_some() {
ConstraintCategory::AssignmentToUpvar
} else {
initial_category
} }
} }
_ => ConstraintCategory::Other, _ => ConstraintCategory::Other,
@ -236,8 +231,22 @@ impl<'tcx> RegionInferenceContext<'tcx> {
// Get a span // Get a span
let (category, span) = categorized_path.first().unwrap(); let (category, span) = categorized_path.first().unwrap();
let category = match (
category,
self.universal_regions.is_local_free_region(fr),
self.universal_regions.is_local_free_region(outlived_fr),
) {
(ConstraintCategory::Assignment, true, false) =>
&ConstraintCategory::AssignmentToUpvar,
(ConstraintCategory::CallArgument, true, false) =>
&ConstraintCategory::CallArgumentToUpvar,
(category, _, _) => category,
};
debug!("report_error: category={:?}", category);
match category { match category {
ConstraintCategory::AssignmentToUpvar => ConstraintCategory::AssignmentToUpvar |
ConstraintCategory::CallArgumentToUpvar =>
self.report_closure_error(mir, infcx, fr, outlived_fr, span), self.report_closure_error(mir, infcx, fr, outlived_fr, span),
_ => _ =>
self.report_general_error(mir, infcx, mir_def_id, fr, outlived_fr, category, span), self.report_general_error(mir, infcx, mir_def_id, fr, outlived_fr, category, span),