From: Philip Herron <[email protected]>
When we are in a const context what can happen is we start to query all
non const types during method resolution for example which means its going
to query fn signitures and fully resolve their blocks for non const
candidates.
gcc/rust/ChangeLog:
* typecheck/rust-type-util.cc (query_type): dont query non const
candidates
Signed-off-by: Philip Herron <[email protected]>
---
This change was merged into the gccrs repository and is posted here for
upstream visibility and potential drive-by review, as requested by GCC
release managers.
Each commit email contains a link to its details on github from where you can
find the Pull-Request and associated discussions.
Commit on github:
https://github.com/Rust-GCC/gccrs/commit/eaf49ee2856dfa1a025af1985941df0d73775ba3
The commit has NOT been mentioned in any issue.
The commit has been mentioned in the following pull-request(s):
- https://github.com/Rust-GCC/gccrs/pull/4881
gcc/rust/typecheck/rust-type-util.cc | 48 +++++++++++++++++-----------
1 file changed, 30 insertions(+), 18 deletions(-)
diff --git a/gcc/rust/typecheck/rust-type-util.cc
b/gcc/rust/typecheck/rust-type-util.cc
index 226ea747b..8f97d60e3 100644
--- a/gcc/rust/typecheck/rust-type-util.cc
+++ b/gcc/rust/typecheck/rust-type-util.cc
@@ -79,26 +79,28 @@ query_type (HirId reference, TyTy::BaseType **result)
bool is_local = item_defid.crateNum == mappings.get_current_crate ();
bool is_fn
= item.value ()->get_item_kind () == HIR::Item::ItemKind::Function;
- if (!context->const_context_p ())
+ bool is_const_fn = false;
+ if (is_fn)
{
- if (is_fn && is_local)
- {
- HIR::Function &fn = *static_cast<HIR::Function *> (item.value ());
- *result = TypeCheckItem::ResolveFunctionSignature (fn);
- }
- else if (item.value ()->get_item_kind () == HIR::Item::ItemKind::Trait
- && is_local)
- {
- HIR::Trait &trait = *static_cast<HIR::Trait *> (item.value ());
- *result = TypeCheckItem::ResolveTraitSignature (trait);
- }
- else
- *result = TypeCheckItem::Resolve (*item.value ());
+ auto &fn = *static_cast<HIR::Function *> (item.value ());
+ is_const_fn = fn.get_qualifiers ().is_const ();
}
- else
+
+ bool needs_full_resolve_for_const
+ = is_fn && context->const_context_p () && is_const_fn;
+ if (is_fn && is_local && !needs_full_resolve_for_const)
{
- *result = TypeCheckItem::Resolve (*item.value ());
+ HIR::Function &fn = *static_cast<HIR::Function *> (item.value ());
+ *result = TypeCheckItem::ResolveFunctionSignature (fn);
}
+ else if (item.value ()->get_item_kind () == HIR::Item::ItemKind::Trait
+ && is_local && !context->const_context_p ())
+ {
+ HIR::Trait &trait = *static_cast<HIR::Trait *> (item.value ());
+ *result = TypeCheckItem::ResolveTraitSignature (trait);
+ }
+ else
+ *result = TypeCheckItem::Resolve (*item.value ());
context->query_completed (reference);
return true;
@@ -163,8 +165,18 @@ query_type (HirId reference, TyTy::BaseType **result)
DefId item_defid = impl_item->first->get_impl_mappings ().get_defid ();
bool is_local = item_defid.crateNum == mappings.get_current_crate ();
- if (impl_item->first->get_impl_item_type () == HIR::ImplItem::FUNCTION
- && is_local && !context->const_context_p ())
+ bool is_fn
+ = impl_item->first->get_impl_item_type () == HIR::ImplItem::FUNCTION;
+ bool is_const_fn = false;
+ if (is_fn)
+ {
+ auto &fn = *static_cast<HIR::Function *> (impl_item->first);
+ is_const_fn = fn.get_qualifiers ().is_const ();
+ }
+
+ bool needs_full_resolve_for_const
+ = is_fn && context->const_context_p () && is_const_fn;
+ if (is_fn && is_local && !needs_full_resolve_for_const)
{
HIR::Function &fn = *static_cast<HIR::Function *> (impl_item->first);
*result = TypeCheckImplItem::ResolveFunctionSignature (
base-commit: c50c70727027e2c88b74caf54b260690ea515b34
--
2.55.0
