11private import unified
22private import AllDataFlow
3+ private import codeql.unified.internal.typeinference.TypeInference as T
4+ private import codeql.unified.internal.typeinference.TypeInferencePlugin as TP
35
46/**
57 * Holds if a MaD access path token of form `name[arg]` exists.
@@ -8,8 +10,20 @@ predicate isAccessPathTokenPresent(string name, string arg) {
810 arg = any ( FlowSummaryOutput:: Private:: AccessPathToken tok ) .getAnArgument ( name )
911}
1012
13+ private class ResolvedField extends VariableDeclaration {
14+ ResolvedField ( ) { this = T:: resolveFieldAccess ( _) }
15+
16+ string getName ( ) {
17+ result = super .getName ( ) and
18+ not this = any ( TP:: TupleType tt ) .getField ( _)
19+ or
20+ this = any ( TP:: TupleType tt ) .getField ( result )
21+ }
22+ }
23+
1124private newtype TContent =
1225 TArrayElement ( ) or
26+ TFieldContent ( ResolvedField field ) or
1327 TNamedMember ( string name ) {
1428 name = any ( Identifier id ) .getValue ( )
1529 or
@@ -24,23 +38,35 @@ private newtype TContent =
2438 TCapturedVariable ( CaptureSsaInput:: CapturedVariable v )
2539
2640class Content extends TContent {
41+ ResolvedField asField ( ) { this = TFieldContent ( result ) }
42+
2743 string asNamedMember ( ) { this = TNamedMember ( result ) }
2844
2945 predicate isArrayElement ( ) { this = TArrayElement ( ) }
3046
3147 string toString ( ) {
3248 result = this .asNamedMember ( )
3349 or
50+ result = this .asField ( ) .getName ( )
51+ or
3452 this .isArrayElement ( ) and result = "ArrayElement"
3553 or
3654 result = this .asCapturedVariable ( ) .toString ( )
3755 }
3856
3957 LocalVariable asCapturedVariable ( ) { this = TCapturedVariable ( result ) }
4058
41- Location getLocation ( ) { result = this .asCapturedVariable ( ) .getLocation ( ) }
59+ Location getLocation ( ) {
60+ result = this .asCapturedVariable ( ) .getLocation ( )
61+ or
62+ result = this .asField ( ) .getLocation ( )
63+ }
4264}
4365
66+ private class TContentApprox = TArrayElement or TNamedMember or TCapturedVariable ;
67+
68+ class ContentApprox extends Content , TContentApprox { }
69+
4470private newtype TContentSet = TSingleton ( Content content )
4571
4672class ContentSet extends TContentSet {
@@ -52,10 +78,41 @@ class ContentSet extends TContentSet {
5278
5379 Content getAStoreContent ( ) { result = this .asSingleton ( ) }
5480
55- Content getAReadContent ( ) { result = this .asSingleton ( ) }
81+ Content getAReadContent ( ) {
82+ result = this .asSingleton ( )
83+ or
84+ result .asNamedMember ( ) = this .asSingleton ( ) .asField ( ) .getName ( )
85+ or
86+ result .asField ( ) .getName ( ) = this .asSingleton ( ) .asNamedMember ( )
87+ }
5688}
5789
5890module ContentSet {
91+ /**
92+ * Gets the member name to use for `access`, if any.
93+ *
94+ * Only returns a member name if it cannot be resolved uniquely to a field.
95+ */
96+ private string getMemberName ( Expr access ) {
97+ access =
98+ any ( MemberAccessExpr mae |
99+ result = mae .getMemberName ( ) and
100+ if exists ( T:: inferTypeUnique ( mae .getBase ( ) ) )
101+ then not exists ( T:: resolveFieldAccess ( mae ) )
102+ else any ( )
103+ )
104+ or
105+ result = access .( UnqualifiedMemberAccess ) .getMemberName ( ) and
106+ not exists ( T:: resolveFieldAccess ( access ) )
107+ }
108+
109+ ContentSet member ( Expr access ) {
110+ result .asSingleton ( ) .asField ( ) = T:: resolveFieldAccess ( access ) and
111+ not exists ( getMemberName ( access ) )
112+ or
113+ result = namedMember ( getMemberName ( access ) )
114+ }
115+
59116 ContentSet namedMember ( string name ) { result .asSingleton ( ) .asNamedMember ( ) = name }
60117
61118 ContentSet arrayElement ( ) { result .asSingleton ( ) .isArrayElement ( ) }
0 commit comments