@@ -626,9 +626,9 @@ library class ExprEvaluator extends int {
       // All assignments must have the same int value
       result =
         unique(Expr value |
-          value = v.getAnAssignedValue() and not ignoreVariableAssignment(e, v, value)
+          value = v.getAnAssignedValue() and not this.ignoreVariableAssignment(e, v, value)
         |
-          getValueInternalNonSubExpr(value)
+          this.getValueInternalNonSubExpr(value)
         )
     )
   }
 
@@ -452,7 +452,7 @@ class SsaPhiNode extends Node, TSsaPhiNode {
 
   /** Holds if this phi node has input from the `rnk`'th write operation in block `block`. */
   final predicate hasInputAtRankInBlock(IRBlock block, int rnk) {
-    hasInputAtRankInBlock(block, rnk, _)
+    this.hasInputAtRankInBlock(block, rnk, _)
   }
 
   /**
 
@@ -307,7 +307,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
   final override string toString() { result = tag.toString() }
 
   final override Instruction getAnyDef() {
-    result = unique(Instruction defInstr | hasDefinition(defInstr, _))
+    result = unique(Instruction defInstr | this.hasDefinition(defInstr, _))
   }
 
   final override Overlap getDefinitionOverlap() { this.hasDefinition(_, result) }
 
@@ -307,7 +307,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
   final override string toString() { result = tag.toString() }
 
   final override Instruction getAnyDef() {
-    result = unique(Instruction defInstr | hasDefinition(defInstr, _))
+    result = unique(Instruction defInstr | this.hasDefinition(defInstr, _))
   }
 
   final override Overlap getDefinitionOverlap() { this.hasDefinition(_, result) }
 
@@ -307,7 +307,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
   final override string toString() { result = tag.toString() }
 
   final override Instruction getAnyDef() {
-    result = unique(Instruction defInstr | hasDefinition(defInstr, _))
+    result = unique(Instruction defInstr | this.hasDefinition(defInstr, _))
   }
 
   final override Overlap getDefinitionOverlap() { this.hasDefinition(_, result) }
 
@@ -18,12 +18,12 @@ class SuppressionComment extends Comment {
     (
       this instanceof CppStyleComment and
       // strip the beginning slashes
-      text = getContents().suffix(2)
+      text = this.getContents().suffix(2)
       or
       this instanceof CStyleComment and
       // strip both the beginning /* and the end */ the comment
       exists(string text0 |
-        text0 = getContents().suffix(2) and
+        text0 = this.getContents().suffix(2) and
         text = text0.prefix(text0.length() - 2)
       ) and
       // The /* */ comment must be a single-line comment
 
@@ -153,12 +153,12 @@ class ExtClass extends Class {
   }
 
   predicate hasLocationInfo(string path, int startline, int startcol, int endline, int endcol) {
-    if hasOneVariableGroup()
+    if this.hasOneVariableGroup()
     then
       exists(VariableDeclarationGroup vdg | vdg.getClass() = this |
         vdg.hasLocationInfo(path, startline, startcol, endline, endcol)
       )
-    else getLocation().hasLocationInfo(path, startline, startcol, endline, endcol)
+    else this.getLocation().hasLocationInfo(path, startline, startcol, endline, endcol)
   }
 }
 
 
