1
Fork 0

Use its own TypeckResults to avoid ICE

This commit is contained in:
Yuki Okushi 2020-10-25 18:33:13 +09:00
commit 88d39673d7
4 changed files with 23 additions and 4 deletions

View file

@ -630,9 +630,14 @@ impl<'tcx> SaveContext<'tcx> {
}) })
| Node::Ty(&hir::Ty { kind: hir::TyKind::Path(ref qpath), .. }) => match qpath { | Node::Ty(&hir::Ty { kind: hir::TyKind::Path(ref qpath), .. }) => match qpath {
hir::QPath::Resolved(_, path) => path.res, hir::QPath::Resolved(_, path) => path.res,
hir::QPath::TypeRelative(..) | hir::QPath::LangItem(..) => self hir::QPath::TypeRelative(..) | hir::QPath::LangItem(..) => {
.maybe_typeck_results // #75962: `self.typeck_results` may be different from the `hir_id`'s result.
.map_or(Res::Err, |typeck_results| typeck_results.qpath_res(qpath, hir_id)), if self.tcx.has_typeck_results(hir_id.owner.to_def_id()) {
self.tcx.typeck(hir_id.owner).qpath_res(qpath, hir_id)
} else {
Res::Err
}
}
}, },
Node::Binding(&hir::Pat { Node::Binding(&hir::Pat {

View file

@ -1,5 +1,5 @@
warning: the feature `impl_trait_in_bindings` is incomplete and may not be safe to use and/or cause compiler crashes warning: the feature `impl_trait_in_bindings` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/bound-normalization-pass.rs:5:12 --> $DIR/bound-normalization-pass.rs:8:12
| |
LL | #![feature(impl_trait_in_bindings)] LL | #![feature(impl_trait_in_bindings)]
| ^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^

View file

@ -1,5 +1,8 @@
// check-pass // check-pass
// edition:2018 // edition:2018
// revisions: default sa
//[sa] compile-flags: -Z save-analysis
//-^ To make this the regression test for #75962.
#![feature(type_alias_impl_trait)] #![feature(type_alias_impl_trait)]
#![feature(impl_trait_in_bindings)] #![feature(impl_trait_in_bindings)]

View file

@ -0,0 +1,11 @@
warning: the feature `impl_trait_in_bindings` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/bound-normalization-pass.rs:8:12
|
LL | #![feature(impl_trait_in_bindings)]
| ^^^^^^^^^^^^^^^^^^^^^^
|
= note: `#[warn(incomplete_features)]` on by default
= note: see issue #63065 <https://github.com/rust-lang/rust/issues/63065> for more information
warning: 1 warning emitted