bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #82494 - estebank:issue-82455, r=petrochenkov

Browse source 
Substitute erased lifetimes on bad placeholder type

Fix #82455.
This commit is contained in:
Dylan DPC 2021-02-27 02:34:35 +01:00 • committed by GitHub
commit 95b31cf949
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_typeck/src/collect.rs
View file

@ -371,6 +371,11 @@ impl AstConv<'tcx> for ItemCtxt<'tcx> {
span: Span,
) -> &'tcx Const<'tcx> {
bad_placeholder_type(self.tcx(), vec![span]).emit();
// Typeck doesn't expect erased regions to be returned from `type_of`.
let ty = self.tcx.fold_regions(ty, &mut false, |r, _| match r {
ty::ReErased => self.tcx.lifetimes.re_static,
_ => r,
});
self.tcx().const_error(ty)
}
@ -1647,6 +1652,12 @@ fn fn_sig(tcx: TyCtxt<'_>, def_id: DefId) -> ty::PolyFnSig<'_> {
match get_infer_ret_ty(&sig.decl.output) {
Some(ty) => {
let fn_sig = tcx.typeck(def_id).liberated_fn_sigs()[hir_id];
// Typeck doesn't expect erased regions to be returned from `type_of`.
let fn_sig = tcx.fold_regions(fn_sig, &mut false, |r, _| match r {
ty::ReErased => tcx.lifetimes.re_static,
_ => r,
});
let mut visitor = PlaceholderHirTyCollector::default();
visitor.visit_ty(ty);
let mut diag = bad_placeholder_type(tcx, visitor.0);
@ -1675,6 +1686,7 @@ fn fn_sig(tcx: TyCtxt<'_>, def_id: DefId) -> ty::PolyFnSig<'_> {
}
}
diag.emit();
ty::Binder::bind(fn_sig)
}
None => AstConv::ty_of_fn(