fix a case in union where order wasn't necessarily preserved

erik-krogh · erik-krogh · commit d3ea58002df2 · 2021-08-05T08:48:15.000+02:00
diff --git a/javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java
@@ -225,7 +225,14 @@ private static Collection<Node> union(Node x, Collection<Node> ys) {
       return Collections.singleton(x);
     }
     if (ys.contains(x)) {
-      return ys;
+      List<Node> result = new ArrayList<>();
+      result.add(x);
+      for (Node y : ys) {
+        if (y != x) {
+          result.add(y);
+        }
+      }
+      return result;
     }
 
     List<Node> result = new ArrayList<>();
