hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-25 08:45:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove duplicate reflectiveCallNode method, and removing redundant getExpr() method

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2019-11-13 15:53:21 +01:00
parent b11a7427c2
commit 538690eee6
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
javascript/ql/src/semmle/javascript/dataflow/Configuration.qll
View File

@@ -308,7 +308,7 @@ abstract class BarrierGuardNode extends DataFlow::Node {
exists(SsaRefinementNode ref, boolean outcome |
nd = DataFlow::ssaDefinitionNode(ref) and
forex(SsaVariable input | input = ref.getAnInput() |
getExpr() = ref.getGuard().getTest() and
getEnclosingExpr() = ref.getGuard().getTest() and
outcome = ref.getGuard().(ConditionGuardNode).getOutcome() and
barrierGuardBlocksExpr(this, outcome, input.getAUse(), label)
)
@@ -317,20 +317,13 @@ abstract class BarrierGuardNode extends DataFlow::Node {
// 2) `nd` is an instance of an access path `p`, and dominated by a barrier for `p`
exists(AccessPath p, BasicBlock bb, ConditionGuardNode cond, boolean outcome |
nd = DataFlow::valueNode(p.getAnInstanceIn(bb)) and
getExpr() = cond.getTest() and
getEnclosingExpr() = cond.getTest() and
outcome = cond.getOutcome() and
barrierGuardBlocksAccessPath(this, outcome, p, label) and
cond.dominates(bb)
)
}
/** Gets the corresponding expression, including that of reflective calls. */
private Expr getExpr() {
result = asExpr()
or
this = DataFlow::reflectiveCallNode(result)
}
/**
* Holds if this node blocks expression `e` provided it evaluates to `outcome`.
*

10
javascript/ql/src/semmle/javascript/dataflow/DataFlow.qll
View File

@@ -996,16 +996,6 @@ module DataFlow {
*/
DataFlow::Node globalAccessPathRootPseudoNode() { result instanceof TGlobalAccessPathRoot }
/**
* Gets a data flow node representing the underlying call performed by the given
* call to `Function.prototype.call` or `Function.prototype.apply`.
*
* For example, for an expression `fn.call(x, y)`, this gets a call node with `fn` as the
* callee, `x` as the receiver, and `y` as the first argument.
*/
DataFlow::InvokeNode reflectiveCallNode(InvokeExpr expr) { result = TReflectiveCallNode(expr, _) }
/**
* Gets a data flow node representing the underlying call performed by the given
* call to `Function.prototype.call` or `Function.prototype.apply`.