Mass-rename MethodAccess -> MethodCall

java/ql/lib/semmle/code/java/dispatch/ObjFlow.qll

@@ -20,7 +20,7 @@ private import semmle.code.java.dispatch.internal.Unification
 /**
  * Gets a viable dispatch target for `ma`. This is the input dispatch relation.
  */
-private Method viableImpl_inp(MethodAccess ma) { result = viableImpl_v3(ma) }
+private Method viableImpl_inp(MethodCall ma) { result = viableImpl_v3(ma) }
 
 private Callable dispatchCand(Call c) {
   c instanceof ConstructorCall and result = c.getCallee().getSourceDeclaration()
@@ -193,7 +193,7 @@ private predicate source(RefType t, ObjNode n) {
  * Holds if `n` is the qualifier of an `Object.toString()` call.
  */
 private predicate sink(ObjNode n) {
-  exists(MethodAccess toString |
+  exists(MethodCall toString |
     toString.getQualifier() = n.asExpr() and
     toString.getMethod() instanceof ToStringMethod
   ) and
@@ -231,7 +231,7 @@ private predicate objType(ObjNode n, RefType t) {
   )
 }
 
-private VirtualMethodAccess objectToString(ObjNode n) {
+private VirtualMethodCall objectToString(ObjNode n) {
   result.getQualifier() = n.asExpr() and sink(n)
 }
 
@@ -239,16 +239,16 @@ private VirtualMethodAccess objectToString(ObjNode n) {
  * Holds if `ma` is an `Object.toString()` call taking possibly improved type
  * bounds into account.
  */
-predicate objectToStringCall(VirtualMethodAccess ma) { ma = objectToString(_) }
+predicate objectToStringCall(VirtualMethodCall ma) { ma = objectToString(_) }
 
 /**
  * Holds if the qualifier of the `Object.toString()` call `ma` might have type `t`.
  */
-private predicate objectToStringQualType(MethodAccess ma, RefType t) {
+private predicate objectToStringQualType(MethodCall ma, RefType t) {
   exists(ObjNode n | ma = objectToString(n) and objType(n, t))
 }
 
-private Method viableImplObjectToString(MethodAccess ma) {
+private Method viableImplObjectToString(MethodCall ma) {
   exists(Method def, RefType t |
     objectToStringQualType(ma, t) and
     def = ma.getMethod() and
@@ -265,7 +265,7 @@ private Method viableImplObjectToString(MethodAccess ma) {
  * The set of dispatch targets for `Object.toString()` calls are reduced based
  * on possible data flow from objects of more specific types to the qualifier.
  */
-Method viableImpl_out(MethodAccess ma) {
+Method viableImpl_out(MethodCall ma) {
   result = viableImpl_inp(ma) and
   (
     result = viableImplObjectToString(ma) or