Merge pull request #702 from hvitved/csharp/remove-deprecated

C#: Remove deprecated predicates

Author: calumgrant

csharp/ql/src/semmle/code/csharp/Assignable.qll

@@ -113,49 +113,6 @@ class AssignableRead extends AssignableAccess {
   AssignableRead getAReachableRead() {
     result = this.getANextRead+()
   }
-
-  /**
-   * Gets a next uncertain read of the same underlying assignable. That is,
-   * a read that can be reached from this read without passing through any other
-   * reads, and which *may* read the same value. Example:
-   *
-   * ```
-   * int Field;
-   *
-   * void SetField(int i) {
-   *   this.Field = i;
-   *   Use(this.Field);
-   *   if (i > 0)
-   *     this.Field = i - 1;
-   *   else if (i < 0)
-   *     SetField(1);
-   *   Use(this.Field);
-   *   Use(this.Field);
-   * }
-   * ```
-   *
-   * - The read of `i` on line 6 is next to the read on line 4.
-   * - The reads of `i` on lines 7 and 8 are next to the read on line 6.
-   * - The read of `this.Field` on line 10 is next to the read on line 5.
-   *   (This is the only truly uncertain read.)
-   * - The read of `this.Field` on line 11 is next to the read on line 10.
-   */
-  deprecated
-  AssignableRead getANextUncertainRead() {
-    Ssa::Internal::adjacentReadPair(this, result)
-  }
-
-  /**
-   * Gets a next uncertain read of the same underlying assignable. That is,
-   * a read that can be reached from this read, and which *may* read the same
-   * value.
-   *
-   * This is the transitive closure of `getANextUncertainRead()`.
-   */
-  deprecated
-  AssignableRead getAReachableUncertainRead() {
-    result = this.getANextUncertainRead+()
-  }
 }
 
 /**
@@ -484,10 +441,6 @@ class AssignableDefinition extends TAssignableDefinition {
    */
   Expr getExpr() { none() }
 
-  /** DEPRECATED: Use `getAControlFlowNode()` instead. */
-  deprecated
-  ControlFlow::Node getControlFlowNode() { result = this.getAControlFlowNode() }
-
   /** Gets the enclosing callable of this definition. */
   Callable getEnclosingCallable() { result = this.getExpr().getEnclosingCallable() }
 
@@ -560,56 +513,6 @@ class AssignableDefinition extends TAssignableDefinition {
     result = this.getAFirstRead().getANextRead*()
   }
 
-  /**
-   * Gets a first uncertain read of the same underlying assignable. That is,
-   * a read that can be reached from this definition without passing through any
-   * other reads, and which *may* read the value assigned in this definition.
-   * Example:
-   *
-   * ```
-   * int Field;
-   *
-   * void SetField(int i) {
-   *   this.Field = i;
-   *   Use(this.Field);
-   *   if (i > 0)
-   *     this.Field = i - 1;
-   *   else if (i < 0)
-   *     SetField(1);
-   *   Use(this.Field);
-   *   Use(this.Field);
-   * }
-   * ```
-   *
-   * - The read of `i` on line 4 is a first read of the implicit parameter definition
-   *   on line 3.
-   * - The read of `this.Field` on line 5 is a first read of the definition on line 4.
-   * - The read of `this.Field` on line 10 is a first read of the definition on
-   *   line 7. (This is the only truly uncertain read.)
-   *
-   * Subsequent uncertain reads can be found by following the steps defined by
-   * `AssignableRead.getANextUncertainRead()`.
-   */
-  deprecated
-  AssignableRead getAFirstUncertainRead() {
-    exists(Ssa::ExplicitDefinition def |
-      def.getADefinition() = this |
-      result = def.getAFirstUncertainRead()
-    )
-  }
-
-  /**
-   * Gets a reachable uncertain read of the same underlying assignable. That is,
-   * a read that can be reached from this definition, and which *may* read the
-   * value assigned in this definition.
-   *
-   * This is the equivalent with `getAFirstUncertainRead().getANextUncertainRead*()`.
-   */
-  deprecated
-  AssignableRead getAReachableUncertainRead() {
-    result = this.getAFirstUncertainRead().getANextUncertainRead*()
-  }
-
   /** Gets a textual representation of this assignable definition. */
   string toString() { none() }
 

csharp/ql/src/semmle/code/csharp/Stmt.qll

