diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-01-25 17:00:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 17:00:21 +0000 |
| commit | 1fc2b540800d25af1c70e90439e8a9077c7d07f8 (patch) | |
| tree | 88328f8b601a74c4b87fa6409a8284365f3d0071 /gcc/rust | |
| parent | 5f2973fe0e322380bd5f3f4ea35b657efbf86efa (diff) | |
| parent | 234816ac9d919505f2ddf2cdf9e83a10de7e3ced (diff) | |
| download | gcc-1fc2b540800d25af1c70e90439e8a9077c7d07f8.zip gcc-1fc2b540800d25af1c70e90439e8a9077c7d07f8.tar.gz gcc-1fc2b540800d25af1c70e90439e8a9077c7d07f8.tar.bz2 | |
Merge #892
892: Remove bad assertion when resolving segments r=philberty a=philberty
When resolving segments in a path generics ones can match types in othe
impl blocks which will not be compiled yet so this assertion is bad.
Fixes #862
Co-authored-by: Philip Herron <philip.herron@embecosm.com>
Diffstat (limited to 'gcc/rust')
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-path-probe.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/rust/typecheck/rust-hir-path-probe.h b/gcc/rust/typecheck/rust-hir-path-probe.h index caacc2a..50d660c 100644 --- a/gcc/rust/typecheck/rust-hir-path-probe.h +++ b/gcc/rust/typecheck/rust-hir-path-probe.h @@ -280,8 +280,8 @@ protected: current_impl = impl; HirId impl_ty_id = impl->get_type ()->get_mappings ().get_hirid (); TyTy::BaseType *impl_block_ty = nullptr; - bool ok = context->lookup_type (impl_ty_id, &impl_block_ty); - rust_assert (ok); + if (!context->lookup_type (impl_ty_id, &impl_block_ty)) + return; if (!receiver->can_eq (impl_block_ty, false)) return; |