-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Rust: Use doublyBoundedFastTC
in TraitIsVisible
#20362
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
hvitved
wants to merge
1
commit into
github:main
Choose a base branch
from
hvitved:rust/trait-is-visible-fasttc
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -1425,24 +1425,56 @@ signature predicate relevantTraitVisibleSig(Element element, Trait trait); | |||||
* at a given element. | ||||||
*/ | ||||||
module TraitIsVisible<relevantTraitVisibleSig/2 relevantTraitVisible> { | ||||||
/** Holds if the trait might be looked up in `encl`. */ | ||||||
private predicate traitLookup(ItemNode encl, Element element, Trait trait) { | ||||||
// lookup in immediately enclosing item | ||||||
relevantTraitVisible(element, trait) and | ||||||
encl.getADescendant() = element | ||||||
private newtype TNode = | ||||||
TTrait(Trait t) { relevantTraitVisible(_, t) } or | ||||||
TItemNode(ItemNode i) or | ||||||
TElement(Element e) { relevantTraitVisible(e, _) } | ||||||
|
||||||
private predicate isTrait(TNode n) { n instanceof TTrait } | ||||||
|
||||||
private predicate step(TNode n1, TNode n2) { | ||||||
exists(Trait t1, ItemNode i2 | | ||||||
n1 = TTrait(t1) and | ||||||
n2 = TItemNode(i2) and | ||||||
t1 = i2.getASuccessor(_, _) | ||||||
) | ||||||
or | ||||||
// lookup in an outer scope, but only if the trait is not declared in inner scope | ||||||
exists(ItemNode mid | | ||||||
traitLookup(mid, element, trait) and | ||||||
not trait = mid.getASuccessor(_, _) and | ||||||
encl = getOuterScope(mid) | ||||||
exists(ItemNode i1, ItemNode i2 | | ||||||
n1 = TItemNode(i1) and | ||||||
n2 = TItemNode(i2) and | ||||||
i1 = getOuterScope(i2) | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The direction of the relationship appears reversed. Based on the original
Suggested change
Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||||
) | ||||||
or | ||||||
exists(ItemNode i1, Element e2 | | ||||||
n1 = TItemNode(i1) and | ||||||
n2 = TElement(e2) and | ||||||
i1.getADescendant() = e2 | ||||||
) | ||||||
} | ||||||
|
||||||
private predicate isElement(TNode n) { n instanceof TElement } | ||||||
|
||||||
private predicate traitIsVisibleTC(TNode trait, TNode element) = | ||||||
doublyBoundedFastTC(step/2, isTrait/1, isElement/1)(trait, element) | ||||||
|
||||||
pragma[nomagic] | ||||||
private predicate relevantTraitVisibleLift(TNode trait, TElement element) { | ||||||
exists(Trait t, Element e | | ||||||
trait = TTrait(t) and | ||||||
element = TElement(e) and | ||||||
relevantTraitVisible(e, t) | ||||||
) | ||||||
} | ||||||
|
||||||
/** Holds if the trait `trait` is visible at `element`. */ | ||||||
pragma[nomagic] | ||||||
predicate traitIsVisible(Element element, Trait trait) { | ||||||
exists(ItemNode encl | traitLookup(encl, element, trait) and trait = encl.getASuccessor(_, _)) | ||||||
exists(TNode t, TNode e | | ||||||
traitIsVisibleTC(t, e) and | ||||||
relevantTraitVisibleLift(t, e) and | ||||||
t = TTrait(trait) and | ||||||
e = TElement(element) | ||||||
) | ||||||
} | ||||||
} | ||||||
|
||||||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
getASuccessor
call is missing the requiredname
parameter. Based on the context, this should bet1 = i2.getASuccessor(_, _)
where the first underscore represents the name parameter.Copilot uses AI. Check for mistakes.