Add second type parameter to GraphReachability.

khatchad · khatchad · commit 016461e1fc21 · 2017-01-27T18:28:09.000-05:00
My best guess of what it should be.
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/accesspath/AccessPathSetTransformers.java b/com.ibm.safe.typestate/src/com/ibm/safe/accesspath/AccessPathSetTransformers.java
@@ -64,13 +64,13 @@ public abstract class AccessPathSetTransformers {
 
   private final AccessPathDictionary APDictionary = new AccessPathDictionary();
 
-  public AccessPathSetTransformers(PointerAnalysis pointerAnalysis, GraphReachability<CGNode> reach) {
+  public AccessPathSetTransformers(PointerAnalysis pointerAnalysis, GraphReachability<CGNode,CGNode> reach) {
     this.pointerAnalysis = pointerAnalysis;
     this.aliasOracle = makeAliasOracle(pointerAnalysis, APDictionary, reach);
   }
 
   protected abstract AliasOracle makeAliasOracle(PointerAnalysis pointerAnalysis, AccessPathDictionary APDictionary,
-      GraphReachability<CGNode> reach);
+      GraphReachability<CGNode,CGNode> reach);
 
   /**
    * kill all paths of s that start with x
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/accesspath/FIAliasOracle.java b/com.ibm.safe.typestate/src/com/ibm/safe/accesspath/FIAliasOracle.java
@@ -58,15 +58,15 @@ public class FIAliasOracle implements AliasOracle {
   /**
    * reachability analysis over the call graph
    */
-  private final GraphReachability<CGNode> reach;
+  private final GraphReachability<CGNode,CGNode> reach;
 
   private final AccessPathDictionary APDictionary;
 
   /**
    * @param pointerAnalysis
    *          governing pointer analysis
    */
-  public FIAliasOracle(PointerAnalysis pointerAnalysis, AccessPathDictionary APDictionary, GraphReachability<CGNode> reach) {
+  public FIAliasOracle(PointerAnalysis pointerAnalysis, AccessPathDictionary APDictionary, GraphReachability<CGNode,CGNode> reach) {
     this.pointerAnalysis = pointerAnalysis;
     this.reach = reach;
     this.APDictionary = APDictionary;
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/AccessPathFunctionProvider.java b/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/AccessPathFunctionProvider.java
@@ -139,7 +139,7 @@ protected AccessPathSet removeDeadPaths(AccessPathSet s, CGNode n, ISSABasicBloc
   /**
    * Call graph reachability analysis
    */
-  private final GraphReachability<CGNode> reach;
+  private final GraphReachability<CGNode,CGNode> reach;
 
   /**
    * governing typestate options
@@ -164,7 +164,7 @@ protected AccessPathSet removeDeadPaths(AccessPathSet s, CGNode n, ISSABasicBloc
    */
   public AccessPathFunctionProvider(CallGraph cg, PointerAnalysis pointerAnalysis, ICFGSupergraph supergraph,
       QuadTypeStateDomain domain, ITypeStateDFA dfa, Collection<InstanceKey> trackedInstances, AccessPathSetTransformers apst,
-      GraphReachability<CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)
+      GraphReachability<CGNode,CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)
       throws PropertiesException {
     super(cg, pointerAnalysis, supergraph, domain, dfa, trackedInstances, live, traceReporter);
     this.APDictionary = apst.getAPDictionary();
@@ -924,7 +924,7 @@ protected HeapGraph getHeapGraph() {
   /**
    * @return Returns the reach.
    */
-  protected GraphReachability<CGNode> getReach() {
+  protected GraphReachability<CGNode,CGNode> getReach() {
     return reach;
   }
 
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/AccessPathSolver.java b/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/AccessPathSolver.java
@@ -80,7 +80,7 @@ public abstract class AccessPathSolver extends QuadSolver {
   /**
    * call graph reachability analysis
    */
-  private GraphReachability<CGNode> reach;
+  private GraphReachability<CGNode,CGNode> reach;
 
   private final AccessPathDictionary APDictionary;
 
@@ -96,7 +96,7 @@ public abstract class AccessPathSolver extends QuadSolver {
    * @param warnings -
    *            collector of produced warnings
    */
-  public AccessPathSolver(AnalysisOptions domoOptions, CallGraph cg, GraphReachability<CGNode> reach,
+  public AccessPathSolver(AnalysisOptions domoOptions, CallGraph cg, GraphReachability<CGNode,CGNode> reach,
       PointerAnalysis pointerAnalysis, ITypeStateDFA dfa, TypeStateOptions options, AccessPathSetTransformers apst,
       ILiveObjectAnalysis live, BenignOracle ora, TypeStateMetrics metrics, IReporter reporter, TraceReporter traceReporter,
       IMergeFunctionFactory mergeFactory) {
@@ -116,7 +116,7 @@ protected AccessPathSetTransformers getApsTransformer() {
   /**
    * @return Returns the reach.
    */
-  protected GraphReachability<CGNode> getReach() {
+  protected GraphReachability<CGNode,CGNode> getReach() {
     return reach;
   }
 
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/AbstractMustAPFunctionProvider.java b/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/AbstractMustAPFunctionProvider.java
@@ -97,7 +97,7 @@ public abstract class AbstractMustAPFunctionProvider extends AccessPathFunctionP
    */
   public AbstractMustAPFunctionProvider(CallGraph cg, PointerAnalysis pointerAnalysis, ICFGSupergraph supergraph,
       QuadTypeStateDomain domain, ITypeStateDFA dfa, Collection<InstanceKey> trackedInstances, AccessPathSetTransformers apst,
-      GraphReachability<CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)
+      GraphReachability<CGNode,CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)
       throws PropertiesException {
     super(cg, pointerAnalysis, supergraph, domain, dfa, trackedInstances, apst, reach, options, live, traceReporter);
   }
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/AbstractMustAPSolver.java b/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/AbstractMustAPSolver.java
@@ -51,7 +51,7 @@ public abstract class AbstractMustAPSolver extends AccessPathSolver {
    * @param warnings -
    *            collector of produced warnings
    */
-  public AbstractMustAPSolver(AnalysisOptions domoOptions, CallGraph cg, GraphReachability<CGNode> reach,
+  public AbstractMustAPSolver(AnalysisOptions domoOptions, CallGraph cg, GraphReachability<CGNode,CGNode> reach,
       PointerAnalysis pointerAnalysis, ITypeStateDFA dfa, TypeStateOptions options, ILiveObjectAnalysis live, BenignOracle ora,
       TypeStateMetrics metrics, IReporter reporter, TraceReporter traceReporter, IMergeFunctionFactory mergeFactory) {
     super(domoOptions, cg, reach, pointerAnalysis, dfa, options, new MustAPSetTransformers(pointerAnalysis, reach), live, ora,
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/MustAPFunctionProvider.java b/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/MustAPFunctionProvider.java
@@ -54,7 +54,7 @@ public class MustAPFunctionProvider extends AbstractMustAPFunctionProvider {
 
   public MustAPFunctionProvider(CallGraph cg, PointerAnalysis pointerAnalysis, ICFGSupergraph supergraph,
       QuadTypeStateDomain domain, ITypeStateDFA dfa, Collection<InstanceKey> trackedInstances, AccessPathSetTransformers apst,
-      GraphReachability<CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)
+      GraphReachability<CGNode,CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)
       throws PropertiesException {
     super(cg, pointerAnalysis, supergraph, domain, dfa, trackedInstances, apst, reach, options, live, traceReporter);
   }
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/MustAPSetTransformers.java b/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/MustAPSetTransformers.java
@@ -53,7 +53,7 @@ public class MustAPSetTransformers extends AccessPathSetTransformers {
   /**
    * @param pointerAnalysis
    */
-  public MustAPSetTransformers(PointerAnalysis pointerAnalysis, GraphReachability<CGNode> reach) {
+  public MustAPSetTransformers(PointerAnalysis pointerAnalysis, GraphReachability<CGNode,CGNode> reach) {
     super(pointerAnalysis, reach);
   }
 
@@ -64,7 +64,7 @@ public MustAPSetTransformers(PointerAnalysis pointerAnalysis, GraphReachability<
    *      com.ibm.wala.ipa.callgraph.CallGraph)
    */
   protected AliasOracle makeAliasOracle(PointerAnalysis pointerAnalysis, AccessPathDictionary APDictionary,
-      GraphReachability<CGNode> reach) {
+      GraphReachability<CGNode,CGNode> reach) {
     return new FIAliasOracle(pointerAnalysis, APDictionary, reach);
   }
 
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/MustAPSolver.java b/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/MustAPSolver.java
@@ -45,7 +45,7 @@
  */
 public class MustAPSolver extends AbstractMustAPSolver {
 
-  public MustAPSolver(AnalysisOptions domoOptions, CallGraph cg, GraphReachability<CGNode> reach, PointerAnalysis pointerAnalysis,
+  public MustAPSolver(AnalysisOptions domoOptions, CallGraph cg, GraphReachability<CGNode,CGNode> reach, PointerAnalysis pointerAnalysis,
       ITypeStateDFA dfa, TypeStateOptions options, ILiveObjectAnalysis live, BenignOracle ora, TypeStateMetrics metrics,
       IReporter reporter, TraceReporter traceReporter, IMergeFunctionFactory mergeFactory) {
     super(domoOptions, cg, reach, pointerAnalysis, dfa, options, live, ora, metrics, reporter, traceReporter, mergeFactory);
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/mustnot/MustMustNotAPFunctionProvider.java b/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/mustnot/MustMustNotAPFunctionProvider.java
@@ -79,7 +79,7 @@ public class MustMustNotAPFunctionProvider extends MustAPFunctionProvider {
 
   public MustMustNotAPFunctionProvider(CallGraph cg, PointerAnalysis pointerAnalysis, ICFGSupergraph supergraph,
       QuadTypeStateDomain domain, ITypeStateDFA dfa, Collection<InstanceKey> trackedInstances, AccessPathSetTransformers apst,
-      GraphReachability<CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)
+      GraphReachability<CGNode,CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)
       throws PropertiesException {
     super(cg, pointerAnalysis, supergraph, domain, dfa, trackedInstances, apst, reach, options, live, traceReporter);
   }
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/mustnot/MustMustNotAPSolver.java b/com.ibm.safe.typestate/src/com/ibm/safe/typestate/ap/must/mustnot/MustMustNotAPSolver.java
@@ -41,7 +41,7 @@
  */
 public class MustMustNotAPSolver extends MustAPSolver {
 
-  public MustMustNotAPSolver(AnalysisOptions domoOptions, CallGraph cg, GraphReachability<CGNode> reach,
+  public MustMustNotAPSolver(AnalysisOptions domoOptions, CallGraph cg, GraphReachability<CGNode,CGNode> reach,
       PointerAnalysis pointerAnalysis, ITypeStateDFA dfa, TypeStateOptions options, ILiveObjectAnalysis live, BenignOracle ora,
       TypeStateMetrics metrics, IReporter reporter, TraceReporter traceReporter, IMergeFunctionFactory mergeFactory) {
     super(domoOptions, cg, reach, pointerAnalysis, dfa, options, live, ora, metrics, reporter, traceReporter, mergeFactory);
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/typestate/core/TypestateSolverFactory.java b/com.ibm.safe.typestate/src/com/ibm/safe/typestate/core/TypestateSolverFactory.java
@@ -223,8 +223,8 @@ private static ISafeSolver loadTVLASolver(AnalysisOptions domoOptions, CallGraph
     return ret;
   }
 
-  private static GraphReachability<CGNode> computeReachability(CallGraph cg) throws CancelException {
-    GraphReachability<CGNode> reach = new GraphReachability<CGNode>(cg, IndiscriminateFilter.singleton());
+  private static GraphReachability<CGNode,CGNode> computeReachability(CallGraph cg) throws CancelException {
+    GraphReachability<CGNode,CGNode> reach = new GraphReachability<CGNode,CGNode>(cg, IndiscriminateFilter.singleton());
     // TODO: Allow real timeouts of CG reachability computations?
     reach.solve(null);
     return reach;
diff --git a/com.ibm.safe.typestate/src/com/ibm/safe/typestate/local/LocalMustMustNotSolver.java b/com.ibm.safe.typestate/src/com/ibm/safe/typestate/local/LocalMustMustNotSolver.java
@@ -58,7 +58,7 @@ public class LocalMustMustNotSolver extends AbstractLocalSolver {
   /**
    * call graph reachability analysis
    */
-  private final GraphReachability<CGNode> reach;
+  private final GraphReachability<CGNode,CGNode> reach;
 
   /**
    * @param cg
@@ -69,7 +69,7 @@ public class LocalMustMustNotSolver extends AbstractLocalSolver {
    * @param warnings
    */
   public LocalMustMustNotSolver(CallGraph cg, PointerAnalysis pointerAnalysis, HeapGraph heapGraph, TypeStateProperty property,
-      TypeStateOptions options, ILiveObjectAnalysis live, GraphReachability<CGNode> reach, BenignOracle ora,
+      TypeStateOptions options, ILiveObjectAnalysis live, GraphReachability<CGNode,CGNode> reach, BenignOracle ora,
       TypeStateMetrics metrics, IReporter reporter, IMergeFunctionFactory mergeFactory) {
     super(cg, pointerAnalysis, property, options, live, ora, metrics, reporter, mergeFactory);
     this.heapGraph = heapGraph;

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public abstract class AbstractMustAPFunctionProvider extends AccessPathFunctionP`
`97`	`97`	`*/`
`98`	`98`	`public AbstractMustAPFunctionProvider(CallGraph cg, PointerAnalysis pointerAnalysis, ICFGSupergraph supergraph,`
`99`	`99`	`QuadTypeStateDomain domain, ITypeStateDFA dfa, Collection<InstanceKey> trackedInstances, AccessPathSetTransformers apst,`
`100`		`- GraphReachability<CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)`
	`100`	`+ GraphReachability<CGNode,CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)`
`101`	`101`	`throws PropertiesException {`
`102`	`102`	`super(cg, pointerAnalysis, supergraph, domain, dfa, trackedInstances, apst, reach, options, live, traceReporter);`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public class MustAPFunctionProvider extends AbstractMustAPFunctionProvider {`
`54`	`54`
`55`	`55`	`public MustAPFunctionProvider(CallGraph cg, PointerAnalysis pointerAnalysis, ICFGSupergraph supergraph,`
`56`	`56`	`QuadTypeStateDomain domain, ITypeStateDFA dfa, Collection<InstanceKey> trackedInstances, AccessPathSetTransformers apst,`
`57`		`- GraphReachability<CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)`
	`57`	`+ GraphReachability<CGNode,CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)`
`58`	`58`	`throws PropertiesException {`
`59`	`59`	`super(cg, pointerAnalysis, supergraph, domain, dfa, trackedInstances, apst, reach, options, live, traceReporter);`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public class MustMustNotAPFunctionProvider extends MustAPFunctionProvider {`
`79`	`79`
`80`	`80`	`public MustMustNotAPFunctionProvider(CallGraph cg, PointerAnalysis pointerAnalysis, ICFGSupergraph supergraph,`
`81`	`81`	`QuadTypeStateDomain domain, ITypeStateDFA dfa, Collection<InstanceKey> trackedInstances, AccessPathSetTransformers apst,`
`82`		`- GraphReachability<CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)`
	`82`	`+ GraphReachability<CGNode,CGNode> reach, TypeStateOptions options, ILiveObjectAnalysis live, TraceReporter traceReporter)`
`83`	`83`	`throws PropertiesException {`
`84`	`84`	`super(cg, pointerAnalysis, supergraph, domain, dfa, trackedInstances, apst, reach, options, live, traceReporter);`
`85`	`85`	`}`