Mass rename L/RValue -> VarWrite/Read

Author: smowton

java/ql/lib/semmle/code/java/ControlFlowGraph.qll

@@ -473,7 +473,7 @@ private module ControlFlowGraphImpl {
       or
       this instanceof ClassExpr
       or
-      this instanceof RValue
+      this instanceof VarRead
       or
       this instanceof Call // includes both expressions and statements
       or
@@ -554,7 +554,7 @@ private module ControlFlowGraphImpl {
       or
       index = 0 and result = this.(LocalVariableDeclExpr).getInit()
       or
-      index = 0 and result = this.(RValue).getQualifier() and not result instanceof TypeAccess
+      index = 0 and result = this.(VarRead).getQualifier() and not result instanceof TypeAccess
       or
       exists(Call e | e = this |
         index = -1 and result = e.getQualifier() and not result instanceof TypeAccess

java/ql/lib/semmle/code/java/Expr.qll

@@ -2273,10 +2273,10 @@ private module Qualifier {
 }
 
 /** An expression that assigns a value to a field. */
-class FieldWrite extends FieldAccess, LValue { }
+class FieldWrite extends FieldAccess, VarWrite { }
 
 /** An expression that reads a field. */
-class FieldRead extends FieldAccess, RValue { }
+class FieldRead extends FieldAccess, VarRead { }
 
 private predicate hasInstantiation(RefType t) {
   t instanceof TypeVariable or

java/ql/lib/semmle/code/java/Member.qll

@@ -161,13 +161,13 @@ class Callable extends StmtParent, Member, @callable {
    * Holds if field `f` may be assigned a value
    * within the body of this callable.
    */
-  predicate writes(Field f) { f.getAnAccess().(LValue).getEnclosingCallable() = this }
+  predicate writes(Field f) { f.getAnAccess().(VarWrite).getEnclosingCallable() = this }
 
   /**
    * Holds if field `f` may be read
    * within the body of this callable.
    */
-  predicate reads(Field f) { f.getAnAccess().(RValue).getEnclosingCallable() = this }
+  predicate reads(Field f) { f.getAnAccess().(VarRead).getEnclosingCallable() = this }
 
   /**
    * Holds if field `f` may be either read or written

java/ql/lib/semmle/code/java/Reflection.qll

@@ -95,7 +95,7 @@ private ReflectiveClassIdentifier pointsToReflectiveClassIdentifier(Expr expr) {
   or
   // Or if this is an access of a variable which was defined as an expression creating a `Class<T>`,
   // return the inferred `T` from the definition expression.
-  exists(RValue use, VariableAssign assign |
+  exists(VarRead use, VariableAssign assign |
     use = expr and
     defUsePair(assign, use) and
     // The source of the assignment must be a `ReflectiveClassIdentifier`.

java/ql/lib/semmle/code/java/dataflow/DefUse.qll

@@ -13,7 +13,7 @@ private import SSA
  *
  * This is the transitive closure of `adjacentUseUseSameVar`.
  */
-predicate useUsePairSameVar(RValue use1, RValue use2) { adjacentUseUseSameVar+(use1, use2) }
+predicate useUsePairSameVar(VarRead use1, VarRead use2) { adjacentUseUseSameVar+(use1, use2) }
 
 /**
  * Holds if `use1` and `use2` form a use-use-pair of the same
@@ -23,15 +23,15 @@ predicate useUsePairSameVar(RValue use1, RValue use2) { adjacentUseUseSameVar+(u
  *
  * This is the transitive closure of `adjacentUseUse`.
  */
-predicate useUsePair(RValue use1, RValue use2) { adjacentUseUse+(use1, use2) }
+predicate useUsePair(VarRead use1, VarRead use2) { adjacentUseUse+(use1, use2) }
 
 /**
  * Holds if there exists a path from `def` to `use` without passing through another
  * `VariableUpdate` of the `LocalScopeVariable` that they both refer to.
  *
  * Other paths may also exist, so the SSA variables in `def` and `use` can be different.
  */
-predicate defUsePair(VariableUpdate def, RValue use) {
+predicate defUsePair(VariableUpdate def, VarRead use) {
   exists(SsaVariable v |
     v.getAUse() = use and v.getAnUltimateDefinition().(SsaExplicitUpdate).getDefiningExpr() = def
   )
@@ -43,7 +43,7 @@ predicate defUsePair(VariableUpdate def, RValue use) {
  *
  * Other paths may also exist, so the SSA variables can be different.
  */
-predicate parameterDefUsePair(Parameter p, RValue use) {
+predicate parameterDefUsePair(Parameter p, VarRead use) {
   exists(SsaVariable v |
     v.getAUse() = use and v.getAnUltimateDefinition().(SsaImplicitInit).isParameterDefinition(p)
   )

java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll

@@ -234,7 +234,7 @@ class InstanceAccessExt extends TInstanceAccessExt {
       e instanceof InstanceAccess and result = e
       or
       exists(FieldAccess fa | fa = e |
-        if fa instanceof RValue then fa = result else result.(AssignExpr).getDest() = fa
+        if fa instanceof VarRead then fa = result else result.(AssignExpr).getDest() = fa
       )
     )
   }

java/ql/lib/semmle/code/java/dataflow/IntegerGuards.qll

@@ -15,10 +15,10 @@ private Expr exprWithIntValue(int i) {
 
 /**
  * An expression for which the predicate `integerGuard` is relevant.
- * This includes `RValue` and `MethodCall`.
+ * This includes `VarRead` and `MethodCall`.
  */
 class IntComparableExpr extends Expr {
-  IntComparableExpr() { this instanceof RValue or this instanceof MethodCall }
+  IntComparableExpr() { this instanceof VarRead or this instanceof MethodCall }
 
   /** Gets an integer that is directly assigned to the expression in case of a variable; or zero. */
   int relevantInt() {
@@ -132,7 +132,7 @@ Expr integerGuard(IntComparableExpr e, boolean branch, int k, boolean is_k) {
  * If `branch_with_lower_bound_k` is true then `result` is equivalent to `k <= x`
  * and if it is false then `result` is equivalent to `k > x`.
  */
-Expr intBoundGuard(RValue x, boolean branch_with_lower_bound_k, int k) {
+Expr intBoundGuard(VarRead x, boolean branch_with_lower_bound_k, int k) {
   exists(ComparisonExpr comp, ConstantIntegerExpr c, int val |
     comp = result and
     comp.hasOperands(x, c) and

java/ql/lib/semmle/code/java/dataflow/NullGuards.qll

@@ -79,7 +79,7 @@ Expr clearlyNotNullExpr(Expr reason) {
     (reason = r1 or reason = r2)
   )
   or
-  exists(SsaVariable v, boolean branch, RValue rval, Guard guard |
+  exists(SsaVariable v, boolean branch, VarRead rval, Guard guard |
     guard = directNullGuard(v, branch, false) and
     guard.controls(rval.getBasicBlock(), branch) and
     reason = guard and

java/ql/lib/semmle/code/java/dataflow/Nullness.qll

@@ -485,7 +485,7 @@ private predicate correlatedConditions(
       inverted = branch1.booleanXor(branch2)
     )
     or
-    exists(SsaVariable v, RValue rv1, RValue rv2, int k, boolean branch1, boolean branch2 |
+    exists(SsaVariable v, VarRead rv1, VarRead rv2, int k, boolean branch1, boolean branch2 |
       rv1 = v.getAUse() and
       rv2 = v.getAUse() and
       cond1.getCondition() = integerGuard(rv1, branch1, k, true) and

java/ql/lib/semmle/code/java/dataflow/SSA.qll

@@ -275,7 +275,7 @@ private module SsaImpl {
   }
 
   /** Holds if `VarAccess` `use` of `v` occurs in `b` at index `i`. */
-  private predicate variableUse(TrackedVar v, RValue use, BasicBlock b, int i) {
+  private predicate variableUse(TrackedVar v, VarRead use, BasicBlock b, int i) {
     v.getAnAccess() = use and b.getNode(i) = use
   }
 
@@ -652,7 +652,7 @@ private module SsaImpl {
      * Holds if the SSA definition of `v` at `def` reaches `use` in the same basic block
      * without crossing another SSA definition of `v`.
      */
-    private predicate ssaDefReachesUseWithinBlock(TrackedVar v, TrackedSsaDef def, RValue use) {
+    private predicate ssaDefReachesUseWithinBlock(TrackedVar v, TrackedSsaDef def, VarRead use) {
       exists(BasicBlock b, int rankix, int i |
         ssaDefReachesRank(v, def, b, rankix) and
         defUseRank(v, b, rankix, i) and
@@ -665,7 +665,7 @@ private module SsaImpl {
      * SSA definition of `v`.
      */
     cached
-    predicate ssaDefReachesUse(TrackedVar v, TrackedSsaDef def, RValue use) {
+    predicate ssaDefReachesUse(TrackedVar v, TrackedSsaDef def, VarRead use) {
       ssaDefReachesUseWithinBlock(v, def, use)
       or
       exists(BasicBlock b |
@@ -813,7 +813,7 @@ private module SsaImpl {
    * any other uses, but possibly through phi nodes and uncertain implicit updates.
    */
   cached
-  predicate firstUse(TrackedSsaDef def, RValue use) {
+  predicate firstUse(TrackedSsaDef def, VarRead use) {
     exists(TrackedVar v, BasicBlock b1, int i1, BasicBlock b2, int i2 |
       adjacentVarRefs(v, b1, i1, b2, i2) and
       def.definesAt(v, b1, i1) and
@@ -838,7 +838,7 @@ private module SsaImpl {
      * through any other use or any SSA definition of the variable.
      */
     cached
-    predicate adjacentUseUseSameVar(RValue use1, RValue use2) {
+    predicate adjacentUseUseSameVar(VarRead use1, VarRead use2) {
       exists(TrackedVar v, BasicBlock b1, int i1, BasicBlock b2, int i2 |
         adjacentVarRefs(v, b1, i1, b2, i2) and
         variableUse(v, use1, b1, i1) and
@@ -853,7 +853,7 @@ private module SsaImpl {
      * except for phi nodes and uncertain implicit updates.
      */
     cached
-    predicate adjacentUseUse(RValue use1, RValue use2) {
+    predicate adjacentUseUse(VarRead use1, VarRead use2) {
       adjacentUseUseSameVar(use1, use2)
       or
       exists(TrackedVar v, TrackedSsaDef def, BasicBlock b1, int i1, BasicBlock b2, int i2 |
@@ -938,7 +938,7 @@ class SsaVariable extends TSsaVariable {
   BasicBlock getBasicBlock() { result = this.getCfgNode().getBasicBlock() }
 
   /** Gets an access of this SSA variable. */
-  RValue getAUse() {
+  VarRead getAUse() {
     ssaDefReachesUse(_, this, result) or
     this = TSsaUntracked(_, result)
   }
@@ -952,7 +952,7 @@ class SsaVariable extends TSsaVariable {
    * Subsequent uses can be found by following the steps defined by
    * `adjacentUseUse`.
    */
-  RValue getAFirstUse() {
+  VarRead getAFirstUse() {
     firstUse(this, result) or
     this = TSsaUntracked(_, result)
   }