Merge pull request #11660 from erik-krogh/dynamic-useInstanceOf

Py/JS/RB: Use instanceof in more places

Author: erik-krogh

javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/TaintedPathATM.qll

@@ -51,9 +51,7 @@ class TaintedPathAtmConfig extends AtmConfig {
  * of barrier guards, we port the barrier guards for the boosted query from the standard library to
  * sanitizer guards here.
  */
-private class BarrierGuardNodeAsSanitizerGuardNode extends TaintTracking::LabeledSanitizerGuardNode {
-  BarrierGuardNodeAsSanitizerGuardNode() { this instanceof TaintedPath::BarrierGuardNode }
-
+private class BarrierGuardNodeAsSanitizerGuardNode extends TaintTracking::LabeledSanitizerGuardNode instanceof TaintedPath::BarrierGuardNode {
   override predicate sanitizes(boolean outcome, Expr e) {
     blocks(outcome, e) or blocks(outcome, e, _)
   }

javascript/ql/lib/semmle/javascript/Closure.qll

@@ -75,8 +75,7 @@ module Closure {
   /**
    * A top-level call to `goog.provide`.
    */
-  class ClosureProvideCall extends ClosureNamespaceRef, DataFlow::MethodCallNode {
-    ClosureProvideCall() { this instanceof DefaultClosureProvideCall }
+  class ClosureProvideCall extends ClosureNamespaceRef, DataFlow::MethodCallNode instanceof DefaultClosureProvideCall {
   }
 
   /**
@@ -89,8 +88,7 @@ module Closure {
   /**
    * A call to `goog.require`.
    */
-  class ClosureRequireCall extends ClosureNamespaceAccess, DataFlow::MethodCallNode {
-    ClosureRequireCall() { this instanceof DefaultClosureRequireCall }
+  class ClosureRequireCall extends ClosureNamespaceAccess, DataFlow::MethodCallNode instanceof DefaultClosureRequireCall {
   }
 
   /**
@@ -106,8 +104,7 @@ module Closure {
   /**
    * A top-level call to `goog.module` or `goog.declareModuleId`.
    */
-  class ClosureModuleDeclaration extends ClosureNamespaceRef, DataFlow::MethodCallNode {
-    ClosureModuleDeclaration() { this instanceof DefaultClosureModuleDeclaration }
+  class ClosureModuleDeclaration extends ClosureNamespaceRef, DataFlow::MethodCallNode instanceof DefaultClosureModuleDeclaration {
   }
 
   private GlobalVariable googVariable() { variables(result, "goog", any(GlobalScope sc)) }

javascript/ql/lib/semmle/javascript/DOM.qll

@@ -138,16 +138,14 @@ module DOM {
   /**
    * A JSX attribute, viewed as an `AttributeDefinition`.
    */
-  private class JsxAttributeDefinition extends AttributeDefinition, @jsx_attribute {
-    JsxAttribute attr;
+  private class JsxAttributeDefinition extends AttributeDefinition, @jsx_attribute instanceof JsxAttribute {
+    override string getName() { result = JsxAttribute.super.getName() }
 
-    JsxAttributeDefinition() { this = attr }
-
-    override string getName() { result = attr.getName() }
-
-    override DataFlow::Node getValueNode() { result = DataFlow::valueNode(attr.getValue()) }
+    override DataFlow::Node getValueNode() {
+      result = DataFlow::valueNode(JsxAttribute.super.getValue())
+    }
 
-    override ElementDefinition getElement() { result = attr.getElement() }
+    override ElementDefinition getElement() { result = JsxAttribute.super.getElement() }
   }
 
   /**

javascript/ql/lib/semmle/javascript/DefUse.qll

@@ -222,9 +222,7 @@ class VarDef extends ControlFlowNode {
  *
  * Some variable definitions are also uses, notably the operands of update expressions.
  */
-class VarUse extends ControlFlowNode, @varref {
-  VarUse() { this instanceof RValue }
-
+class VarUse extends ControlFlowNode, @varref instanceof RValue {
   /** Gets the variable this use refers to. */
   Variable getVariable() { result = this.(VarRef).getVariable() }
 

javascript/ql/lib/semmle/javascript/DefensiveProgramming.qll

@@ -384,16 +384,11 @@ module DefensiveExpressionTest {
    *
    * Example: `typeof x === "undefined"'.
    */
-  class TypeofUndefinedTest extends UndefinedNullTest {
-    TypeofTest test;
-
-    TypeofUndefinedTest() {
-      this = test and
-      test.getTag() = "undefined"
-    }
+  class TypeofUndefinedTest extends UndefinedNullTest instanceof TypeofTest {
+    TypeofUndefinedTest() { super.getTag() = "undefined" }
 
-    override boolean getTheTestResult() { result = test.getTheTestResult() }
+    override boolean getTheTestResult() { result = TypeofTest.super.getTheTestResult() }
 
-    override Expr getOperand() { result = test.getOperand() }
+    override Expr getOperand() { result = TypeofTest.super.getOperand() }
   }
 }

javascript/ql/lib/semmle/javascript/GeneratedCode.qll

@@ -16,8 +16,7 @@ abstract class GeneratedCodeMarkerComment extends Comment { }
 /**
  * A source mapping comment, viewed as a marker comment indicating generated code.
  */
-private class SourceMappingCommentMarkerComment extends GeneratedCodeMarkerComment {
-  SourceMappingCommentMarkerComment() { this instanceof SourceMappingComment }
+private class SourceMappingCommentMarkerComment extends GeneratedCodeMarkerComment instanceof SourceMappingComment {
 }
 
 /**

javascript/ql/lib/semmle/javascript/Routing.qll

@@ -508,9 +508,7 @@ module Routing {
     /**
      * An array which has been determined to be a route node, seen as a route node with arguments.
      */
-    private class ImpliedArrayRoute extends ValueNode::WithArguments, DataFlow::ArrayCreationNode {
-      ImpliedArrayRoute() { this instanceof ValueNode::UseSite }
-
+    private class ImpliedArrayRoute extends ValueNode::WithArguments, DataFlow::ArrayCreationNode instanceof ValueNode::UseSite {
       override DataFlow::Node getArgumentNode(int n) { result = this.getElement(n) }
     }
   }

javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll

@@ -298,9 +298,7 @@ class MethodCallNode extends CallNode instanceof DataFlow::Impl::MethodCallNodeD
  * new Array(16)
  * ```
  */
-class NewNode extends InvokeNode {
-  NewNode() { this instanceof DataFlow::Impl::NewNodeDef }
-}
+class NewNode extends InvokeNode instanceof DataFlow::Impl::NewNodeDef { }
 
 /**
  * A data flow node corresponding to the `this` parameter in a function or `this` at the top-level.

javascript/ql/lib/semmle/javascript/dataflow/TypeInference.qll

@@ -180,13 +180,9 @@ class AnalyzedValueNode extends AnalyzedNode, DataFlow::ValueNode { }
  * exports are modeled as property writes on `module.exports`, and imports
  * as property reads on any potential value of `module.exports`.
  */
-class AnalyzedModule extends TopLevel {
-  Module m;
-
-  AnalyzedModule() { this = m }
-
+class AnalyzedModule extends TopLevel instanceof Module {
   /** Gets the name of this module. */
-  string getName() { result = m.getName() }
+  string getName() { result = super.getName() }
 
   /**
    * Gets the abstract value representing this module's `module` object.
@@ -216,7 +212,7 @@ class AnalyzedModule extends TopLevel {
     exists(AbstractValue exports | exports = getAnExportsValue() |
       // CommonJS modules export `module.exports` as their `default`
       // export in an ES2015 setting
-      not m instanceof ES2015Module and
+      not this instanceof ES2015Module and
       name = "default" and
       result = exports
       or

javascript/ql/lib/semmle/javascript/dataflow/internal/PropertyTypeInference.qll

@@ -120,15 +120,13 @@ abstract class AnalyzedPropertyWrite extends DataFlow::Node {
 /**
  * Flow analysis for property writes.
  */
-private class AnalyzedExplicitPropertyWrite extends AnalyzedPropertyWrite {
-  AnalyzedExplicitPropertyWrite() { this instanceof DataFlow::PropWrite }
-
+private class AnalyzedExplicitPropertyWrite extends AnalyzedPropertyWrite instanceof DataFlow::PropWrite {
   override predicate writes(AbstractValue base, string prop, DataFlow::AnalyzedNode source) {
     explicitPropertyWrite(this, base, prop, source)
   }
 
   override predicate baseIsIncomplete(DataFlow::Incompleteness reason) {
-    this.(DataFlow::PropWrite).getBase().isIncomplete(reason)
+    super.getBase().isIncomplete(reason)
   }
 }