hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-01 19:55:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix cfg and dataflow for logical compound assignments

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2021-08-10 12:17:59 +02:00
parent d658ef1dcd
commit 01a202fa10
4 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java
View File

@@ -1659,7 +1659,7 @@ public class CFGExtractor {
@Override
public Void visit(AssignmentExpression nd, SuccessorInfo i) {
// `a &&= b` expands to `a || (a = b);`
// `a &&= b` expands to `a && (a = b);`
// The CFG is a conditional assignment, so we go through the assignment `nd` last.
if ("&&=".equals(nd.getOperator()) || "||=".equals(nd.getOperator()) || "??=".equals(nd.getOperator())) {
if ("&&=".equals(nd.getOperator())) {
@@ -1673,7 +1673,7 @@ public class CFGExtractor {
visitWithSuccessors(nd.getLeft(), union(First.of(nd.getRight()), i.getAllSuccessors()));
}
visitWithSuccessors(nd.getRight(), First.of(nd)); // from right to assignment.
visitWithSuccessors(nd.getRight(), nd); // from right to assignment.
writeSuccessors(nd, i.getGuardedSuccessors(nd));
} else {

8
javascript/extractor/tests/es2021/output/trap/assign.js.trap
View File

@@ -556,7 +556,7 @@ hasLocation(#20168,#20109)
successor(#20161,#20164)
successor(#20164,#20165)
successor(#20164,#20168)
successor(#20165,#20164)
successor(#20165,#20162)
successor(#20162,#20168)
successor(#20156,#20159)
#20169=*
@@ -569,7 +569,7 @@ hasLocation(#20170,#20093)
successor(#20170,#20160)
successor(#20159,#20169)
successor(#20159,#20170)
successor(#20160,#20159)
successor(#20160,#20157)
successor(#20157,#20161)
successor(#20151,#20154)
#20171=*
@@ -582,7 +582,7 @@ hasLocation(#20172,#20085)
successor(#20172,#20156)
successor(#20154,#20171)
successor(#20154,#20172)
successor(#20155,#20154)
successor(#20155,#20152)
successor(#20152,#20156)
successor(#20141,#20147)
successor(#20150,#20143)
@@ -601,7 +601,7 @@ hasLocation(#20174,#20063)
successor(#20174,#20134)
successor(#20139,#20173)
successor(#20139,#20174)
successor(#20140,#20139)
successor(#20140,#20137)
successor(#20137,#20134)
successor(#20136,#20139)
successor(#20134,#20141)