hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

JS: Use the LHS as the location for SsaExplicitDefinition

Browse Source
This commit is contained in:
Asger F
2025-08-28 11:35:15 +02:00
parent 4a687a1222
commit d117c52d2f
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
javascript/ql/lib/semmle/javascript/SSA.qll
View File

@@ -108,8 +108,8 @@ private module Internal {
*/ */
cached cached
newtype TSsaDefinition = newtype TSsaDefinition =
TExplicitDef(ReachableBasicBlock bb, int i, VarDef d, SsaSourceVariable v) { TExplicitDef(ReachableBasicBlock bb, int i, VarDef d, SsaSourceVariable v, VarRef lhs) {
bb.defAt(i, v, d) and bb.defAt(i, v, d, lhs) and
( (
liveAfterDef(bb, i, v) or liveAfterDef(bb, i, v) or
v.isCaptured() v.isCaptured()
@@ -509,19 +509,22 @@ class SsaDefinition extends TSsaDefinition {
*/ */
class SsaExplicitDefinition extends SsaDefinition, TExplicitDef { class SsaExplicitDefinition extends SsaDefinition, TExplicitDef {
override predicate definesAt(ReachableBasicBlock bb, int i, SsaSourceVariable v) { override predicate definesAt(ReachableBasicBlock bb, int i, SsaSourceVariable v) {
this = TExplicitDef(bb, i, _, v) this = TExplicitDef(bb, i, _, v, _)
} }
/** This SSA definition corresponds to the definition of `v` at `def`. */ /** This SSA definition corresponds to the definition of `v` at `def`. */
predicate defines(VarDef def, SsaSourceVariable v) { this = TExplicitDef(_, _, def, v) } predicate defines(VarDef def, SsaSourceVariable v) { this = TExplicitDef(_, _, def, v, _) }
/** Gets the variable definition wrapped by this SSA definition. */ /** Gets the variable definition wrapped by this SSA definition. */
VarDef getDef() { this = TExplicitDef(_, _, result, _) } VarDef getDef() { this = TExplicitDef(_, _, result, _, _) }
/** Gets the variable reference appearing on the left-hand side of this assignment. */
VarRef getLhs() { this = TExplicitDef(_, _, _, _, result) }
/** Gets the basic block to which this definition belongs. */ /** Gets the basic block to which this definition belongs. */
override ReachableBasicBlock getBasicBlock() { this.definesAt(result, _, _) } override ReachableBasicBlock getBasicBlock() { this.definesAt(result, _, _) }
override SsaSourceVariable getSourceVariable() { this = TExplicitDef(_, _, _, result) } override SsaSourceVariable getSourceVariable() { this = TExplicitDef(_, _, _, result, _) }
override VarDef getAContributingVarDef() { result = this.getDef() } override VarDef getAContributingVarDef() { result = this.getDef() }
@@ -533,6 +536,8 @@ class SsaExplicitDefinition extends SsaDefinition, TExplicitDef {
override string prettyPrintDef() { result = this.getDef().toString() } override string prettyPrintDef() { result = this.getDef().toString() }
override Location getLocation() { result = this.getLhs().getLocation() }
/** /**
* Gets the data flow node representing the incoming value assigned at this definition, * Gets the data flow node representing the incoming value assigned at this definition,
* if any. * if any.

12
javascript/ql/lib/semmle/javascript/internal/BasicBlockInternal.qll
View File

@@ -67,11 +67,12 @@ private module Cached {
} }
cached cached
predicate defAt(BasicBlock bb, int i, Variable v, VarDef d) { predicate defAt(BasicBlock bb, int i, Variable v, VarDef d, VarRef lhs) {
exists(VarRef lhs | (
lhs = d.getTarget().(BindingPattern).getABindingVarRef() and lhs = d.getTarget().(BindingPattern).getABindingVarRef() and
v = lhs.getVariable() v = lhs.getVariable()
| ) and
(
lhs = d.getTarget() and lhs = d.getTarget() and
bbIndex(bb, d, i) bbIndex(bb, d, i)
or or
@@ -148,7 +149,10 @@ module Public {
predicate useAt(int i, Variable v, VarUse u) { useAt(this, i, v, u) } predicate useAt(int i, Variable v, VarUse u) { useAt(this, i, v, u) }
/** Holds if this basic block defines variable `v` in its `i`th node `d`. */ /** Holds if this basic block defines variable `v` in its `i`th node `d`. */
predicate defAt(int i, Variable v, VarDef d) { defAt(this, i, v, d) } predicate defAt(int i, Variable v, VarDef d) { defAt(this, i, v, d, _) }
/** Holds if this basic block defines variable `v` in its `i`th node `d`, and `lhs` is the corresponding variable reference. */
predicate defAt(int i, Variable v, VarDef d, VarRef lhs) { defAt(this, i, v, d, lhs) }
/** /**
* Holds if `v` is live at entry to this basic block and `u` is a use of `v` * Holds if `v` is live at entry to this basic block and `u` is a use of `v`