@@ -1190,22 +1190,6 @@ class UsingStmt extends Stmt, @using_stmt {
   /** Gets a local variable declaration of this `using` statement. */
   LocalVariableDeclExpr getAVariableDeclExpr() { result = this.getVariableDeclExpr(_) }
 
-  /** DEPRECATED: Use `getVariable(0)` instead. */
-  deprecated
-  LocalVariable getVariable() { result = getVariableDeclExpr().getVariable() }
-
-  /** DEPRECATED: Use `getAVariableDeclExpr()` instead. */
-  deprecated
-  LocalVariableDeclExpr getVariableDeclExpr() { result.getParent() = this }
-
-  /** DEPRECATED: Use `getAnExpr()` instead. */
-  deprecated Expr getInitializer() {
-    if exists(this.getVariableDeclExpr(0)) then
-      result = this.getVariableDeclExpr(0).getInitializer()
-    else
-      result.getParent() = this
-  }
-
   /**
    * Gets the expression directly used by this `using` statement, if any. For
    * example, `f` on line 2 in
@@ -1389,14 +1373,6 @@ class FixedStmt extends Stmt, @fixed_stmt {
   /** Gets a local variable declaration of this `fixed` statement. */
   LocalVariableDeclExpr getAVariableDeclExpr() { result = this.getVariableDeclExpr(_) }
 
-  /** DEPRECATED: Use `getVariable(0)` instead. */
-  deprecated
-  LocalVariable getVariable() { result = getVariableDeclExpr().getVariable() }
-
-  /** DEPRECATED: Use `getVariableDeclExpr(0) instead. */
-  deprecated
-  LocalVariableDeclExpr getVariableDeclExpr() { result.getParent() = this }
-
   /** Gets the body of this `fixed` statement. */
   Stmt getBody() { result.getParent() = this }
 
@@ -1441,10 +1417,6 @@ class LabeledStmt extends Stmt, @labeled_stmt {
                and result = this.getParent().getChild(i+1))
   }
 
-  /** DEPRECATED: Use `getStmt()` instead. */
-  deprecated
-  Stmt getReferredStatement() { result = this.getStmt() }
-
   /** Gets the label of this statement. */
   string getLabel() { exprorstmt_name(this, result) }
 

csharp/ql/src/semmle/code/csharp/Type.qll

@@ -134,12 +134,6 @@ class ValueOrRefType extends DotNet::ValueOrRefType, Type, Attributable, @value_
     result.hasName(name)
   }
 
-  /**
-   * DEPRECATED: Use `hasMethod()` instead.
-   */
-  deprecated
-  predicate inheritsMethod(Method m) { this.hasMethod(m) }
-
   /**
    * Holds if this type has method `m`, that is, either `m` is declared in this
    * type, or `m` is inherited by this type.
@@ -164,14 +158,6 @@ class ValueOrRefType extends DotNet::ValueOrRefType, Type, Attributable, @value_
    */
   predicate hasMethod(Method m) { this.hasMember(m) }
 