@@ -103,9 +103,9 @@ class CallWithBufferSize extends FunctionCall {
     // `upperBound(e)` defaults to `exprMaxVal(e)` when `e` isn't analyzable. So to get a meaningful
     // result in this case we pick the minimum value obtainable from dataflow and range analysis.
     result =
-      upperBound(statedSizeExpr())
+      upperBound(this.statedSizeExpr())
           .minimum(min(Expr statedSizeSrc |
-              DataFlow::localExprFlow(statedSizeSrc, statedSizeExpr())
+              DataFlow::localExprFlow(statedSizeSrc, this.statedSizeExpr())
             |
               statedSizeSrc.getValue().toInt()
             ))
 
@@ -22,7 +22,7 @@ abstract class LockOperation extends FunctionCall {
   ControlFlowNode getAReachedNode() {
     result = this
     or
-    exists(ControlFlowNode mid | mid = getAReachedNode() |
+    exists(ControlFlowNode mid | mid = this.getAReachedNode() |
       not mid != this.getMatchingUnlock() and
       result = mid.getASuccessor()
     )
 
@@ -156,8 +156,8 @@ abstract class LeapYearFieldAccess extends YearFieldAccess {
     //
     // https://aa.usno.navy.mil/faq/docs/calendars.php
     this.isUsedInMod4Operation() and
-    additionalModulusCheckForLeapYear(400) and
-    additionalModulusCheckForLeapYear(100)
+    this.additionalModulusCheckForLeapYear(400) and
+    this.additionalModulusCheckForLeapYear(100)
   }
 }
 
@@ -176,17 +176,17 @@ class StructTmLeapYearFieldAccess extends LeapYearFieldAccess {
 
   override predicate isUsedInCorrectLeapYearCheck() {
     this.isUsedInMod4Operation() and
-    additionalModulusCheckForLeapYear(400) and
-    additionalModulusCheckForLeapYear(100) and
+    this.additionalModulusCheckForLeapYear(400) and
+    this.additionalModulusCheckForLeapYear(100) and
     // tm_year represents years since 1900
     (
-      additionalAdditionOrSubstractionCheckForLeapYear(1900)
+      this.additionalAdditionOrSubstractionCheckForLeapYear(1900)
       or
       // some systems may use 2000 for 2-digit year conversions
-      additionalAdditionOrSubstractionCheckForLeapYear(2000)
+      this.additionalAdditionOrSubstractionCheckForLeapYear(2000)
       or
       // converting from/to Unix epoch
-      additionalAdditionOrSubstractionCheckForLeapYear(1970)
+      this.additionalAdditionOrSubstractionCheckForLeapYear(1970)
     )
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -626,9 +626,9 @@ library class ExprEvaluator extends int {`
`626`	`626`	`// All assignments must have the same int value`
`627`	`627`	`result =`
`628`	`628`	`unique(Expr value \|`
`629`		`- value = v.getAnAssignedValue() and not ignoreVariableAssignment(e, v, value)`
	`629`	`+ value = v.getAnAssignedValue() and not this.ignoreVariableAssignment(e, v, value)`
`630`	`630`	`\|`
`631`		`- getValueInternalNonSubExpr(value)`
	`631`	`+ this.getValueInternalNonSubExpr(value)`
`632`	`632`	`)`
`633`	`633`	`)`
`634`	`634`	`}`
Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ class SsaPhiNode extends Node, TSsaPhiNode {`
`452`	`452`
`453`	`453`	/** Holds if this phi node has input from the `rnk`'th write operation in block `block`. */
`454`	`454`	`final predicate hasInputAtRankInBlock(IRBlock block, int rnk) {`
`455`		`- hasInputAtRankInBlock(block, rnk, _)`
	`455`	`+ this.hasInputAtRankInBlock(block, rnk, _)`
`456`	`456`	`}`
`457`	`457`
`458`	`458`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe`
`307`	`307`	`final override string toString() { result = tag.toString() }`
`308`	`308`
`309`	`309`	`final override Instruction getAnyDef() {`
`310`		`- result = unique(Instruction defInstr \| hasDefinition(defInstr, _))`
	`310`	`+ result = unique(Instruction defInstr \| this.hasDefinition(defInstr, _))`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`final override Overlap getDefinitionOverlap() { this.hasDefinition(_, result) }`
Original file line number	Diff line number	Diff line change
`@@ -153,12 +153,12 @@ class ExtClass extends Class {`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`predicate hasLocationInfo(string path, int startline, int startcol, int endline, int endcol) {`
`156`		`- if hasOneVariableGroup()`
	`156`	`+ if this.hasOneVariableGroup()`
`157`	`157`	`then`
`158`	`158`	`exists(VariableDeclarationGroup vdg \| vdg.getClass() = this \|`
`159`	`159`	`vdg.hasLocationInfo(path, startline, startcol, endline, endcol)`
`160`	`160`	`)`
`161`		`- else getLocation().hasLocationInfo(path, startline, startcol, endline, endcol)`
	`161`	`+ else this.getLocation().hasLocationInfo(path, startline, startcol, endline, endcol)`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ abstract class LockOperation extends FunctionCall {`
`22`	`22`	`ControlFlowNode getAReachedNode() {`
`23`	`23`	`result = this`
`24`	`24`	`or`
`25`		`- exists(ControlFlowNode mid \| mid = getAReachedNode() \|`
	`25`	`+ exists(ControlFlowNode mid \| mid = this.getAReachedNode() \|`
`26`	`26`	`not mid != this.getMatchingUnlock() and`
`27`	`27`	`result = mid.getASuccessor()`
`28`	`28`	`)`
Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,8 @@ abstract class LeapYearFieldAccess extends YearFieldAccess {`
`156`	`156`	`//`
`157`	`157`	`// https://aa.usno.navy.mil/faq/docs/calendars.php`
`158`	`158`	`this.isUsedInMod4Operation() and`
`159`		`- additionalModulusCheckForLeapYear(400) and`
`160`		`- additionalModulusCheckForLeapYear(100)`
	`159`	`+ this.additionalModulusCheckForLeapYear(400) and`
	`160`	`+ this.additionalModulusCheckForLeapYear(100)`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`
`@@ -176,17 +176,17 @@ class StructTmLeapYearFieldAccess extends LeapYearFieldAccess {`
`176`	`176`
`177`	`177`	`override predicate isUsedInCorrectLeapYearCheck() {`
`178`	`178`	`this.isUsedInMod4Operation() and`
`179`		`- additionalModulusCheckForLeapYear(400) and`
`180`		`- additionalModulusCheckForLeapYear(100) and`
	`179`	`+ this.additionalModulusCheckForLeapYear(400) and`
	`180`	`+ this.additionalModulusCheckForLeapYear(100) and`
`181`	`181`	`// tm_year represents years since 1900`
`182`	`182`	`(`
`183`		`- additionalAdditionOrSubstractionCheckForLeapYear(1900)`
	`183`	`+ this.additionalAdditionOrSubstractionCheckForLeapYear(1900)`
`184`	`184`	`or`
`185`	`185`	`// some systems may use 2000 for 2-digit year conversions`
`186`		`- additionalAdditionOrSubstractionCheckForLeapYear(2000)`
	`186`	`+ this.additionalAdditionOrSubstractionCheckForLeapYear(2000)`
`187`	`187`	`or`
`188`	`188`	`// converting from/to Unix epoch`
`189`		`- additionalAdditionOrSubstractionCheckForLeapYear(1970)`
	`189`	`+ this.additionalAdditionOrSubstractionCheckForLeapYear(1970)`
`190`	`190`	`)`
`191`	`191`	`}`
`192`	`192`	`}`