Jim, could you check in the rest of disjointness so that this compiles?

This is a temporary fix to make the compiler work.

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index ca305d16e273e736db60e04bbafb6be5b863bced..04fb75407b7bf94349257c164d8cce066b0d66e9 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -41,7 +41,7 @@ import Analysis.Locality.GenerateConversions;
 import Analysis.Prefetch.PrefetchAnalysis;
 import Analysis.FlatIRGraph.FlatIRGraph;
 import Analysis.OwnershipAnalysis.OwnershipAnalysis;
-import Analysis.Disjoint.DisjointAnalysis;
+//import Analysis.Disjoint.DisjointAnalysis;
 import Analysis.MLP.MLPAnalysis;
 import Analysis.Loops.*;
 import Analysis.Liveness;
@@ -495,12 +495,12 @@ public class Main {
                              oa);
     }    
 
-    if (state.DISJOINT) {
+    /*    if (state.DISJOINT) {
       CallGraph        cg = new CallGraph(state);
       Liveness         l  = new Liveness();
       ArrayReferencees ar = new ArrayReferencees(state);
       DisjointAnalysis oa = new DisjointAnalysis(state, tu, cg, l, ar);
-    }
+      }*/
 
     if (state.TAGSTATE) {
       CallGraph callgraph=new CallGraph(state);