aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPhilip Herron <herron.philip@googlemail.com>2025-02-03 15:15:40 +0000
committerPhilip Herron <philip.herron@embecosm.com>2025-02-03 19:20:26 +0000
commit218df42d73bb853c3ee080ffaafb12f6522fc31c (patch)
treed8000aab7d555cfe70534c473887340583f571f2 /gcc
parent9449c935b39d963f62be2a41df91671fc163685b (diff)
downloadgcc-218df42d73bb853c3ee080ffaafb12f6522fc31c.zip
gcc-218df42d73bb853c3ee080ffaafb12f6522fc31c.tar.gz
gcc-218df42d73bb853c3ee080ffaafb12f6522fc31c.tar.bz2
gccrs: Fix ICE during path probe
It is valid for the query to fail here so its valid to not assert here. gcc/rust/ChangeLog: * typecheck/rust-hir-path-probe.cc (PathProbeType::visit): remove assertion Signed-off-by: Philip Herron <herron.philip@googlemail.com>
Diffstat (limited to 'gcc')
-rw-r--r--gcc/rust/typecheck/rust-hir-path-probe.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/rust/typecheck/rust-hir-path-probe.cc b/gcc/rust/typecheck/rust-hir-path-probe.cc
index 16976c3..cdb2c58 100644
--- a/gcc/rust/typecheck/rust-hir-path-probe.cc
+++ b/gcc/rust/typecheck/rust-hir-path-probe.cc
@@ -212,8 +212,8 @@ PathProbeType::visit (HIR::TypeAlias &alias)
{
HirId tyid = alias.get_mappings ().get_hirid ();
TyTy::BaseType *ty = nullptr;
- bool ok = query_type (tyid, &ty);
- rust_assert (ok);
+ if (!query_type (tyid, &ty))
+ return;
PathProbeCandidate::ImplItemCandidate impl_item_candidate{&alias,
current_impl};
@@ -232,8 +232,8 @@ PathProbeType::visit (HIR::ConstantItem &constant)
{
HirId tyid = constant.get_mappings ().get_hirid ();
TyTy::BaseType *ty = nullptr;
- bool ok = query_type (tyid, &ty);
- rust_assert (ok);
+ if (!query_type (tyid, &ty))
+ return;
PathProbeCandidate::ImplItemCandidate impl_item_candidate{&constant,
current_impl};
@@ -252,8 +252,8 @@ PathProbeType::visit (HIR::Function &function)
{
HirId tyid = function.get_mappings ().get_hirid ();
TyTy::BaseType *ty = nullptr;
- bool ok = query_type (tyid, &ty);
- rust_assert (ok);
+ if (!query_type (tyid, &ty))
+ return;
PathProbeCandidate::ImplItemCandidate impl_item_candidate{&function,
current_impl};