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

a little more special casing in CFGExtractor union

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2021-08-05 08:32:56 +02:00
parent 7e422a656a
commit 6ca53c8b25
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,9 @@ public class CFGExtractor {
return xs;
}
return nonNullUnion(xs, Collections.singleton(y));
List<Node> result = new ArrayList<>(xs);
result.add(y);
return result;
}
private static Collection<Node> union(Node x, Collection<Node> ys) {
@@ -226,7 +228,10 @@ public class CFGExtractor {
return ys;
}
return nonNullUnion(Collections.singleton(x), ys);
List<Node> result = new ArrayList<>();
result.add(x);
result.addAll(ys);
return result;
}
/**
@@ -240,14 +245,6 @@ public class CFGExtractor {
return xs;
}
return nonNullUnion(xs, ys);
}
/**
* Creates an order preserving concatenation of the nodes in `xs` and `ys` without duplicates.
* Where `xs` and `ys` have non null values, and are non-empty.
*/
private static Collection<Node> nonNullUnion(Collection<Node> xs, Collection<Node> ys) {
List<Node> result = new ArrayList<>(xs);
for (Node y : ys) {
if (!result.contains(y)) {