Skip to content

Shared: Make some generalizations in type inference library #20358

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+279 −109
Open

Shared: Make some generalizations in type inference library #20358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions rust/ql/lib/codeql/rust/internal/TypeInference.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1902,7 +1902,9 @@ private predicate isMethodCall(MethodCall mc, Type rootType, string name, int ar
arity = mc.getNumberOfArguments()
}

private module IsInstantiationOfInput implements IsInstantiationOfInputSig<MethodCall> {
private module IsInstantiationOfInput implements
IsInstantiationOfInputSig<MethodCall, TypeMentionTypeTree>
{
/** Holds if `mc` specifies a trait and might target a method in `impl`. */
pragma[nomagic]
private predicate methodCallTraitCandidate(MethodCall mc, Impl impl) {
Expand Down Expand Up @@ -1931,7 +1933,9 @@ private module IsInstantiationOfInput implements IsInstantiationOfInputSig<Metho
private TypeRepr getImplSelfTy(Impl impl) { result = impl.getSelfTy() }

pragma[nomagic]
predicate potentialInstantiationOf(MethodCall mc, TypeAbstraction impl, TypeMention constraint) {
predicate potentialInstantiationOf(
MethodCall mc, TypeAbstraction impl, TypeMentionTypeTree constraint
) {
constraint = getImplSelfTy(impl) and
(
methodCallTraitCandidate(mc, impl)
Expand All @@ -1950,7 +1954,7 @@ private module IsInstantiationOfInput implements IsInstantiationOfInputSig<Metho
)
}

predicate relevantTypeMention(TypeMention constraint) {
predicate relevantTypeMention(TypeMentionTypeTree constraint) {
exists(Impl impl | methodCandidate(_, _, _, impl) and constraint = impl.getSelfTy())
}
}
Expand Down Expand Up @@ -2111,14 +2115,16 @@ private predicate methodCallHasNoInherentTarget(MethodCall mc) {
methodCandidate(rootType, name, arity, impl) and
not impl.hasTrait()
|
IsInstantiationOf<MethodCall, IsInstantiationOfInput>::isNotInstantiationOf(mc, impl, _)
IsInstantiationOf<MethodCall, TypeMentionTypeTree, IsInstantiationOfInput>::isNotInstantiationOf(mc,
impl, _)
)
)
}

pragma[nomagic]
private predicate methodCallHasImplCandidate(MethodCall mc, Impl impl) {
IsInstantiationOf<MethodCall, IsInstantiationOfInput>::isInstantiationOf(mc, impl, _) and
IsInstantiationOf<MethodCall, TypeMentionTypeTree, IsInstantiationOfInput>::isInstantiationOf(mc,
impl, _) and
if impl.hasTrait() and not exists(mc.getTrait())
then
// inherent methods take precedence over trait methods, so only allow
Expand Down Expand Up @@ -2259,11 +2265,11 @@ private class AmbigousAssocFunctionCallExpr extends MkAmbigousAssocFunctionCallE
}

private module AmbigousAssocFuncIsInstantiationOfInput implements
IsInstantiationOfInputSig<AmbigousAssocFunctionCallExpr>
IsInstantiationOfInputSig<AmbigousAssocFunctionCallExpr, TypeMentionTypeTree>
{
pragma[nomagic]
predicate potentialInstantiationOf(
AmbigousAssocFunctionCallExpr ce, TypeAbstraction impl, TypeMention constraint
AmbigousAssocFunctionCallExpr ce, TypeAbstraction impl, TypeMentionTypeTree constraint
) {
exists(FunctionCallExpr call, Function resolved, Function cand, int pos |
ce = MkAmbigousAssocFunctionCallExpr(call, resolved, pos) and
Expand All @@ -2289,7 +2295,7 @@ private ItemNode resolveUnambigousFunctionCallTarget(FunctionCallExpr call) {
pragma[nomagic]
private Function resolveAmbigousFunctionCallTargetFromIndex(FunctionCallExpr call, int index) {
exists(Impl impl, int pos, Function resolved |
IsInstantiationOf<AmbigousAssocFunctionCallExpr, AmbigousAssocFuncIsInstantiationOfInput>::isInstantiationOf(MkAmbigousAssocFunctionCallExpr(call,
IsInstantiationOf<AmbigousAssocFunctionCallExpr, TypeMentionTypeTree, AmbigousAssocFuncIsInstantiationOfInput>::isInstantiationOf(MkAmbigousAssocFunctionCallExpr(call,
resolved, pos), impl, _) and
result = call.getAnAmbigousCandidateRanked(impl, pos, resolved, index)
|
Expand Down
Loading
Loading