diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-10-17 18:18:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-17 18:18:58 +0200 |
| commit | 0f1ba8d8c786f625934908d7681f9779e21668b5 (patch) | |
| tree | 31e8e9717ae021101eb62db728ed638fbfb4a47d /compiler | |
| parent | 1520fffecc2ba17c4e0ca63fe9915e56b46d59be (diff) | |
| parent | f001e8c519c68a2233e56ea64b4bfe8c7fedf0ea (diff) | |
| download | rust-0f1ba8d8c786f625934908d7681f9779e21668b5.tar.gz rust-0f1ba8d8c786f625934908d7681f9779e21668b5.zip | |
Rollup merge of #89946 - JohnTitor:fix-89686, r=petrochenkov
Fix an ICE with TAITs and Future Fixes #89686
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_middle/src/ty/error.rs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/compiler/rustc_middle/src/ty/error.rs b/compiler/rustc_middle/src/ty/error.rs index 08b4d3aecda..bac681bd96f 100644 --- a/compiler/rustc_middle/src/ty/error.rs +++ b/compiler/rustc_middle/src/ty/error.rs @@ -769,11 +769,16 @@ fn foo(&self) -> Self::T { String::new() } ) -> bool { let assoc = self.associated_item(proj_ty.item_def_id); if let ty::Opaque(def_id, _) = *proj_ty.self_ty().kind() { - let opaque_local_def_id = def_id.expect_local(); - let opaque_hir_id = self.hir().local_def_id_to_hir_id(opaque_local_def_id); - let opaque_hir_ty = match &self.hir().expect_item(opaque_hir_id).kind { - hir::ItemKind::OpaqueTy(opaque_hir_ty) => opaque_hir_ty, - _ => bug!("The HirId comes from a `ty::Opaque`"), + let opaque_local_def_id = def_id.as_local(); + let opaque_hir_ty = if let Some(opaque_local_def_id) = opaque_local_def_id { + let hir = self.hir(); + let opaque_hir_id = hir.local_def_id_to_hir_id(opaque_local_def_id); + match &hir.expect_item(opaque_hir_id).kind { + hir::ItemKind::OpaqueTy(opaque_hir_ty) => opaque_hir_ty, + _ => bug!("The HirId comes from a `ty::Opaque`"), + } + } else { + return false; }; let (trait_ref, assoc_substs) = proj_ty.trait_ref_and_own_substs(self); |
