add explicit this to all calls to class predicates

Author: erik-krogh

csharp/ql/lib/semmle/code/asp/WebConfig.qll

@@ -8,7 +8,7 @@ import csharp
  * A `Web.config` file.
  */
 class WebConfigXML extends XMLFile {
-  WebConfigXML() { getName().matches("%Web.config") }
+  WebConfigXML() { this.getName().matches("%Web.config") }
 }
 
 /** A `<configuration>` tag in an ASP.NET configuration file. */
@@ -73,12 +73,14 @@ class FormsElement extends XMLElement {
   /**
    * Gets attribute's `requireSSL` value.
    */
-  string getRequireSSL() { result = getAttribute("requireSSL").getValue().trim().toLowerCase() }
+  string getRequireSSL() {
+    result = this.getAttribute("requireSSL").getValue().trim().toLowerCase()
+  }
 
   /**
    * Holds if `requireSSL` value is true.
    */
-  predicate isRequireSSL() { getRequireSSL() = "true" }
+  predicate isRequireSSL() { this.getRequireSSL() = "true" }
 }
 
 /** A `<httpCookies>` tag in an ASP.NET configuration file. */
@@ -89,26 +91,28 @@ class HttpCookiesElement extends XMLElement {
    * Gets attribute's `httpOnlyCookies` value.
    */
   string getHttpOnlyCookies() {
-    result = getAttribute("httpOnlyCookies").getValue().trim().toLowerCase()
+    result = this.getAttribute("httpOnlyCookies").getValue().trim().toLowerCase()
   }
 
   /**
    * Holds if there is any chance that `httpOnlyCookies` is set to `true`.
    */
-  predicate isHttpOnlyCookies() { getHttpOnlyCookies() = "true" }
+  predicate isHttpOnlyCookies() { this.getHttpOnlyCookies() = "true" }
 
   /**
    * Gets attribute's `requireSSL` value.
    */
-  string getRequireSSL() { result = getAttribute("requireSSL").getValue().trim().toLowerCase() }
+  string getRequireSSL() {
+    result = this.getAttribute("requireSSL").getValue().trim().toLowerCase()
+  }
 
   /**
    * Holds if there is any chance that `requireSSL` is set to `true` either globally or for Forms.
    */
   predicate isRequireSSL() {
-    getRequireSSL() = "true"
+    this.getRequireSSL() = "true"
     or
-    not getRequireSSL() = "false" and // not set all, i.e. default
-    exists(FormsElement forms | forms.getFile() = getFile() | forms.isRequireSSL())
+    not this.getRequireSSL() = "false" and // not set all, i.e. default
+    exists(FormsElement forms | forms.getFile() = this.getFile() | forms.isRequireSSL())
   }
 }

csharp/ql/lib/semmle/code/cil/Access.qll

@@ -20,7 +20,7 @@ class VariableAccess extends Access, @cil_access { }
 
 /** An instruction that reads a variable. */
 class ReadAccess extends VariableAccess, Expr, @cil_read_access {
-  override Type getType() { result = getTarget().getType() }
+  override Type getType() { result = this.getTarget().getType() }
 }
 
 /** An instruction yielding an address. */
