JS: replace .stripParens query uses w. .getUnderlyingValue

Esben Sparre Andreasen · Esben Sparre Andreasen · commit 43e215c7af0c · 2018-11-07T09:32:02.000+01:00
diff --git a/javascript/ql/src/Declarations/BuiltinRedefined.ql b/javascript/ql/src/Declarations/BuiltinRedefined.ql
@@ -27,12 +27,12 @@ predicate acceptableRedefinition(Identifier id) {
   // Date = global.Date
   exists (AssignExpr assgn |
     id = assgn.getTarget() and
-    id.getName() = assgn.getRhs().stripParens().(PropAccess).getPropertyName()
+    id.getName() = assgn.getRhs().getUnderlyingValue().(PropAccess).getPropertyName()
   ) or
   // var Date = global.Date
   exists (VariableDeclarator decl |
     id = decl.getBindingPattern() and
-    id.getName() = decl.getInit().stripParens().(PropAccess).getPropertyName()
+    id.getName() = decl.getInit().getUnderlyingValue().(PropAccess).getPropertyName()
   )
 }
 
diff --git a/javascript/ql/src/Declarations/UnusedParameter.qll b/javascript/ql/src/Declarations/UnusedParameter.qll
@@ -10,7 +10,7 @@ import javascript
  * Holds if `e` is an expression whose value is invoked as a function.
  */
 private predicate isCallee(Expr e) {
-  exists (InvokeExpr invk | e = invk.getCallee().stripParens())
+  exists (InvokeExpr invk | e = invk.getCallee().getUnderlyingValue())
 }
 
 /**
diff --git a/javascript/ql/src/Expressions/BitwiseSignCheck.ql b/javascript/ql/src/Expressions/BitwiseSignCheck.ql
@@ -37,13 +37,13 @@ predicate acceptableSignCheck(BitwiseExpr b) {
    * is sign-preserving, we shouldn't flag it (and we allow arbitrary shifts, not just 16-bit ones)
    */
   exists (RShiftExpr rsh, LShiftExpr lsh |
-    rsh = b and lsh = rsh.getLeftOperand().stripParens() and
+    rsh = b and lsh = rsh.getLeftOperand().getUnderlyingValue() and
     lsh.getRightOperand().getIntValue() = rsh.getRightOperand().getIntValue()
   )
 }
 
 from Comparison e, BitwiseExpr b
-where b = e.getLeftOperand().stripParens() and
+where b = e.getLeftOperand().getUnderlyingValue() and
       not e instanceof EqualityTest and
       e.getRightOperand().getIntValue() = 0 and
       not acceptableSignCheck(b)
diff --git a/javascript/ql/src/Expressions/RedundantExpression.ql b/javascript/ql/src/Expressions/RedundantExpression.ql
@@ -58,7 +58,7 @@ class RedundantIdemnecantOperand extends RedundantOperand {
     exists (IdemnecantExpr parent |
       parent = getParent() and
       // exclude trivial cases like `1-1`
-      not parent.getRightOperand().stripParens() instanceof Literal
+      not parent.getRightOperand().getUnderlyingValue() instanceof Literal
     )
   }
 }
