JS: replace .stripParens query uses w. .getUnderlyingReference

Esben Sparre Andreasen · Esben Sparre Andreasen · commit e6a190c06e20 · 2018-11-07T09:32:02.000+01:00
diff --git a/javascript/ql/src/Expressions/BadParityCheck.ql b/javascript/ql/src/Expressions/BadParityCheck.ql
@@ -65,7 +65,7 @@ predicate maybeNegativeVar(Variable v) {
   // is v ever assigned a potentially negative value?
   maybeNegative(v.getAnAssignedExpr()) or
   // is v ever decremented?
-  exists (DecExpr dec | dec.getOperand().stripParens() = v.getAnAccess()) or
+  exists (DecExpr dec | dec.getOperand().getUnderlyingReference() = v.getAnAccess()) or
   // is v ever subject to a compound assignment other than +=, or to
   // += with potentially negative rhs?
   exists (CompoundAssignExpr assgn | assgn.getTarget() = v.getAnAccess() |
diff --git a/javascript/ql/src/Statements/SuspiciousUnusedLoopIterationVariable.ql b/javascript/ql/src/Statements/SuspiciousUnusedLoopIterationVariable.ql
@@ -26,7 +26,7 @@ class IncrementExpr extends Expr {
     // x = x + e
     exists (AssignExpr assgn, Variable v | assgn = this |
       assgn.getTarget() = v.getAnAccess() and
-      assgn.getRhs().(AddExpr).getAnOperand().stripParens() = v.getAnAccess()
+      assgn.getRhs().(AddExpr).getAnOperand().getUnderlyingReference() = v.getAnAccess()
     )
   }
 }
diff --git a/javascript/ql/src/Statements/UselessConditional.ql b/javascript/ql/src/Statements/UselessConditional.ql
@@ -28,7 +28,7 @@ import semmle.javascript.dataflow.Refinements
  */
 predicate isDefensiveInit(VarAccess va) {
   exists (LogOrExpr o, VarRef va2 |
-    va = o.getLeftOperand().stripParens() and va2.getVariable() = va.getVariable() |
+    va = o.getLeftOperand().getUnderlyingReference() and va2.getVariable() = va.getVariable() |
     exists (AssignExpr assgn | va2 = assgn.getTarget() |
       assgn = o.getRightOperand().stripParens() or
       o = assgn.getRhs().getUnderlyingValue()
diff --git a/javascript/ql/src/definitions.ql b/javascript/ql/src/definitions.ql
@@ -19,7 +19,7 @@ private import Declarations.Declarations
  * `x` has kind `"V"`.
  */
 string refKind(RefExpr r) {
-  if exists(InvokeExpr invk | r = invk.getCallee().stripParens()) then
+  if exists(InvokeExpr invk | r = invk.getCallee().getUnderlyingReference()) then
     result = "M"
   else
     result = "V"
@@ -143,7 +143,7 @@ predicate typedInvokeLookup(ASTNode ref, ASTNode decl, string kind) {
   not variableDefLookup(ref, decl, _) and
   not propertyLookup(ref, decl, _) and
   exists (InvokeExpr invoke, Expr callee | 
-    callee = invoke.getCallee().stripParens() and
+    callee = invoke.getCallee().getUnderlyingReference() and
     (ref = callee.(Identifier) or ref = callee.(DotExpr).getPropertyNameExpr()) and
     decl = invoke.getResolvedCallee() and
     kind = "M")

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class IncrementExpr extends Expr {`
`26`	`26`	`// x = x + e`
`27`	`27`	`exists (AssignExpr assgn, Variable v \| assgn = this \|`
`28`	`28`	`assgn.getTarget() = v.getAnAccess() and`
`29`		`- assgn.getRhs().(AddExpr).getAnOperand().stripParens() = v.getAnAccess()`
	`29`	`+ assgn.getRhs().(AddExpr).getAnOperand().getUnderlyingReference() = v.getAnAccess()`
`30`	`30`	`)`
`31`	`31`	`}`
`32`	`32`	`}`