Rust: Only adjust access type for method call expressions

Author: paldepind

rust/ql/lib/codeql/rust/internal/TypeInference.qll

@@ -667,12 +667,13 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {
     apos = dpos
   }
 
-  bindingset[apos, target, path, t]
+  bindingset[a, apos, target, path, t]
   pragma[inline_late]
   predicate adjustAccessType(
-    AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj, Type tAdj
+    Access a, AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj,
+    Type tAdj
   ) {
-    if apos.isSelf()
+    if apos.isSelf() and a.receiverImplicitlyBorrowed()
     then
       exists(Type selfParamType |
         selfParamType = target.getParameterType(TSelfDeclarationPosition(), TypePath::nil())
@@ -836,11 +837,13 @@ private module FieldExprMatchingInput implements MatchingInputSig {
     apos = dpos
   }
 
-  bindingset[apos, target, path, t]
+  bindingset[a, apos, target, path, t]
   pragma[inline_late]
   predicate adjustAccessType(
-    AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj, Type tAdj
+    Access a, AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj,
+    Type tAdj
   ) {
+    exists(a) and
     exists(target) and
     if apos.isSelf()
     then

shared/typeinference/codeql/typeinference/internal/TypeInference.qll

@@ -841,9 +841,10 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
        * the inferred type of `42` is `int`, but it should be adjusted to `int?`
        * when matching against `M`.
        */
-      bindingset[apos, target, path, t]
+      bindingset[a, apos, target, path, t]
       default predicate adjustAccessType(
-        AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj, Type tAdj
+        Access a, AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj,
+        Type tAdj
       ) {
         pathAdj = path and
         tAdj = t
@@ -870,7 +871,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         target = a.getTarget() and
         exists(TypePath path0, Type t0 |
           t0 = a.getInferredType(apos, path0) and
-          adjustAccessType(apos, target, path0, t0, path, t)
+          adjustAccessType(a, apos, target, path0, t0, path, t)
         )
       }