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

JavaScript: Clear per-function CFG caches after each function.

Browse Source
This commit is contained in:
Max Schaefer
2019-01-28 12:29:47 +00:00
parent e9500e8b75
commit 5eba486d34
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -774,13 +774,13 @@ public class CFGExtractor {
}
// associate statements with their (direct or indirect) labels
private final Map<Statement, Set<String>> loopLabels = new LinkedHashMap<Statement, Set<String>>();
private Map<Statement, Set<String>> loopLabels = new LinkedHashMap<Statement, Set<String>>();
// cache the set of normal control flow successors
private final Map<Node, Object> followingCache = new LinkedHashMap<Node, Object>();
private Map<Node, Object> followingCache = new LinkedHashMap<Node, Object>();
// map from a node in a chain of property accesses or calls to the successor info for the first node in the chain
private final Map<Chainable, SuccessorInfo> chainRootSuccessors = new LinkedHashMap<Chainable, SuccessorInfo>();
private Map<Chainable, SuccessorInfo> chainRootSuccessors = new LinkedHashMap<Chainable, SuccessorInfo>();
/**
* Generate entry node.
@@ -1031,6 +1031,16 @@ public class CFGExtractor {
@Override
public Void visit(IFunction nd, SuccessorInfo i) {
// save per-function caches
Map<Statement, Set<String>> oldLoopLabels = loopLabels;
Map<Node, Object> oldFollowingCache = followingCache;
Map<Chainable, SuccessorInfo> oldChainRootSuccessors = chainRootSuccessors;
// clear caches
loopLabels = new LinkedHashMap<>();
followingCache = new LinkedHashMap<>();
chainRootSuccessors = new LinkedHashMap<>();
if (nd instanceof FunctionDeclaration && nd.hasDeclareKeyword()) {
// All 'declared' statements have a no-op CFG node, but their children should
// not be processed.
@@ -1039,6 +1049,12 @@ public class CFGExtractor {
}
buildFunctionCreation(nd, i);
buildFunctionBody(nd);
// restore caches
loopLabels = oldLoopLabels;
followingCache = oldFollowingCache;
chainRootSuccessors = oldChainRootSuccessors;
return null;
}