JS: replace .stripParens library uses w. .getUnderlyingValue

Esben Sparre Andreasen · Esben Sparre Andreasen · commit 030d9202de91 · 2018-11-07T09:32:02.000+01:00
diff --git a/javascript/ql/src/semmle/javascript/AMD.qll b/javascript/ql/src/semmle/javascript/AMD.qll
@@ -172,7 +172,7 @@ class AMDModuleDefinition extends CallExpr {
    * Gets a call to `require` inside this module.
    */
   CallExpr getARequireCall() {
-    result.getCallee().stripParens() = getRequireVariable().getAnAccess()
+    result.getCallee().getUnderlyingValue() = getRequireVariable().getAnAccess()
   }
 }
 
diff --git a/javascript/ql/src/semmle/javascript/Classes.qll b/javascript/ql/src/semmle/javascript/Classes.qll
@@ -291,15 +291,15 @@ class SuperExpr extends @superexpr, Expr {
  */
 class SuperCall extends CallExpr {
   SuperCall() {
-    getCallee().stripParens() instanceof SuperExpr
+    getCallee().getUnderlyingValue() instanceof SuperExpr
   }
 
   /**
    * Gets the function whose `super` binding this call refers to,
    * which is the nearest enclosing non-arrow function.
    */
   Function getBinder() {
-    result = getCallee().stripParens().(SuperExpr).getBinder()
+    result = getCallee().getUnderlyingValue().(SuperExpr).getBinder()
   }
 }
 
@@ -308,7 +308,7 @@ class SuperCall extends CallExpr {
  */
 class SuperPropAccess extends PropAccess {
   SuperPropAccess() {
-    getBase().stripParens() instanceof SuperExpr
+    getBase().getUnderlyingValue() instanceof SuperExpr
   }
 }
 
diff --git a/javascript/ql/src/semmle/javascript/Expr.qll b/javascript/ql/src/semmle/javascript/Expr.qll
@@ -710,7 +710,7 @@ class InvokeExpr extends @invokeexpr, Expr {
 
   /** Gets the name of the function or method being invoked, if it can be determined. */
   string getCalleeName() {
-    exists (Expr callee | callee = getCallee().stripParens() |
+    exists (Expr callee | callee = getCallee().getUnderlyingValue() |
       result = ((Identifier)callee).getName() or
       result = ((PropAccess)callee).getPropertyName()
     )
@@ -1690,10 +1690,10 @@ class ImmediatelyInvokedFunctionExpr extends Function {
 
   ImmediatelyInvokedFunctionExpr() {
     // direct call
-    this = invk.getCallee().stripParens() and kind = "direct" or
+    this = invk.getCallee().getUnderlyingValue() and kind = "direct" or
     // reflective call
     exists (MethodCallExpr mce | mce = invk |
-      this = mce.getReceiver().stripParens() and
+      this = mce.getReceiver().getUnderlyingValue() and
       kind = mce.getMethodName() and
       (kind = "call" or kind = "apply")
     )
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll
@@ -159,7 +159,7 @@ private class AnalyzedJSXEmptyExpression extends DataFlow::AnalyzedValueNode{
  */
 private class AnalyzedSuperCall extends DataFlow::AnalyzedValueNode {
   AnalyzedSuperCall() {
-    astNode = any(SuperCall sc).getCallee().stripParens()
+    astNode = any(SuperCall sc).getCallee().getUnderlyingValue()
   }
 
   override AbstractValue getALocalValue() {
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Bundling.qll b/javascript/ql/src/semmle/javascript/frameworks/Bundling.qll
@@ -36,7 +36,7 @@ predicate isBrowserifyBundle(ObjectExpr oe) {
     isBrowserifyBundledModule(p)
   ) and
   // the whole object must be passed to the module loader function
-  exists (CallExpr ce | ce.getCallee().stripParens() instanceof Function |
+  exists (CallExpr ce | ce.getCallee().getUnderlyingValue() instanceof Function |
     // the module loader function always has three arguments
     ce.getNumArgument() = 3 and
     // the first of which is the bundle
@@ -140,10 +140,10 @@ private predicate isWebpackModule(FunctionExpr m) {
  */
 predicate isWebpackBundle(ArrayExpr ae) {
   // ensure that there is at least one bundled module
-  isWebpackModule(ae.getAnElement().stripParens())
+  isWebpackModule(ae.getAnElement().getUnderlyingValue())
   and
   // furthermore, every element is either
-  forall (Expr elt | elt = ae.getAnElement().stripParens() |
+  forall (Expr elt | elt = ae.getAnElement().getUnderlyingValue() |
     // (1) a module
     isWebpackModule(elt)
     or
@@ -158,7 +158,7 @@ predicate isWebpackBundle(ArrayExpr ae) {
   )
   and
   // the whole array must be passed to a module loader function
-  exists (CallExpr ce | ce.getCallee().stripParens() instanceof Function |
+  exists (CallExpr ce | ce.getCallee().getUnderlyingValue() instanceof Function |
     // which is the bundle
     ce.getArgument(0) = ae
   )
diff --git a/javascript/ql/src/semmle/javascript/heuristics/SyntacticHeuristics.qll b/javascript/ql/src/semmle/javascript/heuristics/SyntacticHeuristics.qll
@@ -16,10 +16,10 @@ import javascript
 bindingset[regexp]
 predicate isReadFrom(DataFlow::Node read, string regexp) {
   exists (DataFlow::Node actualRead |
-    actualRead = read.asExpr().stripParens().(LogOrExpr).getAnOperand().flow() or // unfold `x || y` once
+    actualRead = read.asExpr().getUnderlyingValue().(LogOrExpr).getAnOperand().flow() or // unfold `x || y` once
     actualRead = read |
     exists (string name | name.regexpMatch(regexp) |
-      actualRead.asExpr().stripParens().(VarAccess).getName() = name or
+      actualRead.asExpr().getUnderlyingValue().(VarAccess).getName() = name or
       actualRead.(DataFlow::PropRead).getPropertyName() = name or
       actualRead.(DataFlow::InvokeNode).getCalleeName() = "get" + name
     )

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ class AMDModuleDefinition extends CallExpr {`
`172`	`172`	* Gets a call to `require` inside this module.
`173`	`173`	`*/`
`174`	`174`	`CallExpr getARequireCall() {`
`175`		`- result.getCallee().stripParens() = getRequireVariable().getAnAccess()`
	`175`	`+ result.getCallee().getUnderlyingValue() = getRequireVariable().getAnAccess()`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
Original file line number	Diff line number	Diff line change
`@@ -291,15 +291,15 @@ class SuperExpr extends @superexpr, Expr {`
`291`	`291`	`*/`
`292`	`292`	`class SuperCall extends CallExpr {`
`293`	`293`	`SuperCall() {`
`294`		`- getCallee().stripParens() instanceof SuperExpr`
	`294`	`+ getCallee().getUnderlyingValue() instanceof SuperExpr`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`/**`
`298`	`298`	* Gets the function whose `super` binding this call refers to,
`299`	`299`	`* which is the nearest enclosing non-arrow function.`
`300`	`300`	`*/`
`301`	`301`	`Function getBinder() {`
`302`		`- result = getCallee().stripParens().(SuperExpr).getBinder()`
	`302`	`+ result = getCallee().getUnderlyingValue().(SuperExpr).getBinder()`
`303`	`303`	`}`
`304`	`304`	`}`
`305`	`305`
`@@ -308,7 +308,7 @@ class SuperCall extends CallExpr {`
`308`	`308`	`*/`
`309`	`309`	`class SuperPropAccess extends PropAccess {`
`310`	`310`	`SuperPropAccess() {`
`311`		`- getBase().stripParens() instanceof SuperExpr`
	`311`	`+ getBase().getUnderlyingValue() instanceof SuperExpr`
`312`	`312`	`}`
`313`	`313`	`}`
`314`	`314`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ private class AnalyzedJSXEmptyExpression extends DataFlow::AnalyzedValueNode{`
`159`	`159`	`*/`
`160`	`160`	`private class AnalyzedSuperCall extends DataFlow::AnalyzedValueNode {`
`161`	`161`	`AnalyzedSuperCall() {`
`162`		`- astNode = any(SuperCall sc).getCallee().stripParens()`
	`162`	`+ astNode = any(SuperCall sc).getCallee().getUnderlyingValue()`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`override AbstractValue getALocalValue() {`