revert changes to js/useless-expression

erik-krogh · erik-krogh · commit cdde8aea582d · 2019-10-08T11:54:56.000+02:00
diff --git a/javascript/ql/src/Expressions/ExprHasNoEffect.qll b/javascript/ql/src/Expressions/ExprHasNoEffect.qll
@@ -28,8 +28,6 @@ predicate inVoidContext(Expr e) {
     i < n - 1 or inVoidContext(seq)
   ) 
   or
-  exists(ParExpr par | par.getExpression() = e and inVoidContext(par) )
-  or
   exists(ForStmt stmt | e = stmt.getUpdate())
   or
   exists(ForStmt stmt | e = stmt.getInit() |
@@ -38,8 +36,4 @@ predicate inVoidContext(Expr e) {
   )
   or
   exists(LogicalBinaryExpr logical | e = logical.getRightOperand() and inVoidContext(logical))
-  or 
-  exists(TypeAssertion assert | assert.getExpression() = e and inVoidContext(assert))
-  or 
-  exists(UnaryExpr unOp | unOp.getOperator() = "void" and unOp.getOperand() = e)
 }
diff --git a/javascript/ql/src/Statements/UseOfReturnlessFunction.ql b/javascript/ql/src/Statements/UseOfReturnlessFunction.ql
@@ -42,6 +42,10 @@ predicate benignContext(Expr e) {
   exists(SeqExpr parent | parent.getAnOperand() = e and benignContext(parent))
   or
   exists(ParExpr par | par.getExpression() = e and benignContext(par))
+  or 
+  exists(TypeAssertion assert | assert.getExpression() = e and inVoidContext(assert))
+  or 
+  exists(UnaryExpr unOp | unOp.getOperator() = "void" and unOp.getOperand() = e)
   or
   
   // It is ok (or to be flagged by another query?) to await a non-async function. 

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ predicate inVoidContext(Expr e) {`
`28`	`28`	`i < n - 1 or inVoidContext(seq)`
`29`	`29`	`)`
`30`	`30`	`or`
`31`		`- exists(ParExpr par \| par.getExpression() = e and inVoidContext(par) )`
`32`		`- or`
`33`	`31`	`exists(ForStmt stmt \| e = stmt.getUpdate())`
`34`	`32`	`or`
`35`	`33`	`exists(ForStmt stmt \| e = stmt.getInit() \|`
`@@ -38,8 +36,4 @@ predicate inVoidContext(Expr e) {`
`38`	`36`	`)`
`39`	`37`	`or`
`40`	`38`	`exists(LogicalBinaryExpr logical \| e = logical.getRightOperand() and inVoidContext(logical))`
`41`		`- or`
`42`		`- exists(TypeAssertion assert \| assert.getExpression() = e and inVoidContext(assert))`
`43`		`- or`
`44`		`- exists(UnaryExpr unOp \| unOp.getOperator() = "void" and unOp.getOperand() = e)`
`45`	`39`	`}`