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

Fix ICE

Browse Source
This commit is contained in:
Matthew Jasper 2020-07-01 21:56:35 +01:00
parent 0dda4154bd
commit 21eccbb587
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_trait_selection/src/traits/select/confirmation.rs
View File

@ -342,7 +342,8 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
) -> ImplSourceObjectData<'tcx, PredicateObligation<'tcx>> { ) -> ImplSourceObjectData<'tcx, PredicateObligation<'tcx>> {
debug!("confirm_object_candidate({:?})", obligation); debug!("confirm_object_candidate({:?})", obligation);
let self_ty = self.infcx.replace_bound_vars_with_placeholders(&obligation.self_ty()); let self_ty = self.infcx.shallow_resolve(obligation.self_ty());
let self_ty = self.infcx.replace_bound_vars_with_placeholders(&self_ty);
let data = match self_ty.kind() { let data = match self_ty.kind() {
ty::Dynamic(data, ..) => data, ty::Dynamic(data, ..) => data,
_ => span_bug!(obligation.cause.span, "object candidate with non-object"), _ => span_bug!(obligation.cause.span, "object candidate with non-object"),
@ -448,7 +449,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
) )
.map_bound(|(trait_ref, _)| trait_ref); .map_bound(|(trait_ref, _)| trait_ref);
let Normalized { value: trait_ref, obligations } = ensure_sufficient_stack(|| { let Normalized { value: trait_ref, mut obligations } = ensure_sufficient_stack(|| {
project::normalize_with_depth( project::normalize_with_depth(
self, self,
obligation.param_env, obligation.param_env,
@ -458,12 +459,12 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
) )
}); });
self.confirm_poly_trait_refs( obligations.extend(self.confirm_poly_trait_refs(
obligation.cause.clone(), obligation.cause.clone(),
obligation.param_env, obligation.param_env,
obligation.predicate.to_poly_trait_ref(), obligation.predicate.to_poly_trait_ref(),
trait_ref, trait_ref,
)?; )?);
Ok(ImplSourceFnPointerData { fn_ty: self_ty, nested: obligations }) Ok(ImplSourceFnPointerData { fn_ty: self_ty, nested: obligations })
} }