-  /**
-   * DEPRECATED: Use `hasCallable()` instead.
-   */
-  deprecated
-  predicate inheritsCallable(Callable c) {
-    this.hasCallable(c)
-  }
-
   /**
    * Holds if this type has callable `c`, that is, either `c` is declared in this
    * type, or `c` is inherited by this type.
@@ -202,14 +188,6 @@ class ValueOrRefType extends DotNet::ValueOrRefType, Type, Attributable, @value_
     hasMember(c.(Accessor).getDeclaration())
   }
 
-  /**
-   * DEPRECATED: Use `hasMember()` instead.
-   */
-  deprecated
-  predicate inheritsMember(Member m) {
-    this.hasMember(m)
-  }
-
   /**
    * Holds if this type has member `m`, that is, either `m` is declared in this
    * type, or `m` is inherited by this type.

csharp/ql/src/semmle/code/csharp/XML.qll

@@ -78,19 +78,6 @@ class XMLParent extends @xmlparent {
     result = count(int pos | xmlChars(_,_,this,pos,_,_))
   }
 
-  /**
-   * DEPRECATED: Internal.
-   *
-   * Append the character sequences of this XML parent from left to right, separated by a space,
-   * up to a specified (zero-based) index.
-   */
-  deprecated
-  string charsSetUpTo(int n) {
-    (n = 0 and xmlChars(_,result,this,0,_,_)) or
-    (n > 0 and exists(string chars | xmlChars(_,chars,this,n,_,_) |
-                         result = this.charsSetUpTo(n-1) + " " + chars))
-  }
-
   /** Append all the character sequences of this XML parent from left to right, separated by a space. */
   string allCharactersString() {
     result = concat(string chars, int pos | xmlChars(_, chars, this, pos, _, _) | chars, " " order by pos)

csharp/ql/src/semmle/code/csharp/dataflow/SSA.qll

@@ -758,42 +758,6 @@ module Ssa {
       ssaRefRank(bb2, i2, v, _) = 1
     }
 
-    /**
-     * Holds if the value defined at non-trivial SSA definition `def` can reach `read`
-     * without passing through any other read, but possibly through pseudo definitions
-     * and uncertain definitions.
-     */
-    deprecated
-    predicate firstUncertainRead(TrackedDefinition def, AssignableRead read) {
-      firstReadSameVar(def, read)
-      or
-      exists(TrackedVar v, TrackedDefinition redef, BasicBlock b1, int i1, BasicBlock b2, int i2 |
-        redef instanceof UncertainDefinition or redef instanceof PseudoDefinition
-        |
-        adjacentVarRefs(v, b1, i1, b2, i2) and
-        definesAt(def, b1, i1, v) and
-        definesAt(redef, b2, i2, v) and
-        firstUncertainRead(redef, read)
-      )
-    }
-
-    /**
-     * INTERNAL: Use `AssignableRead.getANextUncertainRead()` instead.
-     */
-    deprecated
-    predicate adjacentReadPair(AssignableRead read1, AssignableRead read2) {
-      adjacentReadPairSameVar(read1, read2)
-      or
-      exists(TrackedVar v, TrackedDefinition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
-        adjacentVarRefs(v, bb1, i1, bb2, i2) and
-        variableRead(bb1, i1, v, read1.getAControlFlowNode(), _) and
-        definesAt(def, bb2, i2, v) and
-        firstUncertainRead(def, read2) |
-        def instanceof UncertainDefinition or
-        def instanceof PseudoDefinition
-      )
-    }
-
     private cached module Cached {
       /**
        * Holds if `read` is a last read of the non-trivial SSA definition `def`.
@@ -2146,47 +2110,6 @@ module Ssa {
       lastRead(this, result)
     }
 
-    /**
-     * Gets a first uncertain read of the source variable underlying this
-     * SSA definition. That is, a read that can be reached from this SSA definition
-     * without passing through any other reads or SSA definitions, except for
-     * phi nodes and uncertain updates. Example:
-     *
-     * ```
-     * int Field;
-     *
-     * void SetField(int i) {
-     *   this.Field = i;
-     *   Use(this.Field);
-     *   if (i > 0)
-     *     this.Field = i - 1;
-     *   else if (i < 0)
-     *     SetField(1);
-     *   Use(this.Field);
-     *   Use(this.Field);
-     * }
-     * ```
-     *
-     * - The read of `i` on line 4 can be reached from the explicit SSA
-     *   definition (wrapping an implicit entry definition) on line 3.
-     * - The reads of `i` on lines 6 and 7 are not the first reads of any SSA
-     *   definition.
-     * - The read of `this.Field` on line 5 can be reached from the explicit SSA
-     *   definition on line 4.
-     * - The read of `this.Field` on line 10 can be reached from the explicit SSA
-     *   definition on line 7, the implicit SSA definition on line 9, and the phi
-     *   node between lines 9 and 10.
-     * - The read of `this.Field` on line 11 is not the first read of any SSA
-     *   definition.
-     *
-     * Subsequent uncertain reads can be found by following the steps defined by
-     * `AssignableRead.getANextUncertainRead()`.
-     */
-    deprecated
-    AssignableRead getAFirstUncertainRead() {
-      firstUncertainRead(this, result)
-    }
-
     /**
      * Gets a definition that ultimately defines this SSA definition and is
      * not itself a pseudo node. Example:
@@ -2459,10 +2382,6 @@ module Ssa {
       )
     }
 
-    override AssignableRead getAFirstUncertainRead() {
-      result = this.getARead()
-    }
-
     override string toString() {
       result = getToStringPrefix(this) + "SSA untracked def(" + getSourceVariable() + ")"
     }