hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-02-12 05:01:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rust: Make TypeMention directly satisfy HasTypeTree

Browse Source
This commit is contained in:
Simon Friis Vindum
2026-01-26 09:46:33 +01:00
parent 7100ca4262
commit 452d307fd5
8 changed files with 83 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
View File

@@ -224,7 +224,7 @@ private module Debug {
sc.propagatesFlow(input, _, _, _) and
input.head() = SummaryComponent::argument(pos) and
p = pos.getParameterIn(sc.getParamList()) and
tm.resolveType() instanceof RefType and
tm.getType() instanceof RefType and
not input.tail().head() = SummaryComponent::content(TSingletonContentSet(TReferenceContent()))
|
tm = p.getTypeRepr()
@@ -239,7 +239,7 @@ private module Debug {
exists(TypeMention tm |
relevantManualModel(sc, can) and
sc.propagatesFlow(_, output, _, _) and
tm.resolveType() instanceof RefType and
tm.getType() instanceof RefType and
output.head() = SummaryComponent::return(_) and
not output.tail().head() =
SummaryComponent::content(TSingletonContentSet(TReferenceContent())) and

4
rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll
View File

@@ -47,8 +47,8 @@ predicate isBlanketLike(ImplItemNode i, TypePath blanketSelfPath, TypeParam blan
exists(TypeMention tm, Type root, TypeParameter tp |
tm = i.(Impl).getSelfTy() and
complexSelfRoot(root, tp) and
tm.resolveType() = root and
tm.resolveTypeAt(blanketSelfPath) = TTypeParamTypeParameter(blanketTypeParam) and
tm.getType() = root and
tm.getTypeAt(blanketSelfPath) = TTypeParamTypeParameter(blanketTypeParam) and
blanketSelfPath = TypePath::singleton(tp) and
hasFirstNonTrivialTraitBound(blanketTypeParam, _)
)

4
rust/ql/lib/codeql/rust/internal/typeinference/DerefChain.qll
View File

@@ -25,8 +25,8 @@ class DerefImplItemNode extends ImplItemNode {
*/
pragma[nomagic]
predicate targetHasTypeParameterAt(TypePath path) {
this.getAssocItem("Target").(TypeAlias).getTypeRepr().(TypeMention).resolveTypeAt(path)
instanceof TypeParameter
this.getAssocItem("Target").(TypeAlias).getTypeRepr().(TypeMention).getTypeAt(path) instanceof
TypeParameter
}
/** Gets the first type parameter of the type being implemented, if any. */

4
rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll
View File

@@ -15,7 +15,7 @@ private import FunctionType
pragma[nomagic]
private Type resolveNonTypeParameterTypeAt(TypeMention tm, TypePath path) {
result = tm.resolveTypeAt(path) and
result = tm.getTypeAt(path) and
not result instanceof TypeParameter
}
@@ -32,7 +32,7 @@ private predicate implSiblingCandidate(
) {
trait = impl.(ImplItemNode).resolveTraitTy() and
selfTy = impl.getSelfTy() and
rootType = selfTy.resolveType()
rootType = selfTy.getType()
}
pragma[nomagic]

4
rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll
View File

@@ -103,12 +103,12 @@ Type getAssocFunctionTypeAt(Function f, ImplOrTraitItemNode i, FunctionPosition
// No specialization needed when the function is directly in the trait or
// impl block or the declared type is not a type parameter
(parent = i or not result instanceof TypeParameter) and
result = pos.getTypeMention(f).resolveTypeAt(path)
result = pos.getTypeMention(f).getTypeAt(path)
or
exists(TypePath prefix, TypePath suffix, TypeParameter tp, TypeMention constraint |
BaseTypes::rootTypesSatisfaction(_, TTrait(parent), i, _, constraint) and
path = prefix.append(suffix) and
tp = pos.getTypeMention(f).resolveTypeAt(prefix) and
tp = pos.getTypeMention(f).getTypeAt(prefix) and
if tp = TSelfTypeParameter(_)
then result = resolveImplOrTraitType(i, suffix)
else result = getTraitConstraintTypeAt(i, constraint, tp, suffix)

70
rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
View File

@@ -134,11 +134,11 @@ class TypePath = M1::TypePath;
module TypePath = M1::TypePath;
private module Input2 implements InputSig2<TypeMentionTypeTree> {
TypeMentionTypeTree getABaseTypeMention(Type t) { none() }
private module Input2 implements InputSig2<TypeMention> {
TypeMention getABaseTypeMention(Type t) { none() }
Type getATypeParameterConstraint(TypeParameter tp, TypePath path) {
exists(TypeMention tm | result = tm.resolveTypeAt(path) |
exists(TypeMention tm | result = tm.getTypeAt(path) |
tm = tp.(TypeParamTypeParameter).getTypeParam().getATypeBound().getTypeRepr() or
tm = tp.(SelfTypeParameter).getTrait() or
tm =
@@ -158,8 +158,7 @@ private module Input2 implements InputSig2<TypeMentionTypeTree> {
* inference module for more information.
*/
predicate conditionSatisfiesConstraint(
TypeAbstraction abs, TypeMentionTypeTree condition, TypeMentionTypeTree constraint,
boolean transitive
TypeAbstraction abs, TypeMention condition, TypeMention constraint, boolean transitive
) {
// `impl` blocks implementing traits
transitive = false and
@@ -209,7 +208,7 @@ private module Input2 implements InputSig2<TypeMentionTypeTree> {
}
}
private module M2 = Make2<TypeMentionTypeTree, Input2>;
private module M2 = Make2<TypeMention, Input2>;
import M2
@@ -228,7 +227,7 @@ module Consistency {
// mention for the self type has multiple types for a path.
not exists(ImplItemNode impl, TypePath selfTypePath |
n = impl.getAnAssocItem().(Function).getSelfParam() and
strictcount(impl.(Impl).getSelfTy().(TypeMention).resolveTypeAt(selfTypePath)) > 1
strictcount(impl.(Impl).getSelfTy().(TypeMention).getTypeAt(selfTypePath)) > 1
)
}
}
@@ -294,7 +293,7 @@ private class FunctionDeclaration extends Function {
result = getAssocFunctionTypeAt(this, i.asSome(), pos, path)
or
i.isNone() and
result = this.getParam(pos.asPosition()).getTypeRepr().(TypeMention).resolveTypeAt(path)
result = this.getParam(pos.asPosition()).getTypeRepr().(TypeMention).getTypeAt(path)
)
}
@@ -305,7 +304,7 @@ private class FunctionDeclaration extends Function {
getAssocFunctionTypeAt(this, i.asSome(), any(FunctionPosition pos | pos.isReturn()), path)
or
i.isNone() and
result = getReturnTypeMention(this).resolveTypeAt(path)
result = getReturnTypeMention(this).getTypeAt(path)
)
}
@@ -349,12 +348,12 @@ private TypeMention getCallExprTypeMentionArgument(CallExpr ce, TypeArgumentPosi
pragma[nomagic]
private Type getCallExprTypeArgument(CallExpr ce, TypeArgumentPosition apos, TypePath path) {
result = getCallExprTypeMentionArgument(ce, apos).resolveTypeAt(path)
result = getCallExprTypeMentionArgument(ce, apos).getTypeAt(path)
or
// Handle constructions that use `Self(...)` syntax
exists(Path p, TypePath path0 |
p = CallExprImpl::getFunctionPath(ce) and
result = p.(TypeMention).resolveTypeAt(path0) and
result = p.(TypeMention).getTypeAt(path0) and
path0.isCons(TTypeParamTypeParameter(apos.asTypeParam()), path)
)
}
@@ -377,16 +376,16 @@ private TypeMention getTypeAnnotation(AstNode n) {
/** Gets the type of `n`, which has an explicit type annotation. */
pragma[nomagic]
private Type inferAnnotatedType(AstNode n, TypePath path) {
result = getTypeAnnotation(n).resolveTypeAt(path)
result = getTypeAnnotation(n).getTypeAt(path)
or
result = n.(ShorthandSelfParameterMention).resolveTypeAt(path)
result = n.(ShorthandSelfParameterMention).getTypeAt(path)
}
pragma[nomagic]
private Type inferFunctionBodyType(AstNode n, TypePath path) {
exists(Function f |
n = f.getFunctionBody() and
result = getReturnTypeMention(f).resolveTypeAt(path) and
result = getReturnTypeMention(f).getTypeAt(path) and
not exists(ImplTraitReturnType i | i.getFunction() = f |
result = i or result = i.getATypeParameter()
)
@@ -430,7 +429,7 @@ module CertainTypeInference {
private TypePath getPathToImplSelfTypeParam(TypeParam tp) {
exists(ImplItemNode impl |
tp = impl.getTypeParam(_) and
TTypeParamTypeParameter(tp) = impl.(Impl).getSelfTy().(TypeMention).resolveTypeAt(result)
TTypeParamTypeParameter(tp) = impl.(Impl).getSelfTy().(TypeMention).getTypeAt(result)
)
}
@@ -446,7 +445,7 @@ module CertainTypeInference {
// and the path `Foo<i64>::bar` we must resolve `A` to `i64`.
exists(TypePath pathToTp |
pathToTp = getPathToImplSelfTypeParam(tp) and
result = p.getQualifier().(TypeMention).resolveTypeAt(pathToTp.appendInverse(suffix))
result = p.getQualifier().(TypeMention).getTypeAt(pathToTp.appendInverse(suffix))
)
or
// For type parameters of the function we must resolve their
@@ -462,11 +461,11 @@ module CertainTypeInference {
}
private Type inferCertainStructExprType(StructExpr se, TypePath path) {
result = se.getPath().(TypeMention).resolveTypeAt(path)
result = se.getPath().(TypeMention).getTypeAt(path)
}
private Type inferCertainStructPatType(StructPat sp, TypePath path) {
result = sp.getPath().(TypeMention).resolveTypeAt(path)
result = sp.getPath().(TypeMention).getTypeAt(path)
}
predicate certainTypeEquality(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
@@ -902,7 +901,7 @@ private module StructExprMatchingInput implements MatchingInputSig {
// type of a field
exists(TypeMention tp |
tp = this.getField(dpos.asFieldPos()).getTypeRepr() and
result = tp.resolveTypeAt(path)
result = tp.getTypeAt(path)
)
or
// type parameter of the struct itself
@@ -955,7 +954,7 @@ private module StructExprMatchingInput implements MatchingInputSig {
// Handle constructions that use `Self {...}` syntax
exists(TypeMention tm, TypePath path0 |
tm = this.getStructPath() and
result = tm.resolveTypeAt(path0) and
result = tm.getTypeAt(path0) and
path0.isCons(TTypeParamTypeParameter(apos.asTypeParam()), path)
)
}
@@ -1065,7 +1064,7 @@ pragma[nomagic]
private Type getCallExprTypeQualifier(CallExpr ce, TypePath path) {
exists(TypeMention tm |
tm = getCallExprPathQualifier(ce) and
result = tm.resolveTypeAt(path) and
result = tm.getTypeAt(path) and
not resolvePath(tm) instanceof Trait
)
}
@@ -2327,11 +2326,11 @@ private module MethodResolution {
* instance of the type being implemented.
*/
private module TypeQualifierIsInstantiationOfImplSelfInput implements
IsInstantiationOfInputSig<MethodCallCallExpr, TypeMentionTypeTree>
IsInstantiationOfInputSig<MethodCallCallExpr, TypeMention>
{
pragma[nomagic]
private predicate potentialInstantiationOf0(
MethodCallCallExpr ce, ImplItemNode impl, TypeMentionTypeTree constraint
MethodCallCallExpr ce, ImplItemNode impl, TypeMention constraint
) {
ce.hasTypeQualifiedCandidate(impl) and
constraint = impl.getSelfPath()
@@ -2339,7 +2338,7 @@ private module MethodResolution {
pragma[nomagic]
predicate potentialInstantiationOf(
MethodCallCallExpr ce, TypeAbstraction abs, TypeMentionTypeTree constraint
MethodCallCallExpr ce, TypeAbstraction abs, TypeMention constraint
) {
potentialInstantiationOf0(ce, abs, constraint) and
if abs.(Impl).hasTrait()
@@ -2350,14 +2349,13 @@ private module MethodResolution {
else any()
}
predicate relevantConstraint(TypeMentionTypeTree constraint) {
predicate relevantConstraint(TypeMention constraint) {
potentialInstantiationOf0(_, _, constraint)
}
}
private module TypeQualifierIsInstantiationOfImplSelf =
IsInstantiationOf<MethodCallCallExpr, TypeMentionTypeTree,
TypeQualifierIsInstantiationOfImplSelfInput>;
IsInstantiationOf<MethodCallCallExpr, TypeMention, TypeQualifierIsInstantiationOfImplSelfInput>;
/**
* A configuration for anti-matching the type of a receiver against the type of
@@ -2478,7 +2476,7 @@ private module MethodCallMatchingInput implements MatchingWithEnvironmentInputSi
.getGenericArgList()
.getTypeArg(apos.asMethodTypeArgumentPosition())
.(TypeMention)
.resolveTypeAt(path)
.getTypeAt(path)
or
result = getCallExprTypeArgument(this, apos, path)
}
@@ -3009,7 +3007,7 @@ abstract private class TupleLikeConstructor extends Addressable {
}
Type getParameterType(FunctionPosition pos, TypePath path) {
result = this.getTupleField(pos.asPosition()).getTypeRepr().(TypeMention).resolveTypeAt(path)
result = this.getTupleField(pos.asPosition()).getTypeRepr().(TypeMention).getTypeAt(path)
}
}
@@ -3364,7 +3362,7 @@ private module FieldExprMatchingInput implements MatchingInputSig {
)
or
dpos.isField() and
result = this.getTypeRepr().(TypeMention).resolveTypeAt(path)
result = this.getTypeRepr().(TypeMention).getTypeAt(path)
}
override string toString() { result = this.getAstNode().toString() }
@@ -3716,7 +3714,7 @@ private module StructPatMatchingInput implements MatchingInputSig {
// The struct/enum type is supplied explicitly as a type qualifier, e.g.
// `let Foo<Bar>::Variant { ... } = ...`.
apos.isStructPos() and
result = this.getPath().(TypeMention).resolveTypeAt(path)
result = this.getPath().(TypeMention).getTypeAt(path)
}
Declaration getTarget() { result = resolvePath(this.getPath()) }
@@ -3766,7 +3764,7 @@ private module TupleStructPatMatchingInput implements MatchingInputSig {
// The struct/enum type is supplied explicitly as a type qualifier, e.g.
// `let Option::<Foo>::Some(x) = ...`.
apos.isSelf() and
result = this.getPath().(TypeMention).resolveTypeAt(path)
result = this.getPath().(TypeMention).getTypeAt(path)
}
Declaration getTarget() { result = resolvePath(this.getPath()) }
@@ -3955,13 +3953,13 @@ private Type inferClosureExprType(AstNode n, TypePath path) {
or
// Propagate return type annotation to body
n = ce.getClosureBody() and
result = ce.getRetType().getTypeRepr().(TypeMention).resolveTypeAt(path)
result = ce.getRetType().getTypeRepr().(TypeMention).getTypeAt(path)
)
}
pragma[nomagic]
private Type inferCastExprType(CastExpr ce, TypePath path) {
result = ce.getTypeRepr().(TypeMention).resolveTypeAt(path)
result = ce.getTypeRepr().(TypeMention).getTypeAt(path)
}
cached
@@ -4159,7 +4157,7 @@ private module Debug {
predicate debugInferShorthandSelfType(ShorthandSelfParameterMention self, TypePath path, Type t) {
self = getRelevantLocatable() and
t = self.resolveTypeAt(path)
t = self.getTypeAt(path)
}
predicate debugInferMethodCallType(AstNode n, TypePath path, Type t) {
@@ -4174,7 +4172,7 @@ private module Debug {
predicate debugTypeMention(TypeMention tm, TypePath path, Type type) {
tm = getRelevantLocatable() and
tm.resolveTypeAt(path) = type
tm.getTypeAt(path) = type
}
Type debugInferAnnotatedType(AstNode n, TypePath path) {

2
rust/ql/lib/codeql/rust/internal/typeinference/TypeInferenceConsistency.qll
View File

@@ -17,7 +17,7 @@ query predicate illFormedTypeMention(TypeMention tm) {
not tm =
any(PathTypeMention ptm |
exists(ptm.resolvePathTypeAt(TypePath::nil())) and
not exists(ptm.resolveType())
not exists(ptm.getType())
or
ptm.(NonAliasPathTypeMention).getResolved() instanceof TypeAlias
) and

83
rust/ql/lib/codeql/rust/internal/typeinference/TypeMention.qll
View File

@@ -11,51 +11,44 @@ private import TypeInference
abstract class TypeMention extends AstNode {
/** Gets the type at `path` that this mention resolves to, if any. */
pragma[nomagic]
abstract Type resolveTypeAt(TypePath path);
abstract Type getTypeAt(TypePath path);
/** Gets the type that this node resolves to, if any. */
pragma[nomagic]
final Type resolveType() { result = this.resolveTypeAt(TypePath::nil()) }
}
final private class FinalTypeMention = TypeMention;
/** An adapter for type mentions to implement `HasTypeTreeSig`. */
final class TypeMentionTypeTree extends FinalTypeMention {
Type getTypeAt(TypePath path) { result = this.resolveTypeAt(path) }
final Type getType() { result = this.getTypeAt(TypePath::nil()) }
}
class TupleTypeReprMention extends TypeMention instanceof TupleTypeRepr {
override Type resolveTypeAt(TypePath path) {
override Type getTypeAt(TypePath path) {
path.isEmpty() and
result.(TupleType).getArity() = super.getNumberOfFields()
or
exists(TypePath suffix, int i |
result = super.getField(i).(TypeMention).resolveTypeAt(suffix) and
result = super.getField(i).(TypeMention).getTypeAt(suffix) and
path = TypePath::cons(getTupleTypeParameter(super.getNumberOfFields(), i), suffix)
)
}
}
class ParenthesizedArgListMention extends TypeMention instanceof ParenthesizedArgList {
override Type resolveTypeAt(TypePath path) {
override Type getTypeAt(TypePath path) {
path.isEmpty() and
result.(TupleType).getArity() = super.getNumberOfTypeArgs()
or
exists(TypePath suffix, int index |
result = super.getTypeArg(index).getTypeRepr().(TypeMention).resolveTypeAt(suffix) and
result = super.getTypeArg(index).getTypeRepr().(TypeMention).getTypeAt(suffix) and
path = TypePath::cons(getTupleTypeParameter(super.getNumberOfTypeArgs(), index), suffix)
)
}
}
class ArrayTypeReprMention extends TypeMention instanceof ArrayTypeRepr {
override Type resolveTypeAt(TypePath path) {
override Type getTypeAt(TypePath path) {
path.isEmpty() and
result instanceof ArrayType
or
exists(TypePath suffix |
result = super.getElementTypeRepr().(TypeMention).resolveTypeAt(suffix) and
result = super.getElementTypeRepr().(TypeMention).getTypeAt(suffix) and
path = TypePath::cons(getArrayTypeParameter(), suffix)
)
}
@@ -66,23 +59,23 @@ class RefTypeReprMention extends TypeMention instanceof RefTypeRepr {
if super.isMut() then result instanceof RefMutType else result instanceof RefSharedType
}
override Type resolveTypeAt(TypePath path) {
override Type getTypeAt(TypePath path) {
path.isEmpty() and result = this.resolveRootType()
or
exists(TypePath suffix |
result = super.getTypeRepr().(TypeMention).resolveTypeAt(suffix) and
result = super.getTypeRepr().(TypeMention).getTypeAt(suffix) and
path = TypePath::cons(this.resolveRootType().getPositionalTypeParameter(0), suffix)
)
}
}
class SliceTypeReprMention extends TypeMention instanceof SliceTypeRepr {
override Type resolveTypeAt(TypePath path) {
override Type getTypeAt(TypePath path) {
path.isEmpty() and
result instanceof SliceType
or
exists(TypePath suffix |
result = super.getTypeRepr().(TypeMention).resolveTypeAt(suffix) and
result = super.getTypeRepr().(TypeMention).getTypeAt(suffix) and
path = TypePath::cons(getSliceTypeParameter(), suffix)
)
}
@@ -91,7 +84,7 @@ class SliceTypeReprMention extends TypeMention instanceof SliceTypeRepr {
abstract class PathTypeMention extends TypeMention, Path {
abstract Type resolvePathTypeAt(TypePath typePath);
final override Type resolveTypeAt(TypePath typePath) {
final override Type getTypeAt(TypePath typePath) {
result = this.resolvePathTypeAt(typePath) and
(
not result instanceof TypeParameter
@@ -118,14 +111,14 @@ class AliasPathTypeMention extends PathTypeMention {
* resulting type at `typePath`.
*/
override Type resolvePathTypeAt(TypePath typePath) {
result = rhs.resolveTypeAt(typePath) and
result = rhs.getTypeAt(typePath) and
not result = pathGetTypeParameter(resolved, _)
or
exists(TypeParameter tp, TypeMention arg, TypePath prefix, TypePath suffix, int i |
tp = rhs.resolveTypeAt(prefix) and
tp = rhs.getTypeAt(prefix) and
tp = pathGetTypeParameter(resolved, pragma[only_bind_into](i)) and
arg = this.getSegment().getGenericArgList().getTypeArg(pragma[only_bind_into](i)) and
result = arg.resolveTypeAt(suffix) and
result = arg.getTypeAt(suffix) and
typePath = prefix.append(suffix)
)
}
@@ -183,7 +176,7 @@ class NonAliasPathTypeMention extends PathTypeMention {
// Defaults only apply to type mentions in type annotations
this = any(PathTypeRepr ptp).getPath().getQualifier*() and
exists(Type ty, TypePath prefix |
ty = this.resolveRootType().getTypeParameterDefault(i).resolveTypeAt(prefix) and
ty = this.resolveRootType().getTypeParameterDefault(i).getTypeAt(prefix) and
if not ty = TSelfTypeParameter(resolved)
then result = ty and path = prefix
else
@@ -191,13 +184,13 @@ class NonAliasPathTypeMention extends PathTypeMention {
// be substituted for the type that implements the trait.
exists(TypePath suffix |
path = prefix.append(suffix) and
result = this.getSelfTraitBoundArg().resolveTypeAt(suffix)
result = this.getSelfTraitBoundArg().getTypeAt(suffix)
)
)
}
private Type getPositionalTypeArgument(int i, TypePath path) {
result = getPathTypeArgument(this, i).resolveTypeAt(path)
result = getPathTypeArgument(this, i).getTypeAt(path)
or
result = this.getDefaultPositionalTypeArgument(i, path)
}
@@ -226,11 +219,11 @@ class NonAliasPathTypeMention extends PathTypeMention {
s.hasParenthesizedArgList()
|
tp = TTypeParamTypeParameter(t.getTypeParam()) and
result = s.getParenthesizedArgList().(TypeMention).resolveTypeAt(path)
result = s.getParenthesizedArgList().(TypeMention).getTypeAt(path)
or
tp = TAssociatedTypeTypeParameter(t, any(FnOnceTrait tr).getOutputType()) and
(
result = s.getRetType().getTypeRepr().(TypeMention).resolveTypeAt(path)
result = s.getRetType().getTypeRepr().(TypeMention).getTypeAt(path)
or
// When the `-> ...` return type is omitted, it defaults to `()`.
not s.hasRetType() and
@@ -326,24 +319,24 @@ class NonAliasPathTypeMention extends PathTypeMention {
exists(TypeParameter tp, TypePath suffix | typePath = TypePath::cons(tp, suffix) |
result = this.getTypeForTypeParameterAt(tp, suffix)
or
result = this.getTypeMentionForTypeParameter(tp).resolveTypeAt(suffix)
result = this.getTypeMentionForTypeParameter(tp).getTypeAt(suffix)
)
or
// When the path refers to a trait, then the implicit `Self` type parameter
// should be instantiated from the context.
exists(TypePath suffix |
result = this.getSelfTraitBoundArg().resolveTypeAt(suffix) and
result = this.getSelfTraitBoundArg().getTypeAt(suffix) and
typePath = TypePath::cons(TSelfTypeParameter(resolved), suffix)
)
or
not this.getSegment().hasTraitTypeRepr() and
result = this.getSegment().getTypeRepr().(TypeMention).resolveTypeAt(typePath)
result = this.getSegment().getTypeRepr().(TypeMention).getTypeAt(typePath)
}
}
pragma[nomagic]
Type resolveImplSelfTypeAt(Impl i, TypePath path) {
result = i.getSelfTy().(TypeMention).resolveTypeAt(path)
result = i.getSelfTy().(TypeMention).getTypeAt(path)
}
class ImplSelfMention extends PathTypeMention {
@@ -361,11 +354,11 @@ class PathTypeReprMention extends TypeMention, PathTypeRepr {
PathTypeReprMention() { path = this.getPath() }
override Type resolveTypeAt(TypePath typePath) { result = path.resolveTypeAt(typePath) }
override Type getTypeAt(TypePath typePath) { result = path.getTypeAt(typePath) }
}
class ImplTraitTypeReprMention extends TypeMention instanceof ImplTraitTypeRepr {
override Type resolveTypeAt(TypePath typePath) {
override Type getTypeAt(TypePath typePath) {
typePath.isEmpty() and
result.(ImplTraitType).getImplTraitTypeRepr() = this
or
@@ -384,14 +377,14 @@ private TypeParameter pathGetTypeParameter(TypeAlias alias, int i) {
// Used to represent implicit `Self` type arguments in traits and `impl` blocks,
// see `PathMention` for details.
class TypeParamMention extends TypeMention instanceof TypeParam {
override Type resolveTypeAt(TypePath typePath) {
override Type getTypeAt(TypePath typePath) {
typePath.isEmpty() and
result = TTypeParamTypeParameter(this)
}
}
class TraitMention extends TypeMention instanceof TraitItemNode {
override Type resolveTypeAt(TypePath typePath) {
override Type getTypeAt(TypePath typePath) {
typePath.isEmpty() and
result = TTrait(this)
or
@@ -424,7 +417,7 @@ class SelfTypeParameterMention extends TypeMention instanceof Name {
Trait getTrait() { result = trait }
override Type resolveTypeAt(TypePath typePath) {
override Type getTypeAt(TypePath typePath) {
typePath.isEmpty() and
result = TSelfTypeParameter(trait)
}
@@ -474,7 +467,7 @@ class ShorthandSelfParameterMention extends TypeMention instanceof SelfParam {
if super.isMut() then result instanceof RefMutType else result instanceof RefSharedType
}
override Type resolveTypeAt(TypePath typePath) {
override Type getTypeAt(TypePath typePath) {
// `fn f(&self, ...)`
typePath.isEmpty() and
result = this.resolveSelfRefRootType()
@@ -512,7 +505,7 @@ class ShorthandReturnTypeMention extends TypeMention instanceof Name {
not f.getRetType().hasTypeRepr()
}
override Type resolveTypeAt(TypePath typePath) {
override Type getTypeAt(TypePath typePath) {
typePath.isEmpty() and
result instanceof UnitType
}
@@ -534,14 +527,14 @@ class DynTraitTypeReprMention extends TypeMention instanceof DynTraitTypeRepr {
dynType.getTrait() = super.getTrait()
}
override Type resolveTypeAt(TypePath path) {
override Type getTypeAt(TypePath path) {
path.isEmpty() and
result = dynType
or
exists(DynTraitTypeParameter tp, TypePath path0, TypePath suffix |
dynType = tp.getDynTraitType() and
path = TypePath::cons(tp, suffix) and
result = super.getTypeBoundList().getBound(0).getTypeRepr().(TypeMention).resolveTypeAt(path0) and
result = super.getTypeBoundList().getBound(0).getTypeRepr().(TypeMention).getTypeAt(path0) and
path0.isCons(tp.getTraitTypeParameter(), suffix)
)
}
@@ -581,7 +574,7 @@ class DynTypeBoundListMention extends TypeMention instanceof TypeBoundList {
)
}
override Type resolveTypeAt(TypePath path) {
override Type getTypeAt(TypePath path) {
path.isEmpty() and
result.(DynTraitType).getTrait() = trait
or
@@ -594,7 +587,7 @@ class DynTypeBoundListMention extends TypeMention instanceof TypeBoundList {
}
class NeverTypeReprMention extends TypeMention, NeverTypeRepr {
override Type resolveTypeAt(TypePath path) { result = TNeverType() and path.isEmpty() }
override Type getTypeAt(TypePath path) { result = TNeverType() and path.isEmpty() }
}
class PtrTypeReprMention extends TypeMention instanceof PtrTypeRepr {
@@ -604,11 +597,11 @@ class PtrTypeReprMention extends TypeMention instanceof PtrTypeRepr {
super.isMut() and result instanceof PtrMutType
}
override Type resolveTypeAt(TypePath path) {
override Type getTypeAt(TypePath path) {
path.isEmpty() and result = this.resolveRootType()
or
exists(TypePath suffix |
result = super.getTypeRepr().(TypeMention).resolveTypeAt(suffix) and
result = super.getTypeRepr().(TypeMention).getTypeAt(suffix) and
path = TypePath::cons(this.resolveRootType().getPositionalTypeParameter(0), suffix)
)
}