nr2.0: Run DefaultResolver::visit on PathInExpression
#3418
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CohenArthur
approved these changes
Feb 4, 2025
gcc/rust/ChangeLog: * resolve/rust-forever-stack.hxx (ForeverStack::find_starting_point): Be more careful about applying ForeverStack::find_closest_module. (ForeverStack::resolve_segments): Allow traversal into parent nodes when not in a module node or root node, which ForeverStack::find_starting_point previously made moot through use of ForeverStack::find_closest_module. Also, when a child node lookup fails when resolving in the type namespace, attempt a rib lookup as a fallback. * resolve/rust-late-name-resolver-2.0.cc (Late::visit): Avoid throwing a resolution error for type paths when the typechecker may be able to finish the resolution. Also, throw an error when a resolution is ambiguous. gcc/testsuite/ChangeLog: * rust/compile/nr2/exclude: Remove entries. Signed-off-by: Owen Avery <[email protected]>
gcc/rust/ChangeLog: * resolve/rust-late-name-resolver-2.0.cc (Late::visit): When visiting a PathInExpression instance, call into DefaultResolver::visit, ensuring generic arguments are visited. gcc/testsuite/ChangeLog: * rust/compile/nr2/exclude: Remove entries. Signed-off-by: Owen Avery <[email protected]>
philberty
reviewed
Feb 5, 2025
| @@ -469,27 +464,48 @@ ForeverStack<N>::resolve_segments ( | |||
|
|
|||
| tl::optional<typename ForeverStack<N>::Node &> child = tl::nullopt; | |||
|
|
|||
| for (auto &kv : current_node->children) | |||
| while (true) | |||
There was a problem hiding this comment.
sometimes these are unavoidable but definitely double check to ensure this will terminate you could add a comment to say why this is fine and does terminate might be enough
philberty
reviewed
Feb 5, 2025
| return tl::nullopt; | ||
| } | ||
|
|
||
| current_node = ¤t_node->parent.value (); |
There was a problem hiding this comment.
maybe the current_node.has_value () might be worth being part of the loop predicate but tbh i dont know this code enough to make you change anything here
There was a problem hiding this comment.
The for loop may set the value of child
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Based on #3416