Merge pull request #2051 from MarcMil/hashsparseset

Use HashSparseSets, which do not have a linear adding cost

Author: StevenArzt

src/main/java/soot/toolkits/scalar/InitAnalysis.java

@@ -52,12 +52,12 @@ public InitAnalysis(DirectedBodyGraph<Unit> g) {
 
   @Override
   protected FlowSet<Local> entryInitialFlow() {
-    return new ArraySparseSet<Local>();
+    return new HashSparseSet<Local>();
   }
 
   @Override
   protected FlowSet<Local> newInitialFlow() {
-    FlowSet<Local> ret = new ArraySparseSet<Local>();
+    FlowSet<Local> ret = new HashSparseSet<Local>();
     allLocals.copy(ret);
     return ret;
   }

src/main/java/soot/toolkits/scalar/SimpleLiveLocals.java

@@ -77,13 +77,13 @@ public SimpleLiveLocals(DirectedBodyGraph<Unit> graph) {
 
   @Override
   public List<Local> getLiveLocalsAfter(Unit s) {
-    // ArraySparseSet returns a unbacked list of elements!
+    // HashSparseSet returns a unbacked list of elements!
     return analysis.getFlowAfter(s).toList();
   }
 
   @Override
   public List<Local> getLiveLocalsBefore(Unit s) {
-    // ArraySparseSet returns a unbacked list of elements!
+    // HashSparseSet returns a unbacked list of elements!
     return analysis.getFlowBefore(s).toList();
   }
 
@@ -94,7 +94,7 @@ private static class Analysis extends BackwardFlowAnalysis<Unit, FlowSet<Local>>
 
     @Override
     protected FlowSet<Local> newInitialFlow() {
-      return new ArraySparseSet<Local>();
+      return new HashSparseSet<Local>();
     }
 
     @Override