@@ -49,7 +49,7 @@ class ParameterReadAccess extends ParameterAccess, ReadAccess {
 class ParameterWriteAccess extends ParameterAccess, WriteAccess {
   override int getPopCount() { result = 1 }
 
-  override Expr getExpr() { result = getOperand(0) }
+  override Expr getExpr() { result = this.getOperand(0) }
 }
 
 /** An access to the `this` parameter. */
@@ -71,9 +71,9 @@ class LocalVariableAccess extends StackVariableAccess, @cil_local_access {
 class LocalVariableWriteAccess extends LocalVariableAccess, WriteAccess {
   override int getPopCount() { result = 1 }
 
-  override Expr getExpr() { result = getOperand(0) }
+  override Expr getExpr() { result = this.getOperand(0) }
 
-  override string getExtra() { result = "L" + getTarget().getIndex() }
+  override string getExtra() { result = "L" + this.getTarget().getIndex() }
 }
 
 /** An instruction that reads a local variable. */
@@ -85,7 +85,7 @@ class LocalVariableReadAccess extends LocalVariableAccess, ReadAccess {
 class FieldAccess extends VariableAccess, @cil_field_access {
   override Field getTarget() { result = VariableAccess.super.getTarget() }
 
-  override string getExtra() { result = getTarget().getName() }
+  override string getExtra() { result = this.getTarget().getName() }
 
   /** Gets the qualifier of the access, if any. */
   abstract Expr getQualifier();

csharp/ql/lib/semmle/code/cil/BasicBlock.qll

@@ -10,7 +10,7 @@ private import CIL
  */
 class BasicBlock extends Cached::TBasicBlockStart {
   /** Gets an immediate successor of this basic block, if any. */
-  BasicBlock getASuccessor() { result.getFirstNode() = getLastNode().getASuccessor() }
+  BasicBlock getASuccessor() { result.getFirstNode() = this.getLastNode().getASuccessor() }
 
   /** Gets an immediate predecessor of this basic block, if any. */
   BasicBlock getAPredecessor() { result.getASuccessor() = this }
@@ -31,7 +31,7 @@ class BasicBlock extends Cached::TBasicBlockStart {
    * The basic block on line 2 is an immediate `true` successor of the
    * basic block on line 1.
    */
-  BasicBlock getATrueSuccessor() { result.getFirstNode() = getLastNode().getTrueSuccessor() }
+  BasicBlock getATrueSuccessor() { result.getFirstNode() = this.getLastNode().getTrueSuccessor() }
 
   /**
    * Gets an immediate `false` successor, if any.
@@ -49,22 +49,22 @@ class BasicBlock extends Cached::TBasicBlockStart {
    * The basic block on line 2 is an immediate `false` successor of the
    * basic block on line 1.
    */
-  BasicBlock getAFalseSuccessor() { result.getFirstNode() = getLastNode().getFalseSuccessor() }
+  BasicBlock getAFalseSuccessor() { result.getFirstNode() = this.getLastNode().getFalseSuccessor() }
 
   /** Gets the control flow node at a specific (zero-indexed) position in this basic block. */
-  ControlFlowNode getNode(int pos) { Cached::bbIndex(getFirstNode(), result, pos) }
+  ControlFlowNode getNode(int pos) { Cached::bbIndex(this.getFirstNode(), result, pos) }
 
   /** Gets a control flow node in this basic block. */
-  ControlFlowNode getANode() { result = getNode(_) }
+  ControlFlowNode getANode() { result = this.getNode(_) }
 
   /** Gets the first control flow node in this basic block. */
   ControlFlowNode getFirstNode() { this = Cached::TBasicBlockStart(result) }
 
   /** Gets the last control flow node in this basic block. */
-  ControlFlowNode getLastNode() { result = getNode(length() - 1) }
+  ControlFlowNode getLastNode() { result = this.getNode(this.length() - 1) }
 
   /** Gets the length of this basic block. */
-  int length() { result = strictcount(getANode()) }
+  int length() { result = strictcount(this.getANode()) }
 
   /**
    * Holds if this basic block strictly dominates basic block `bb`.
@@ -114,7 +114,7 @@ class BasicBlock extends Cached::TBasicBlockStart {
    */
   predicate dominates(BasicBlock bb) {
     bb = this or
-    strictlyDominates(bb)
+    this.strictlyDominates(bb)
   }
 
   /**
@@ -140,14 +140,14 @@ class BasicBlock extends Cached::TBasicBlockStart {
    * does not dominate the basic block on line 6.
    */
   predicate inDominanceFrontier(BasicBlock df) {
-    dominatesPredecessor(df) and
-    not strictlyDominates(df)
+    this.dominatesPredecessor(df) and
+    not this.strictlyDominates(df)
   }
 
   /**
    * Holds if this basic block dominates a predecessor of `df`.
    */
-  private predicate dominatesPredecessor(BasicBlock df) { dominates(df.getAPredecessor()) }
+  private predicate dominatesPredecessor(BasicBlock df) { this.dominates(df.getAPredecessor()) }
 
   /**
    * Gets the basic block that immediately dominates this basic block, if any.
@@ -226,7 +226,7 @@ class BasicBlock extends Cached::TBasicBlockStart {
    * post-dominates itself.
    */
   predicate postDominates(BasicBlock bb) {
-    strictlyPostDominates(bb) or
+    this.strictlyPostDominates(bb) or
     this = bb
   }
 
@@ -239,7 +239,7 @@ class BasicBlock extends Cached::TBasicBlockStart {
   predicate inLoop() { this.getASuccessor+() = this }
 
   /** Gets a textual representation of this basic block. */
-  string toString() { result = getFirstNode().toString() }
+  string toString() { result = this.getFirstNode().toString() }
 
   /** Gets the location of this basic block. */
   Location getLocation() { result = this.getFirstNode().getLocation() }
@@ -325,16 +325,16 @@ private predicate exitBB(BasicBlock bb) { not exists(bb.getLastNode().getASucces
  * A basic block with more than one predecessor.
  */
 class JoinBlock extends BasicBlock {
-  JoinBlock() { getFirstNode().isJoin() }
+  JoinBlock() { this.getFirstNode().isJoin() }
 }
 
 /** A basic block that terminates in a condition, splitting the subsequent control flow. */
 class ConditionBlock extends BasicBlock {
   ConditionBlock() {
     exists(BasicBlock succ |
-      succ = getATrueSuccessor()
+      succ = this.getATrueSuccessor()
       or
-      succ = getAFalseSuccessor()
+      succ = this.getAFalseSuccessor()
     )
   }
 
@@ -380,16 +380,16 @@ class ConditionBlock extends BasicBlock {
      */
 
     exists(BasicBlock succ |
-      isCandidateSuccessor(succ, testIsTrue) and
+      this.isCandidateSuccessor(succ, testIsTrue) and
       succ.dominates(controlled)
     )
   }
 
   private predicate isCandidateSuccessor(BasicBlock succ, boolean testIsTrue) {
     (
-      testIsTrue = true and succ = getATrueSuccessor()
+      testIsTrue = true and succ = this.getATrueSuccessor()
       or
-      testIsTrue = false and succ = getAFalseSuccessor()
+      testIsTrue = false and succ = this.getAFalseSuccessor()
     ) and
     forall(BasicBlock pred | pred = succ.getAPredecessor() and pred != this | succ.dominates(pred))
   }