@@ -80,7 +80,7 @@ class RedundantIdempotentOperand extends RedundantOperand {
  */
 class AverageExpr extends DivExpr {
   AverageExpr() {
-    getLeftOperand().stripParens() instanceof AddExpr and
+    getLeftOperand().getUnderlyingValue() instanceof AddExpr and
     getRightOperand().getIntValue() = 2
   }
 }
@@ -91,12 +91,12 @@ class AverageExpr extends DivExpr {
 class RedundantAverageOperand extends RedundantOperand {
   RedundantAverageOperand() {
     exists (AverageExpr aver |
-      (AddExpr)getParent() = aver.getLeftOperand().stripParens()
+      (AddExpr)getParent() = aver.getLeftOperand().getUnderlyingValue()
     )
   }
 
   override AverageExpr toReport() {
-    getParent() = result.getLeftOperand().stripParens()
+    getParent() = result.getLeftOperand().getUnderlyingValue()
   }
 }
 
diff --git a/javascript/ql/src/LanguageFeatures/BadTypeof.ql b/javascript/ql/src/LanguageFeatures/BadTypeof.ql
@@ -47,7 +47,7 @@ class EqOrSwitch extends ASTNode {
 }
 
 from EqOrSwitch et, TypeofExpr typeof, ConstantString str
-where typeof = et.getAnOperand().stripParens() and
-      str = et.getAnOperand().stripParens() and
+where typeof = et.getAnOperand().getUnderlyingValue() and
+      str = et.getAnOperand().getUnderlyingValue() and
       not str.getStringValue().regexpMatch("undefined|boolean|number|string|object|function|symbol|unknown|date|bigint")
 select typeof, "The result of this 'typeof' expression is compared to '$@', but the two can never be equal.", str, str.getStringValue()
diff --git a/javascript/ql/src/Statements/ImplicitReturn.ql b/javascript/ql/src/Statements/ImplicitReturn.ql
@@ -56,7 +56,7 @@ int numRet(Function f) {
 predicate isDualUseConstructor(Function f) {
   numRet(f) = 1 and
   exists (ReturnStmt ret, DataFlow::NewNode new | ret.getContainer() = f |
-    new.asExpr() = ret.getExpr().stripParens() and
+    new.asExpr() = ret.getExpr().getUnderlyingValue() and
     new.getACallee() = f
   )
 }
diff --git a/javascript/ql/src/Statements/UselessConditional.ql b/javascript/ql/src/Statements/UselessConditional.ql
@@ -31,10 +31,10 @@ predicate isDefensiveInit(VarAccess va) {
     va = o.getLeftOperand().stripParens() and va2.getVariable() = va.getVariable() |
     exists (AssignExpr assgn | va2 = assgn.getTarget() |
       assgn = o.getRightOperand().stripParens() or
-      o = assgn.getRhs().stripParens()
+      o = assgn.getRhs().getUnderlyingValue()
     ) or
     exists (VariableDeclarator vd | va2 = vd.getBindingPattern() |
-      o = vd.getInit().stripParens()
+      o = vd.getInit().getUnderlyingValue()
     )
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,12 @@ predicate acceptableRedefinition(Identifier id) {`
`27`	`27`	`// Date = global.Date`
`28`	`28`	`exists (AssignExpr assgn \|`
`29`	`29`	`id = assgn.getTarget() and`
`30`		`- id.getName() = assgn.getRhs().stripParens().(PropAccess).getPropertyName()`
	`30`	`+ id.getName() = assgn.getRhs().getUnderlyingValue().(PropAccess).getPropertyName()`
`31`	`31`	`) or`
`32`	`32`	`// var Date = global.Date`
`33`	`33`	`exists (VariableDeclarator decl \|`
`34`	`34`	`id = decl.getBindingPattern() and`
`35`		`- id.getName() = decl.getInit().stripParens().(PropAccess).getPropertyName()`
	`35`	`+ id.getName() = decl.getInit().getUnderlyingValue().(PropAccess).getPropertyName()`
`36`	`36`	`)`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import javascript`
`10`	`10`	* Holds if `e` is an expression whose value is invoked as a function.
`11`	`11`	`*/`
`12`	`12`	`private predicate isCallee(Expr e) {`
`13`		`- exists (InvokeExpr invk \| e = invk.getCallee().stripParens())`
	`13`	`+ exists (InvokeExpr invk \| e = invk.getCallee().getUnderlyingValue())`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class RedundantIdemnecantOperand extends RedundantOperand {`
`58`	`58`	`exists (IdemnecantExpr parent \|`
`59`	`59`	`parent = getParent() and`
`60`	`60`	// exclude trivial cases like `1-1`
`61`		`- not parent.getRightOperand().stripParens() instanceof Literal`
	`61`	`+ not parent.getRightOperand().getUnderlyingValue() instanceof Literal`
`62`	`62`	`)`
`63`	`63`	`}`
`64`	`64`	`}`
`@@ -80,7 +80,7 @@ class RedundantIdempotentOperand extends RedundantOperand {`
`80`	`80`	`*/`
`81`	`81`	`class AverageExpr extends DivExpr {`
`82`	`82`	`AverageExpr() {`
`83`		`- getLeftOperand().stripParens() instanceof AddExpr and`
	`83`	`+ getLeftOperand().getUnderlyingValue() instanceof AddExpr and`
`84`	`84`	`getRightOperand().getIntValue() = 2`
`85`	`85`	`}`
`86`	`86`	`}`
`@@ -91,12 +91,12 @@ class AverageExpr extends DivExpr {`
`91`	`91`	`class RedundantAverageOperand extends RedundantOperand {`
`92`	`92`	`RedundantAverageOperand() {`
`93`	`93`	`exists (AverageExpr aver \|`
`94`		`- (AddExpr)getParent() = aver.getLeftOperand().stripParens()`
	`94`	`+ (AddExpr)getParent() = aver.getLeftOperand().getUnderlyingValue()`
`95`	`95`	`)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`override AverageExpr toReport() {`
`99`		`- getParent() = result.getLeftOperand().stripParens()`
	`99`	`+ getParent() = result.getLeftOperand().getUnderlyingValue()`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class EqOrSwitch extends ASTNode {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`from EqOrSwitch et, TypeofExpr typeof, ConstantString str`
`50`		`-where typeof = et.getAnOperand().stripParens() and`
`51`		`- str = et.getAnOperand().stripParens() and`
	`50`	`+where typeof = et.getAnOperand().getUnderlyingValue() and`
	`51`	`+ str = et.getAnOperand().getUnderlyingValue() and`
`52`	`52`	`not str.getStringValue().regexpMatch("undefined\|boolean\|number\|string\|object\|function\|symbol\|unknown\|date\|bigint")`
`53`	`53`	`select typeof, "The result of this 'typeof' expression is compared to '$@', but the two can never be equal.", str, str.getStringValue()`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ int numRet(Function f) {`
`56`	`56`	`predicate isDualUseConstructor(Function f) {`
`57`	`57`	`numRet(f) = 1 and`
`58`	`58`	`exists (ReturnStmt ret, DataFlow::NewNode new \| ret.getContainer() = f \|`
`59`		`- new.asExpr() = ret.getExpr().stripParens() and`
	`59`	`+ new.asExpr() = ret.getExpr().getUnderlyingValue() and`
`60`	`60`	`new.getACallee() = f`
`61`	`61`	`)`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@ predicate isDefensiveInit(VarAccess va) {`
`31`	`31`	`va = o.getLeftOperand().stripParens() and va2.getVariable() = va.getVariable() \|`
`32`	`32`	`exists (AssignExpr assgn \| va2 = assgn.getTarget() \|`
`33`	`33`	`assgn = o.getRightOperand().stripParens() or`
`34`		`- o = assgn.getRhs().stripParens()`
	`34`	`+ o = assgn.getRhs().getUnderlyingValue()`
`35`	`35`	`) or`
`36`	`36`	`exists (VariableDeclarator vd \| va2 = vd.getBindingPattern() \|`
`37`		`- o = vd.getInit().stripParens()`
	`37`	`+ o = vd.getInit().getUnderlyingValue()`
`38`	`38`	`)`
`39`	`39`	`)`
`40`	`40`	`}`