generate annotated source code again but it's still not the correct one...
[IRC.git] / Robust / src / Analysis / OwnershipAnalysis / OwnershipAnalysis.java
index 05a219761209fc191033de162298554b32058364..cfdfb17c54f4cb176a463e9448e2fcfa2642e0c6 100644 (file)
@@ -1,6 +1,8 @@
 package Analysis.OwnershipAnalysis;
 
 import Analysis.CallGraph.*;
+import Analysis.Liveness;
+import Analysis.ArrayReferencees;
 import IR.*;
 import IR.Flat.*;
 import IR.Tree.Modifiers;
@@ -20,66 +22,135 @@ public class OwnershipAnalysis {
 
   public HashSet<AllocationSite>
   getFlaggedAllocationSitesReachableFromTask(TaskDescriptor td) {
+    checkAnalysisComplete();
     return getFlaggedAllocationSitesReachableFromTaskPRIVATE(td);
   }
 
   public AllocationSite getAllocationSiteFromFlatNew(FlatNew fn) {
+    checkAnalysisComplete();
     return getAllocationSiteFromFlatNewPRIVATE(fn);
   }
 
-  public boolean createsPotentialAliases(Descriptor taskOrMethod,
-                                         int paramIndex1,
-                                         int paramIndex2) {
+  public AllocationSite getAllocationSiteFromHeapRegionNodeID(Integer id) {
+    checkAnalysisComplete();
+    return mapHrnIdToAllocationSite.get(id);
+  }
 
-    OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get(taskOrMethod);
+  public Set<HeapRegionNode> createsPotentialAliases(Descriptor taskOrMethod,
+                                                     int paramIndex1,
+                                                     int paramIndex2) {
+    checkAnalysisComplete();
+    OwnershipGraph og = getGraphOfAllContextsFromDescriptor(taskOrMethod);
     assert(og != null);
     return og.hasPotentialAlias(paramIndex1, paramIndex2);
   }
 
-  public boolean createsPotentialAliases(Descriptor taskOrMethod,
-                                         int paramIndex,
-                                         AllocationSite alloc) {
-
-    OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get(taskOrMethod);
+  public Set<HeapRegionNode> createsPotentialAliases(Descriptor taskOrMethod,
+                                                     int paramIndex,
+                                                     AllocationSite alloc) {
+    checkAnalysisComplete();
+    OwnershipGraph og = getGraphOfAllContextsFromDescriptor(taskOrMethod);
     assert(og != null);
     return og.hasPotentialAlias(paramIndex, alloc);
   }
 
-  public boolean createsPotentialAliases(Descriptor taskOrMethod,
-                                         AllocationSite alloc,
-                                         int paramIndex) {
-
-    OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get(taskOrMethod);
+  public Set<HeapRegionNode> createsPotentialAliases(Descriptor taskOrMethod,
+                                                     AllocationSite alloc,
+                                                     int paramIndex) {
+    checkAnalysisComplete();
+    OwnershipGraph og = getGraphOfAllContextsFromDescriptor(taskOrMethod);
     assert(og != null);
     return og.hasPotentialAlias(paramIndex, alloc);
   }
 
-  public boolean createsPotentialAliases(Descriptor taskOrMethod,
-                                         AllocationSite alloc1,
-                                         AllocationSite alloc2) {
-
-    OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get(taskOrMethod);
+  public Set<HeapRegionNode> createsPotentialAliases(Descriptor taskOrMethod,
+                                                     AllocationSite alloc1,
+                                                     AllocationSite alloc2) {
+    checkAnalysisComplete();
+    OwnershipGraph og = getGraphOfAllContextsFromDescriptor(taskOrMethod);
     assert(og != null);
     return og.hasPotentialAlias(alloc1, alloc2);
   }
 
+
+  protected OwnershipGraph getGraphOfAllContextsFromDescriptor(Descriptor d) {
+    checkAnalysisComplete();
+
+    assert d != null;
+
+    OwnershipGraph og = new OwnershipGraph();
+
+    assert mapDescriptorToAllMethodContexts.containsKey(d);
+    HashSet<MethodContext> contexts = mapDescriptorToAllMethodContexts.get(d);
+    Iterator<MethodContext> mcItr = contexts.iterator();
+    while( mcItr.hasNext() ) {
+      MethodContext mc = mcItr.next();
+
+      OwnershipGraph ogContext = mapMethodContextToCompleteOwnershipGraph.get(mc);
+      assert ogContext != null;
+
+      og.merge(ogContext);
+    }
+
+    return og;
+  }
+
+
+  public String prettyPrintNodeSet(Set<HeapRegionNode> s) {
+    checkAnalysisComplete();
+
+    String out = "{\n";
+
+    Iterator<HeapRegionNode> i = s.iterator();
+    while( i.hasNext() ) {
+      HeapRegionNode n = i.next();
+
+      AllocationSite as = n.getAllocationSite();
+      if( as == null ) {
+        out += "  "+n.toString()+",\n";
+      } else {
+        out += "  "+n.toString()+": "+as.toStringVerbose()+",\n";
+      }
+    }
+
+    out += "}\n";
+    return out;
+  }
+
+
   // use the methods given above to check every possible alias
   // between task parameters and flagged allocation sites reachable
   // from the task
-  public void writeAllAliases(String outputFile) throws java.io.IOException {
+  public void writeAllAliases(String outputFile,
+                              String timeReport,
+                              String justTime,
+                              boolean tabularOutput,
+                              int numLines
+                              ) throws java.io.IOException {
+    checkAnalysisComplete();
 
     BufferedWriter bw = new BufferedWriter(new FileWriter(outputFile) );
 
+    if( !tabularOutput ) {
+      bw.write("Conducting ownership analysis with allocation depth = "+allocationDepth+"\n");
+      bw.write(timeReport+"\n");
+    }
+
+    int numAlias = 0;
+
     // look through every task for potential aliases
     Iterator taskItr = state.getTaskSymbolTable().getDescriptorsIterator();
     while( taskItr.hasNext() ) {
       TaskDescriptor td = (TaskDescriptor) taskItr.next();
 
-      bw.write("\n---------"+td+"--------\n");
-      bw.flush();
+      if( !tabularOutput ) {
+        bw.write("\n---------"+td+"--------\n");
+      }
 
       HashSet<AllocationSite> allocSites = getFlaggedAllocationSitesReachableFromTask(td);
 
+      Set<HeapRegionNode> common;
+
       // for each task parameter, check for aliases with
       // other task parameters and every allocation site
       // reachable from this task
@@ -88,26 +159,38 @@ public class OwnershipAnalysis {
       FlatMethod fm = state.getMethodFlat(td);
       for( int i = 0; i < fm.numParameters(); ++i ) {
 
-       // for the ith parameter check for aliases to all
-       // higher numbered parameters
-       for( int j = i + 1; j < fm.numParameters(); ++j ) {
-         if( createsPotentialAliases(td, i, j) ) {
-           foundSomeAlias = true;
-           bw.write("Potential alias between parameters "+i+" and "+j+".\n");
-         }
-       }
-
-       // for the ith parameter, check for aliases against
-       // the set of allocation sites reachable from this
-       // task context
-       Iterator allocItr = allocSites.iterator();
-       while( allocItr.hasNext() ) {
-         AllocationSite as = (AllocationSite) allocItr.next();
-         if( createsPotentialAliases(td, i, as) ) {
-           foundSomeAlias = true;
-           bw.write("Potential alias between parameter "+i+" and "+as+".\n");
-         }
-       }
+        // for the ith parameter check for aliases to all
+        // higher numbered parameters
+        for( int j = i + 1; j < fm.numParameters(); ++j ) {
+          common = createsPotentialAliases(td, i, j);
+          if( !common.isEmpty() ) {
+            foundSomeAlias = true;
+            if( !tabularOutput ) {
+              bw.write("Potential alias between parameters "+i+" and "+j+".\n");
+              bw.write(prettyPrintNodeSet(common)+"\n");
+            } else {
+              ++numAlias;
+            }
+          }
+        }
+
+        // for the ith parameter, check for aliases against
+        // the set of allocation sites reachable from this
+        // task context
+        Iterator allocItr = allocSites.iterator();
+        while( allocItr.hasNext() ) {
+          AllocationSite as = (AllocationSite) allocItr.next();
+          common = createsPotentialAliases(td, i, as);
+          if( !common.isEmpty() ) {
+            foundSomeAlias = true;
+            if( !tabularOutput ) {
+              bw.write("Potential alias between parameter "+i+" and "+as.getFlatNew()+".\n");
+              bw.write(prettyPrintNodeSet(common)+"\n");
+            } else {
+              ++numAlias;
+            }
+          }
+        }
       }
 
       // for each allocation site check for aliases with
@@ -116,68 +199,154 @@ public class OwnershipAnalysis {
       HashSet<AllocationSite> outerChecked = new HashSet<AllocationSite>();
       Iterator allocItr1 = allocSites.iterator();
       while( allocItr1.hasNext() ) {
-       AllocationSite as1 = (AllocationSite) allocItr1.next();
-
-       Iterator allocItr2 = allocSites.iterator();
-       while( allocItr2.hasNext() ) {
-         AllocationSite as2 = (AllocationSite) allocItr2.next();
-
-         if( !outerChecked.contains(as2) &&
-             createsPotentialAliases(td, as1, as2) ) {
-           foundSomeAlias = true;
-           bw.write("Potential alias between "+as1+" and "+as2+".\n");
-         }
-       }
-
-       outerChecked.add(as1);
+        AllocationSite as1 = (AllocationSite) allocItr1.next();
+
+        Iterator allocItr2 = allocSites.iterator();
+        while( allocItr2.hasNext() ) {
+          AllocationSite as2 = (AllocationSite) allocItr2.next();
+
+          if( !outerChecked.contains(as2) ) {
+            common = createsPotentialAliases(td, as1, as2);
+
+            if( !common.isEmpty() ) {
+              foundSomeAlias = true;
+              if( !tabularOutput ) {
+                bw.write("Potential alias between "+as1.getFlatNew()+" and "+as2.getFlatNew()+".\n");
+                bw.write(prettyPrintNodeSet(common)+"\n");
+              } else {
+                ++numAlias;
+              }
+            }
+          }
+        }
+
+        outerChecked.add(as1);
       }
 
       if( !foundSomeAlias ) {
-       bw.write("Task "+td+" contains no aliases between flagged objects.\n");
+        if( !tabularOutput ) {
+          bw.write("No aliases between flagged objects in Task "+td+".\n");
+        }
       }
     }
 
+    if( !tabularOutput ) {
+      bw.write("\n"+computeAliasContextHistogram() );
+    } else {
+      bw.write(" & "+numAlias+
+               " & "+justTime+
+               " & "+numLines+
+               " & "+numMethodsAnalyzed()+
+               " \\\\\n");
+    }
+
     bw.close();
   }
 
+
+  // this version of writeAllAliases is for Java programs that have no tasks
+  public void writeAllAliasesJava(String outputFile,
+                                  String timeReport,
+                                  String justTime,
+                                  boolean tabularOutput,
+                                  int numLines
+                                  ) throws java.io.IOException {
+    checkAnalysisComplete();
+
+    assert !state.TASK;
+
+    BufferedWriter bw = new BufferedWriter(new FileWriter(outputFile) );
+
+    bw.write("Conducting ownership analysis with allocation depth = "+allocationDepth+"\n");
+    bw.write(timeReport+"\n\n");
+
+    boolean foundSomeAlias = false;
+
+    Descriptor d = typeUtil.getMain();
+    HashSet<AllocationSite> allocSites = getFlaggedAllocationSites(d);
+
+    // for each allocation site check for aliases with
+    // other allocation sites in the context of execution
+    // of this task
+    HashSet<AllocationSite> outerChecked = new HashSet<AllocationSite>();
+    Iterator allocItr1 = allocSites.iterator();
+    while( allocItr1.hasNext() ) {
+      AllocationSite as1 = (AllocationSite) allocItr1.next();
+
+      Iterator allocItr2 = allocSites.iterator();
+      while( allocItr2.hasNext() ) {
+        AllocationSite as2 = (AllocationSite) allocItr2.next();
+
+        if( !outerChecked.contains(as2) ) {
+          Set<HeapRegionNode> common = createsPotentialAliases(d, as1, as2);
+
+          if( !common.isEmpty() ) {
+            foundSomeAlias = true;
+            bw.write("Potential alias between "+as1.getDisjointId()+" and "+as2.getDisjointId()+".\n");
+            bw.write(prettyPrintNodeSet(common)+"\n");
+          }
+        }
+      }
+
+      outerChecked.add(as1);
+    }
+
+    if( !foundSomeAlias ) {
+      bw.write("No aliases between flagged objects found.\n");
+    }
+
+    bw.write("\n"+computeAliasContextHistogram() );
+    bw.close();
+  }
   ///////////////////////////////////////////
   //
   // end public interface
   //
   ///////////////////////////////////////////
 
-
-
+  protected void checkAnalysisComplete() {
+    if( !analysisComplete ) {
+      throw new Error("Warning: public interface method called while analysis is running.");
+    }
+  }
 
 
 
 
 
   // data from the compiler
-  private State state;
-  private TypeUtil typeUtil;
-  private CallGraph callGraph;
-  private int allocationDepth;
+  public State state;
+  public CallGraph callGraph;
+  public Liveness liveness;
+  public ArrayReferencees arrayReferencees;
+  public TypeUtil typeUtil;
+  public int allocationDepth;
+
+  // for public interface methods to warn that they
+  // are grabbing results during analysis
+  private boolean analysisComplete;
 
   // used to identify HeapRegionNode objects
   // A unique ID equates an object in one
   // ownership graph with an object in another
   // graph that logically represents the same
   // heap region
-  // start at 10 and incerement to leave some
+  // start at 10 and increment to leave some
   // reserved IDs for special purposes
   static private int uniqueIDcount = 10;
 
-
   // Use these data structures to track progress of
   // processing all methods in the program, and by methods
   // TaskDescriptor and MethodDescriptor are combined
   // together, with a common parent class Descriptor
-  private Hashtable<FlatMethod, OwnershipGraph>           mapFlatMethodToInitialParamAllocGraph;
-  private Hashtable<Descriptor, OwnershipGraph>           mapDescriptorToCompleteOwnershipGraph;
-  private Hashtable<FlatNew,    AllocationSite>           mapFlatNewToAllocationSite;
-  private Hashtable<Descriptor, HashSet<AllocationSite> > mapDescriptorToAllocationSiteSet;
-  private Hashtable<Descriptor, Integer>                  mapDescriptorToNumUpdates;
+  private Hashtable<MethodContext, OwnershipGraph>           mapMethodContextToInitialParamAllocGraph;
+  private Hashtable<MethodContext, OwnershipGraph>           mapMethodContextToCompleteOwnershipGraph;
+  private Hashtable<FlatNew,       AllocationSite>           mapFlatNewToAllocationSite;
+  private Hashtable<Descriptor,    HashSet<AllocationSite> > mapDescriptorToAllocationSiteSet;
+  private Hashtable<MethodContext, Integer>                  mapMethodContextToNumUpdates;
+  private Hashtable<Descriptor,    HashSet<MethodContext> >  mapDescriptorToAllMethodContexts;
+  private Hashtable<MethodContext, HashSet<MethodContext> >  mapMethodContextToDependentContexts;
+  private Hashtable<Integer,       AllocationSite>           mapHrnIdToAllocationSite;
 
   // Use these data structures to track progress of one pass of
   // processing the FlatNodes of a particular method
@@ -188,24 +357,39 @@ public class OwnershipAnalysis {
   // descriptorsToAnalyze identifies the set of tasks and methods
   // that are reachable from the program tasks, this set is initialized
   // and then remains static
-  private HashSet<Descriptor> descriptorsToAnalyze;
+  public HashSet<Descriptor> descriptorsToAnalyze;
 
   // descriptorsToVisit is initialized to descriptorsToAnalyze and is
   // reduced by visiting a descriptor during analysis.  When dependents
   // must be scheduled, only those contained in descriptorsToAnalyze
-  // should be re-added to this set
-  private HashSet<Descriptor> descriptorsToVisit;
-
-  // a special field descriptor for all array elements
-  private static FieldDescriptor fdElement = new FieldDescriptor(new Modifiers(Modifiers.PUBLIC),
-                                                                 new TypeDescriptor("Array[]"),
-                                                                 "elements",
-                                                                 null,
-                                                                 false);
+  // should be re-added to this queue
+  private PriorityQueue<MethodContextQWrapper> methodContextsToVisitQ;
+  private Set          <MethodContext>         methodContextsToVisitSet;
+  private Hashtable<Descriptor, Integer> mapDescriptorToPriority;
+
+
+  // special field descriptors for array elements
+  public static final String arrayElementFieldName = "___element_";
+  private static Hashtable<TypeDescriptor, FieldDescriptor> mapTypeToArrayField =
+    new Hashtable<TypeDescriptor, FieldDescriptor>();
+
+
   // for controlling DOT file output
   private boolean writeDOTs;
   private boolean writeAllDOTs;
 
+  // for controlling method effects
+  private boolean methodEffects;
+
+  //map each FlatNode to its own internal ownership graph
+  private MethodEffectsAnalysis meAnalysis;
+
+  //keep internal ownership graph by method context and flat node
+  private Hashtable<MethodContext, Hashtable<FlatNode, OwnershipGraph>> mapMethodContextToFlatNodeOwnershipGraph;
+
+  //map method context to a set of allocation sites of live-in vars
+  private Hashtable<MethodContext, HashSet<AllocationSite>> mapMethodContextToLiveInAllocationSiteSet;
+
 
 
   // this analysis generates an ownership graph for every task
@@ -213,25 +397,95 @@ public class OwnershipAnalysis {
   public OwnershipAnalysis(State state,
                            TypeUtil tu,
                            CallGraph callGraph,
+                           Liveness liveness,
+                           ArrayReferencees ar,
                            int allocationDepth,
                            boolean writeDOTs,
                            boolean writeAllDOTs,
                            String aliasFile) throws java.io.IOException {
 
-    this.state           = state;
-    this.typeUtil        = tu;
-    this.callGraph       = callGraph;
-    this.allocationDepth = allocationDepth;
-    this.writeDOTs       = writeDOTs;
-    this.writeAllDOTs    = writeAllDOTs;
+    this.methodEffects = false;
+    init(state,tu,callGraph,liveness,ar,allocationDepth,writeDOTs,writeAllDOTs,aliasFile);
+
+  }
+
+  public OwnershipAnalysis(State state,
+                           TypeUtil tu,
+                           CallGraph callGraph,
+                           Liveness liveness,
+                           ArrayReferencees ar,
+                           int allocationDepth,
+                           boolean writeDOTs,
+                           boolean writeAllDOTs,
+                           String aliasFile,
+                           boolean methodEffects) throws java.io.IOException {
+
+    this.methodEffects = methodEffects;
+    init(state,tu,callGraph,liveness,ar,allocationDepth,writeDOTs,writeAllDOTs,aliasFile);
+
+  }
+
+  // new constructor for on-demand disjoint analysis
+  public OwnershipAnalysis(
+    State state,
+    TypeUtil tu,
+    CallGraph callGraph,
+    Liveness liveness,
+    ArrayReferencees ar,
+    int allocationDepth,
+    boolean writeDOTs,
+    boolean writeAllDOTs,
+    String aliasFile,
+    boolean methodEffects,
+    Hashtable<MethodContext, HashSet<AllocationSite>> mapMethodContextToLiveInAllocationSiteSet)
+  throws java.io.IOException {
+
+    this.methodEffects = methodEffects;
+    this.mapMethodContextToLiveInAllocationSiteSet=mapMethodContextToLiveInAllocationSiteSet;
+    init(state, tu, callGraph, liveness, ar, allocationDepth, writeDOTs, writeAllDOTs,
+         aliasFile);
+
+  }
+
+  private void init(State state,
+                    TypeUtil tu,
+                    CallGraph callGraph,
+                    Liveness liveness,
+                    ArrayReferencees ar,
+                    int allocationDepth,
+                    boolean writeDOTs,
+                    boolean writeAllDOTs,
+                    String aliasFile) throws java.io.IOException {
+
+    analysisComplete = false;
+
+    this.state            = state;
+    this.typeUtil         = tu;
+    this.callGraph        = callGraph;
+    this.liveness         = liveness;
+    this.arrayReferencees = ar;
+    this.allocationDepth  = allocationDepth;
+    this.writeDOTs        = writeDOTs;
+    this.writeAllDOTs     = writeAllDOTs;
+
+    // set some static configuration for OwnershipGraphs
+    OwnershipGraph.allocationDepth   = allocationDepth;
+    OwnershipGraph.typeUtil          = typeUtil;
+    OwnershipGraph.debugCallMapCount = state.OWNERSHIPDEBUGCALLCOUNT;
+    OwnershipGraph.debugCallee       = state.OWNERSHIPDEBUGCALLEE;
+    OwnershipGraph.debugCaller       = state.OWNERSHIPDEBUGCALLER;
+    if( OwnershipGraph.debugCallee != null &&
+        OwnershipGraph.debugCaller != null ) {
+      OwnershipGraph.debugCallMap = true;
+    }
 
     descriptorsToAnalyze = new HashSet<Descriptor>();
 
-    mapFlatMethodToInitialParamAllocGraph =
-      new Hashtable<FlatMethod, OwnershipGraph>();
+    mapMethodContextToInitialParamAllocGraph =
+      new Hashtable<MethodContext, OwnershipGraph>();
 
-    mapDescriptorToCompleteOwnershipGraph =
-      new Hashtable<Descriptor, OwnershipGraph>();
+    mapMethodContextToCompleteOwnershipGraph =
+      new Hashtable<MethodContext, OwnershipGraph>();
 
     mapFlatNewToAllocationSite =
       new Hashtable<FlatNew, AllocationSite>();
@@ -239,52 +493,109 @@ public class OwnershipAnalysis {
     mapDescriptorToAllocationSiteSet =
       new Hashtable<Descriptor, HashSet<AllocationSite> >();
 
+    mapDescriptorToAllMethodContexts =
+      new Hashtable<Descriptor, HashSet<MethodContext> >();
+
+    mapMethodContextToDependentContexts =
+      new Hashtable<MethodContext, HashSet<MethodContext> >();
+
+    mapDescriptorToPriority =
+      new Hashtable<Descriptor, Integer>();
+
+    mapHrnIdToAllocationSite =
+      new Hashtable<Integer, AllocationSite>();
+
+    if( methodEffects ) {
+      mapMethodContextToFlatNodeOwnershipGraph=new Hashtable<MethodContext, Hashtable<FlatNode, OwnershipGraph>>();
+    }
+
+    meAnalysis=new MethodEffectsAnalysis(methodEffects);
+
+
     if( writeAllDOTs ) {
-      mapDescriptorToNumUpdates = new Hashtable<Descriptor, Integer>();
+      mapMethodContextToNumUpdates = new Hashtable<MethodContext, Integer>();
     }
 
-    // initialize methods to visit as the set of all tasks in the
-    // program and then any method that could be called starting
-    // from those tasks
-    Iterator taskItr = state.getTaskSymbolTable().getDescriptorsIterator();
-    while( taskItr.hasNext() ) {
-      Descriptor d = (Descriptor) taskItr.next();
+
+    double timeStartAnalysis = (double) System.nanoTime();
+
+
+    if( state.TASK ) {
+      // initialize methods to visit as the set of all tasks in the
+      // program and then any method that could be called starting
+      // from those tasks
+      Iterator taskItr = state.getTaskSymbolTable().getDescriptorsIterator();
+      while( taskItr.hasNext() ) {
+        Descriptor d = (Descriptor) taskItr.next();
+        scheduleAllCallees(d);
+      }
+
+    } else {
+      // we are not in task mode, just normal Java, so start with
+      // the main method
+      Descriptor d = typeUtil.getMain();
       scheduleAllCallees(d);
     }
 
+
     // before beginning analysis, initialize every scheduled method
     // with an ownership graph that has populated parameter index tables
     // by analyzing the first node which is always a FlatMethod node
     Iterator<Descriptor> dItr = descriptorsToAnalyze.iterator();
     while( dItr.hasNext() ) {
       Descriptor d  = dItr.next();
-      OwnershipGraph og = new OwnershipGraph(allocationDepth, typeUtil);
+      OwnershipGraph og = new OwnershipGraph();
 
       FlatMethod fm;
       if( d instanceof MethodDescriptor ) {
-       fm = state.getMethodFlat( (MethodDescriptor) d);
+        fm = state.getMethodFlat( (MethodDescriptor) d);
       } else {
-       assert d instanceof TaskDescriptor;
-       fm = state.getMethodFlat( (TaskDescriptor) d);
+        assert d instanceof TaskDescriptor;
+        fm = state.getMethodFlat( (TaskDescriptor) d);
       }
 
-      System.out.println("Previsiting " + d);
+      MethodContext mc = new MethodContext(d);
+      assert !mapDescriptorToAllMethodContexts.containsKey(d);
+      HashSet<MethodContext> s = new HashSet<MethodContext>();
+      s.add(mc);
+      mapDescriptorToAllMethodContexts.put(d, s);
 
-      og = analyzeFlatNode(d, fm, null, og);
-      setGraphForDescriptor(d, og);
-    }
+      //System.out.println("Previsiting " + mc);
 
-    System.out.println("");
+      meAnalysis.createNewMapping(mc);
+
+      og = analyzeFlatNode(mc, fm, fm, null, og);
+      setGraphForMethodContext(mc, og);
+    }
 
     // as mentioned above, analyze methods one-by-one, possibly revisiting
     // a method if the methods that it calls are updated
     analyzeMethods();
+    analysisComplete = true;
+
+
+    double timeEndAnalysis = (double) System.nanoTime();
+    double dt = (timeEndAnalysis - timeStartAnalysis)/(Math.pow(10.0, 9.0) );
+    String treport = String.format("The reachability analysis took %.3f sec.", dt);
+    String justtime = String.format("%.2f", dt);
+    System.out.println(treport);
 
-    System.out.println("");
+    if( writeDOTs && !writeAllDOTs ) {
+      writeFinalContextGraphs();
+    }
+
+    if(methodEffects) {
+      meAnalysis.writeMethodEffectsResult();
+    }
 
     if( aliasFile != null ) {
-      writeAllAliases(aliasFile);
+      if( state.TASK ) {
+        writeAllAliases(aliasFile, treport, justtime, state.OWNERSHIPALIASTAB, state.lines);
+      } else {
+        writeAllAliasesJava(aliasFile, treport, justtime, state.OWNERSHIPALIASTAB, state.lines);
+      }
     }
+
   }
 
   // called from the constructor to help initialize the set
@@ -319,11 +630,41 @@ public class OwnershipAnalysis {
   // they call are updated
   private void analyzeMethods() throws java.io.IOException {
 
-    descriptorsToVisit = (HashSet<Descriptor>)descriptorsToAnalyze.clone();
+    // first gather all of the method contexts to analyze
+    HashSet<MethodContext> allContexts = new HashSet<MethodContext>();
+    Iterator<Descriptor> itrd2a = descriptorsToAnalyze.iterator();
+    while( itrd2a.hasNext() ) {
+      HashSet<MethodContext> mcs = mapDescriptorToAllMethodContexts.get(itrd2a.next() );
+      assert mcs != null;
+
+      Iterator<MethodContext> itrmc = mcs.iterator();
+      while( itrmc.hasNext() ) {
+        allContexts.add(itrmc.next() );
+      }
+    }
+
+    // topologically sort them according to the caller graph so leaf calls are
+    // ordered first; use that ordering to give method contexts priorities
+    LinkedList<MethodContext> sortedMethodContexts = topologicalSort(allContexts);
+
+    methodContextsToVisitQ   = new PriorityQueue<MethodContextQWrapper>();
+    methodContextsToVisitSet = new HashSet<MethodContext>();
+
+    int p = 0;
+    Iterator<MethodContext> mcItr = sortedMethodContexts.iterator();
+    while( mcItr.hasNext() ) {
+      MethodContext mc = mcItr.next();
+      mapDescriptorToPriority.put(mc.getDescriptor(), new Integer(p) );
+      methodContextsToVisitQ.add(new MethodContextQWrapper(p, mc) );
+      methodContextsToVisitSet.add(mc);
+      ++p;
+    }
 
-    while( !descriptorsToVisit.isEmpty() ) {
-      Descriptor d = (Descriptor) descriptorsToVisit.iterator().next();
-      descriptorsToVisit.remove(d);
+    // analyze methods from the priority queue until it is empty
+    while( !methodContextsToVisitQ.isEmpty() ) {
+      MethodContext mc = methodContextsToVisitQ.poll().getMethodContext();
+      assert methodContextsToVisitSet.contains(mc);
+      methodContextsToVisitSet.remove(mc);
 
       // because the task or method descriptor just extracted
       // was in the "to visit" set it either hasn't been analyzed
@@ -333,37 +674,32 @@ public class OwnershipAnalysis {
       // If there is a change detected, add any methods/tasks
       // that depend on this one to the "to visit" set.
 
-      System.out.println("Analyzing " + d);
+      System.out.println("Analyzing " + mc);
 
+      Descriptor d = mc.getDescriptor();
       FlatMethod fm;
       if( d instanceof MethodDescriptor ) {
-       fm = state.getMethodFlat( (MethodDescriptor) d);
+        fm = state.getMethodFlat( (MethodDescriptor) d);
       } else {
-       assert d instanceof TaskDescriptor;
-       fm = state.getMethodFlat( (TaskDescriptor) d);
+        assert d instanceof TaskDescriptor;
+        fm = state.getMethodFlat( (TaskDescriptor) d);
       }
 
-      OwnershipGraph og = analyzeFlatMethod(d, fm);
-      OwnershipGraph ogPrev = mapDescriptorToCompleteOwnershipGraph.get(d);
+      OwnershipGraph og = analyzeFlatMethod(mc, fm);
+      OwnershipGraph ogPrev = mapMethodContextToCompleteOwnershipGraph.get(mc);
       if( !og.equals(ogPrev) ) {
-
-       setGraphForDescriptor(d, og);
-
-       // only methods have dependents, tasks cannot
-       // be invoked by any user program calls
-       if( d instanceof MethodDescriptor ) {
-         MethodDescriptor md = (MethodDescriptor) d;
-         Set dependents = callGraph.getCallerSet(md);
-         if( dependents != null ) {
-           Iterator depItr = dependents.iterator();
-           while( depItr.hasNext() ) {
-             Descriptor dependent = (Descriptor) depItr.next();
-             if( descriptorsToAnalyze.contains(dependent) ) {
-               descriptorsToVisit.add(dependent);
-             }
-           }
-         }
-       }
+        setGraphForMethodContext(mc, og);
+
+        Iterator<MethodContext> depsItr = iteratorDependents(mc);
+        while( depsItr.hasNext() ) {
+          MethodContext mcNext = depsItr.next();
+
+          if( !methodContextsToVisitSet.contains(mcNext) ) {
+            methodContextsToVisitQ.add(new MethodContextQWrapper(mapDescriptorToPriority.get(mcNext.getDescriptor() ),
+                                                                 mcNext) );
+            methodContextsToVisitSet.add(mcNext);
+          }
+        }
       }
     }
 
@@ -373,12 +709,11 @@ public class OwnershipAnalysis {
   // keep passing the Descriptor of the method along for debugging
   // and dot file writing
   private OwnershipGraph
-  analyzeFlatMethod(Descriptor mDesc,
+  analyzeFlatMethod(MethodContext mc,
                     FlatMethod flatm) throws java.io.IOException {
 
     // initialize flat nodes to visit as the flat method
-    // because all other nodes in this flat method are
-    // decendents of the flat method itself
+    // because it is the entry point
 
     flatNodesToVisit = new HashSet<FlatNode>();
     flatNodesToVisit.add(flatm);
@@ -396,62 +731,87 @@ public class OwnershipAnalysis {
       FlatNode fn = (FlatNode) flatNodesToVisit.iterator().next();
       flatNodesToVisit.remove(fn);
 
+      //System.out.println( "  "+fn );
+
       // perform this node's contributions to the ownership
       // graph on a new copy, then compare it to the old graph
       // at this node to see if anything was updated.
-      OwnershipGraph og = new OwnershipGraph(allocationDepth, typeUtil);
+      OwnershipGraph og = new OwnershipGraph();
 
       // start by merging all node's parents' graphs
       for( int i = 0; i < fn.numPrev(); ++i ) {
-       FlatNode pn       = fn.getPrev(i);
-       OwnershipGraph ogParent = getGraphFromFlatNode(pn);
-       og.merge(ogParent);
+        FlatNode pn = fn.getPrev(i);
+        if( mapFlatNodeToOwnershipGraph.containsKey(pn) ) {
+          OwnershipGraph ogParent = mapFlatNodeToOwnershipGraph.get(pn);
+          og.merge(ogParent);
+        }
       }
 
       // apply the analysis of the flat node to the
       // ownership graph made from the merge of the
       // parent graphs
-      og = analyzeFlatNode(mDesc,
+      og = analyzeFlatNode(mc,
+                           flatm,
                            fn,
                            returnNodesToCombineForCompleteOwnershipGraph,
                            og);
 
+
+
+
+      if( takeDebugSnapshots &&
+          mc.getDescriptor().getSymbol().equals(mcDescSymbolDebug) ) {
+        debugSnapshot(og,fn);
+      }
+
+
       // if the results of the new graph are different from
       // the current graph at this node, replace the graph
       // with the update and enqueue the children for
       // processing
-      OwnershipGraph ogPrev = getGraphFromFlatNode(fn);
-
+      OwnershipGraph ogPrev = mapFlatNodeToOwnershipGraph.get(fn);
       if( !og.equals(ogPrev) ) {
-       setGraphForFlatNode(fn, og);
+        mapFlatNodeToOwnershipGraph.put(fn, og);
 
-       for( int i = 0; i < fn.numNext(); i++ ) {
-         FlatNode nn = fn.getNext(i);
-         flatNodesToVisit.add(nn);
-       }
+        for( int i = 0; i < fn.numNext(); i++ ) {
+          FlatNode nn = fn.getNext(i);
+          flatNodesToVisit.add(nn);
+        }
       }
     }
 
     // end by merging all return nodes into a complete
     // ownership graph that represents all possible heap
     // states after the flat method returns
-    OwnershipGraph completeGraph = new OwnershipGraph(allocationDepth, typeUtil);
+    OwnershipGraph completeGraph = new OwnershipGraph();
     Iterator retItr = returnNodesToCombineForCompleteOwnershipGraph.iterator();
     while( retItr.hasNext() ) {
       FlatReturnNode frn = (FlatReturnNode) retItr.next();
-      OwnershipGraph ogr = getGraphFromFlatNode(frn);
+      assert mapFlatNodeToOwnershipGraph.containsKey(frn);
+      OwnershipGraph ogr = mapFlatNodeToOwnershipGraph.get(frn);
       completeGraph.merge(ogr);
     }
+
     return completeGraph;
   }
 
 
   private OwnershipGraph
-  analyzeFlatNode(Descriptor methodDesc,
+  analyzeFlatNode(MethodContext mc,
+                  FlatMethod fmContaining,
                   FlatNode fn,
                   HashSet<FlatReturnNode> setRetNodes,
                   OwnershipGraph og) throws java.io.IOException {
 
+
+    // any variables that are no longer live should be
+    // nullified in the graph to reduce edges
+    // NOTE: it is not clear we need this.  It costs a
+    // liveness calculation for every method, so only
+    // turn it on if we find we actually need it.
+    //og.nullifyDeadVars( liveness.getLiveInTemps( fmContaining, fn ) );
+
+
     TempDescriptor lhs;
     TempDescriptor rhs;
     FieldDescriptor fld;
@@ -471,45 +831,97 @@ public class OwnershipAnalysis {
       // parameter IDs are consistent between analysis
       // iterations, so if this step has been done already
       // just merge in the cached version
-      OwnershipGraph ogInitParamAlloc = mapFlatMethodToInitialParamAllocGraph.get(fm);
+      OwnershipGraph ogInitParamAlloc = mapMethodContextToInitialParamAllocGraph.get(mc);
       if( ogInitParamAlloc == null ) {
 
-       // analyze this node one time globally
-       for( int i = 0; i < fm.numParameters(); ++i ) {
-         TempDescriptor tdParam = fm.getParameter(i);
-         og.assignTempEqualToParamAlloc(tdParam,
-                                        methodDesc instanceof TaskDescriptor,
-                                        new Integer(i) );
-       }
-
-       // then remember it
-       OwnershipGraph ogResult = new OwnershipGraph(allocationDepth, typeUtil);
-       ogResult.merge(og);
-       mapFlatMethodToInitialParamAllocGraph.put(fm, ogResult);
+        // if the method context has aliased parameters, make sure
+        // there is a blob region for all those param to reference
+        Set<Integer> aliasedParamIndices = mc.getAliasedParamIndices();
+
+        if( !aliasedParamIndices.isEmpty() ) {
+          og.makeAliasedParamHeapRegionNode(fm);
+        }
+
+        // set up each parameter
+        for( int i = 0; i < fm.numParameters(); ++i ) {
+          TempDescriptor tdParam    = fm.getParameter(i);
+          TypeDescriptor typeParam  = tdParam.getType();
+          Integer paramIndex = new Integer(i);
+
+          if( typeParam.isImmutable() && !typeParam.isArray() ) {
+            // don't bother with this primitive parameter, it
+            // cannot affect reachability
+            continue;
+          }
+
+          if( aliasedParamIndices.contains(paramIndex) ) {
+            // use the alias blob but give parameters their
+            // own primary obj region
+            og.assignTempEqualToAliasedParam(tdParam,
+                                             paramIndex, fm);
+          } else {
+            // this parameter is not aliased to others, give it
+            // a fresh primary obj and secondary object
+            og.assignTempEqualToParamAlloc(tdParam,
+                                           mc.getDescriptor() instanceof TaskDescriptor,
+                                           paramIndex, fm);
+          }
+        }
+
+        // add additional edges for aliased regions if necessary
+        if( !aliasedParamIndices.isEmpty() ) {
+          og.addParam2ParamAliasEdges(fm, aliasedParamIndices);
+        }
+
+        // clean up reachability on initial parameter shapes
+        og.globalSweep();
+
+        // this maps tokens to parameter indices and vice versa
+        // for when this method is a callee
+        og.prepareParamTokenMaps(fm);
+
+        // cache the graph
+        OwnershipGraph ogResult = new OwnershipGraph();
+        ogResult.merge(og);
+        mapMethodContextToInitialParamAllocGraph.put(mc, ogResult);
 
       } else {
-       // or just leverage the cached copy
-       og.merge(ogInitParamAlloc);
+        // or just leverage the cached copy
+        og.merge(ogInitParamAlloc);
       }
       break;
 
     case FKind.FlatOpNode:
       FlatOpNode fon = (FlatOpNode) fn;
       if( fon.getOp().getOp() == Operation.ASSIGN ) {
-       lhs = fon.getDest();
-       rhs = fon.getLeft();
-       og.assignTempXEqualToTempY(lhs, rhs);
+        lhs = fon.getDest();
+        rhs = fon.getLeft();
+        og.assignTempXEqualToTempY(lhs, rhs);
       }
       break;
 
+    case FKind.FlatCastNode:
+      FlatCastNode fcn = (FlatCastNode) fn;
+      lhs = fcn.getDst();
+      rhs = fcn.getSrc();
+
+      TypeDescriptor td = fcn.getType();
+      assert td != null;
+
+      og.assignTempXEqualToCastedTempY(lhs, rhs, td);
+      break;
+
     case FKind.FlatFieldNode:
       FlatFieldNode ffn = (FlatFieldNode) fn;
       lhs = ffn.getDst();
       rhs = ffn.getSrc();
       fld = ffn.getField();
-      if( !fld.getType().isPrimitive() ) {
-       og.assignTempXEqualToTempYFieldF(lhs, rhs, fld);
+      if( !fld.getType().isImmutable() || fld.getType().isArray() ) {
+        og.assignTempXEqualToTempYFieldF(lhs, rhs, fld);
       }
+
+      meAnalysis.analyzeFlatFieldNode(mc, og, rhs, fld);
+
       break;
 
     case FKind.FlatSetFieldNode:
@@ -517,66 +929,178 @@ public class OwnershipAnalysis {
       lhs = fsfn.getDst();
       fld = fsfn.getField();
       rhs = fsfn.getSrc();
-      og.assignTempXFieldFEqualToTempY(lhs, fld, rhs);
+      if( !fld.getType().isImmutable() || fld.getType().isArray() ) {
+        og.assignTempXFieldFEqualToTempY(lhs, fld, rhs);
+      }
+
+      meAnalysis.analyzeFlatSetFieldNode(mc, og, lhs, fld);
+
       break;
 
     case FKind.FlatElementNode:
       FlatElementNode fen = (FlatElementNode) fn;
+
       lhs = fen.getDst();
       rhs = fen.getSrc();
-      if( !lhs.getType().isPrimitive() ) {
-       og.assignTempXEqualToTempYFieldF(lhs, rhs, fdElement);
+      if( !lhs.getType().isImmutable() || lhs.getType().isArray() ) {
+
+        assert rhs.getType() != null;
+        assert rhs.getType().isArray();
+
+        TypeDescriptor tdElement = rhs.getType().dereference();
+        FieldDescriptor fdElement = getArrayField(tdElement);
+        og.assignTempXEqualToTempYFieldF(lhs, rhs, fdElement);
+        meAnalysis.analyzeFlatElementNode(mc, og, lhs, fdElement);
+
       }
       break;
 
     case FKind.FlatSetElementNode:
       FlatSetElementNode fsen = (FlatSetElementNode) fn;
+
       lhs = fsen.getDst();
       rhs = fsen.getSrc();
-      if( !rhs.getType().isPrimitive() ) {
-       og.assignTempXFieldFEqualToTempY(lhs, fdElement, rhs);
+      if( !lhs.getType().isImmutable() || lhs.getType().isArray() ) {
+        TypeDescriptor tdElement = lhs.getType().dereference();
+        FieldDescriptor fdElement = getArrayField(tdElement);
+        meAnalysis.analyzeFlatSetElementNode(mc, og, lhs, fdElement);
+      }
+
+      if( arrayReferencees.doesNotCreateNewReaching(fsen) ) {
+        // skip this node if it cannot create new reachability paths
+        break;
+      }
+
+      lhs = fsen.getDst();
+      rhs = fsen.getSrc();
+      if( !rhs.getType().isImmutable() || rhs.getType().isArray() ) {
+
+        assert lhs.getType() != null;
+        assert lhs.getType().isArray();
+
+        TypeDescriptor tdElement = lhs.getType().dereference();
+        FieldDescriptor fdElement = getArrayField(tdElement);
+
+        og.assignTempXFieldFEqualToTempY(lhs, fdElement, rhs);
+        meAnalysis.analyzeFlatSetElementNode(mc, og, lhs, fdElement);
+
       }
       break;
 
     case FKind.FlatNew:
       FlatNew fnn = (FlatNew) fn;
       lhs = fnn.getDst();
-      AllocationSite as = getAllocationSiteFromFlatNewPRIVATE(fnn);
-
-      og.assignTempEqualToNewAlloc(lhs, as);
+      if( !lhs.getType().isImmutable() || lhs.getType().isArray() ) {
+        AllocationSite as = getAllocationSiteFromFlatNewPRIVATE(fnn);
+
+        if (mapMethodContextToLiveInAllocationSiteSet != null) {
+          HashSet<AllocationSite> alllocSet=mapMethodContextToLiveInAllocationSiteSet.get(mc);
+          if(alllocSet!=null) {
+            for (Iterator iterator = alllocSet.iterator(); iterator
+                 .hasNext(); ) {
+              AllocationSite allocationSite = (AllocationSite) iterator
+                                              .next();
+              if(allocationSite.flatNew.equals(as.flatNew)) {
+                as.setFlag(true);
+              }
+            }
+          }
+        }
+
+        og.assignTempEqualToNewAlloc(lhs, as);
+      }
       break;
 
     case FKind.FlatCall:
       FlatCall fc = (FlatCall) fn;
       MethodDescriptor md = fc.getMethod();
       FlatMethod flatm = state.getMethodFlat(md);
-      OwnershipGraph ogMergeOfAllPossibleCalleeResults = new OwnershipGraph(allocationDepth, typeUtil);
+      OwnershipGraph ogMergeOfAllPossibleCalleeResults = new OwnershipGraph();
 
       if( md.isStatic() ) {
-       // a static method is simply always the same, makes life easy
-       OwnershipGraph onlyPossibleCallee = mapDescriptorToCompleteOwnershipGraph.get(md);
-       ogMergeOfAllPossibleCalleeResults = og;
-       ogMergeOfAllPossibleCalleeResults.resolveMethodCall(fc, md.isStatic(), flatm, onlyPossibleCallee);
+        // a static method is simply always the same, makes life easy
+        ogMergeOfAllPossibleCalleeResults = og;
+
+        Set<Integer> aliasedParamIndices =
+          ogMergeOfAllPossibleCalleeResults.calculateAliasedParamSet(fc, md.isStatic(), flatm);
+
+        MethodContext mcNew = new MethodContext(md, aliasedParamIndices);
+        Set contexts = mapDescriptorToAllMethodContexts.get(md);
+        assert contexts != null;
+        contexts.add(mcNew);
+
+        addDependent(mc, mcNew);
+
+        OwnershipGraph onlyPossibleCallee = mapMethodContextToCompleteOwnershipGraph.get(mcNew);
+
+        if( onlyPossibleCallee == null ) {
+          // if this method context has never been analyzed just schedule it for analysis
+          // and skip over this call site for now
+          if( !methodContextsToVisitSet.contains(mcNew) ) {
+            methodContextsToVisitQ.add(new MethodContextQWrapper(mapDescriptorToPriority.get(md),
+                                                                 mcNew) );
+            methodContextsToVisitSet.add(mcNew);
+          }
+
+        } else {
+          ogMergeOfAllPossibleCalleeResults.resolveMethodCall(fc, md.isStatic(), flatm, onlyPossibleCallee, mc, null);
+        }
+
+        meAnalysis.createNewMapping(mcNew);
+        meAnalysis.analyzeFlatCall(ogMergeOfAllPossibleCalleeResults, mcNew, mc, fc);
+
+
       } else {
-       // if the method descriptor is virtual, then there could be a
-       // set of possible methods that will actually be invoked, so
-       // find all of them and merge all of their results together
-       TypeDescriptor typeDesc = fc.getThis().getType();
-       Set possibleCallees = callGraph.getMethods(md, typeDesc);
+        // if the method descriptor is virtual, then there could be a
+        // set of possible methods that will actually be invoked, so
+        // find all of them and merge all of their results together
+        TypeDescriptor typeDesc = fc.getThis().getType();
+        Set possibleCallees = callGraph.getMethods(md, typeDesc);
+
+        Iterator i = possibleCallees.iterator();
+        while( i.hasNext() ) {
+          MethodDescriptor possibleMd = (MethodDescriptor) i.next();
+          FlatMethod pflatm = state.getMethodFlat(possibleMd);
+
+          // don't alter the working graph (og) until we compute a result for every
+          // possible callee, merge them all together, then set og to that
+          OwnershipGraph ogCopy = new OwnershipGraph();
+          ogCopy.merge(og);
+
+          Set<Integer> aliasedParamIndices =
+            ogCopy.calculateAliasedParamSet(fc, possibleMd.isStatic(), pflatm);
 
-       Iterator i = possibleCallees.iterator();
-       while( i.hasNext() ) {
-         MethodDescriptor possibleMd = (MethodDescriptor) i.next();
+          MethodContext mcNew = new MethodContext(possibleMd, aliasedParamIndices);
+          Set contexts = mapDescriptorToAllMethodContexts.get(md);
+          assert contexts != null;
+          contexts.add(mcNew);
 
-         // don't alter the working graph (og) until we compute a result for every
-         // possible callee, merge them all together, then set og to that
-         OwnershipGraph ogCopy = new OwnershipGraph(allocationDepth, typeUtil);
-         ogCopy.merge(og);
 
-         OwnershipGraph ogPotentialCallee = mapDescriptorToCompleteOwnershipGraph.get(possibleMd);
-         ogCopy.resolveMethodCall(fc, md.isStatic(), flatm, ogPotentialCallee);
-         ogMergeOfAllPossibleCalleeResults.merge(ogCopy);
-       }
+          meAnalysis.createNewMapping(mcNew);
+
+
+          addDependent(mc, mcNew);
+
+          OwnershipGraph ogPotentialCallee = mapMethodContextToCompleteOwnershipGraph.get(mcNew);
+
+          if( ogPotentialCallee == null ) {
+            // if this method context has never been analyzed just schedule it for analysis
+            // and skip over this call site for now
+            if( !methodContextsToVisitSet.contains(mcNew) ) {
+              methodContextsToVisitQ.add(new MethodContextQWrapper(mapDescriptorToPriority.get(md),
+                                                                   mcNew) );
+              methodContextsToVisitSet.add(mcNew);
+            }
+
+          } else {
+            ogCopy.resolveMethodCall(fc, possibleMd.isStatic(), pflatm, ogPotentialCallee, mc, null);
+          }
+
+          ogMergeOfAllPossibleCalleeResults.merge(ogCopy);
+
+          meAnalysis.analyzeFlatCall(ogMergeOfAllPossibleCalleeResults, mcNew, mc, fc);
+        }
+
       }
 
       og = ogMergeOfAllPossibleCalleeResults;
@@ -585,15 +1109,23 @@ public class OwnershipAnalysis {
     case FKind.FlatReturnNode:
       FlatReturnNode frn = (FlatReturnNode) fn;
       rhs = frn.getReturnTemp();
-
-      if( rhs != null ) {
-       og.assignReturnEqualToTemp(rhs);
+      if( rhs != null && !rhs.getType().isImmutable() ) {
+        og.assignReturnEqualToTemp(rhs);
       }
-
       setRetNodes.add(frn);
       break;
     }
 
+
+    if( methodEffects ) {
+      Hashtable<FlatNode, OwnershipGraph> table=mapMethodContextToFlatNodeOwnershipGraph.get(mc);
+      if(table==null) {
+        table=new     Hashtable<FlatNode, OwnershipGraph>();
+      }
+      table.put(fn, og);
+      mapMethodContextToFlatNodeOwnershipGraph.put(mc, table);
+    }
+
     return og;
   }
 
@@ -607,57 +1139,99 @@ public class OwnershipAnalysis {
   }
 
 
-  private void setGraphForDescriptor(Descriptor d, OwnershipGraph og)
-  throws IOException {
-
-    mapDescriptorToCompleteOwnershipGraph.put(d, og);
+  static public FieldDescriptor getArrayField(TypeDescriptor tdElement) {
+    FieldDescriptor fdElement = mapTypeToArrayField.get(tdElement);
+    if( fdElement == null ) {
+      fdElement = new FieldDescriptor(new Modifiers(Modifiers.PUBLIC),
+                                      tdElement,
+                                      arrayElementFieldName,
+                                      null,
+                                      false);
+      mapTypeToArrayField.put(tdElement, fdElement);
+    }
+    return fdElement;
+  }
 
-    // arguments to writeGraph are:
-    // boolean writeLabels,
-    // boolean labelSelect,
-    // boolean pruneGarbage,
-    // boolean writeReferencers
 
-    if( writeDOTs ) {
+  private void setGraphForMethodContext(MethodContext mc, OwnershipGraph og) {
 
-      if( !writeAllDOTs ) {
-       og.writeGraph(d, true, true, true, false);
+    mapMethodContextToCompleteOwnershipGraph.put(mc, og);
 
-      } else {
-       if( !mapDescriptorToNumUpdates.containsKey(d) ) {
-         mapDescriptorToNumUpdates.put(d, new Integer(0) );
-       }
-       Integer n = mapDescriptorToNumUpdates.get(d);
-       og.writeGraph(d, n, true, true, true, false);
-       mapDescriptorToNumUpdates.put(d, n + 1);
+    if( writeDOTs && writeAllDOTs ) {
+      if( !mapMethodContextToNumUpdates.containsKey(mc) ) {
+        mapMethodContextToNumUpdates.put(mc, new Integer(0) );
       }
+      Integer n = mapMethodContextToNumUpdates.get(mc);
+      try {
+        og.writeGraph(mc+"COMPLETE"+String.format("%05d", n),
+                      true,  // write labels (variables)
+                      true,  // selectively hide intermediate temp vars
+                      true,  // prune unreachable heap regions
+                      false, // show back edges to confirm graph validity
+                      false, // show parameter indices (unmaintained!)
+                      true,  // hide subset reachability states
+                      true); // hide edge taints
+      } catch( IOException e ) {
+      }
+      mapMethodContextToNumUpdates.put(mc, n + 1);
     }
   }
 
 
-  private OwnershipGraph getGraphFromFlatNode(FlatNode fn) {
-    if( !mapFlatNodeToOwnershipGraph.containsKey(fn) ) {
-      mapFlatNodeToOwnershipGraph.put(fn, new OwnershipGraph(allocationDepth, typeUtil) );
+  private void addDependent(MethodContext caller, MethodContext callee) {
+    HashSet<MethodContext> deps = mapMethodContextToDependentContexts.get(callee);
+    if( deps == null ) {
+      deps = new HashSet<MethodContext>();
     }
+    deps.add(caller);
+    mapMethodContextToDependentContexts.put(callee, deps);
+  }
 
-    return mapFlatNodeToOwnershipGraph.get(fn);
+  private Iterator<MethodContext> iteratorDependents(MethodContext callee) {
+    HashSet<MethodContext> deps = mapMethodContextToDependentContexts.get(callee);
+    if( deps == null ) {
+      deps = new HashSet<MethodContext>();
+      mapMethodContextToDependentContexts.put(callee, deps);
+    }
+    return deps.iterator();
   }
 
-  private void setGraphForFlatNode(FlatNode fn, OwnershipGraph og) {
-    mapFlatNodeToOwnershipGraph.put(fn, og);
+
+  private void writeFinalContextGraphs() {
+    Set entrySet = mapMethodContextToCompleteOwnershipGraph.entrySet();
+    Iterator itr = entrySet.iterator();
+    while( itr.hasNext() ) {
+      Map.Entry me = (Map.Entry)itr.next();
+      MethodContext mc = (MethodContext)  me.getKey();
+      OwnershipGraph og = (OwnershipGraph) me.getValue();
+
+      try {
+        og.writeGraph(mc+"COMPLETE",
+                      true,  // write labels (variables)
+                      true,  // selectively hide intermediate temp vars
+                      true,  // prune unreachable heap regions
+                      false, // show back edges to confirm graph validity
+                      false, // show parameter indices (unmaintained!)
+                      true,  // hide subset reachability states
+                      true); // hide edge taints
+      } catch( IOException e ) {
+      }
+    }
   }
 
 
+
   // return just the allocation site associated with one FlatNew node
   private AllocationSite getAllocationSiteFromFlatNewPRIVATE(FlatNew fn) {
 
     if( !mapFlatNewToAllocationSite.containsKey(fn) ) {
-      AllocationSite as = new AllocationSite(allocationDepth, fn.getType() );
+      AllocationSite as = new AllocationSite(allocationDepth, fn, fn.getDisjointId());
 
       // the newest nodes are single objects
       for( int i = 0; i < allocationDepth; ++i ) {
-       Integer id = generateUniqueHeapRegionNodeID();
-       as.setIthOldest(i, id);
+        Integer id = generateUniqueHeapRegionNodeID();
+        as.setIthOldest(i, id);
+        mapHrnIdToAllocationSite.put(id, as);
       }
 
       // the oldest node is a summary node
@@ -704,17 +1278,17 @@ public class OwnershipAnalysis {
       FlatNode n = toVisit.iterator().next();
 
       if( n instanceof FlatNew ) {
-       s.add(getAllocationSiteFromFlatNewPRIVATE( (FlatNew) n) );
+        s.add(getAllocationSiteFromFlatNewPRIVATE( (FlatNew) n) );
       }
 
       toVisit.remove(n);
       visited.add(n);
 
       for( int i = 0; i < n.numNext(); ++i ) {
-       FlatNode child = n.getNext(i);
-       if( !visited.contains(child) ) {
-         toVisit.add(child);
-       }
+        FlatNode child = n.getNext(i);
+        if( !visited.contains(child) ) {
+          toVisit.add(child);
+        }
       }
     }
 
@@ -722,6 +1296,47 @@ public class OwnershipAnalysis {
   }
 
 
+  private HashSet<AllocationSite> getFlaggedAllocationSites(Descriptor dIn) {
+
+    HashSet<AllocationSite> out     = new HashSet<AllocationSite>();
+    HashSet<Descriptor>     toVisit = new HashSet<Descriptor>();
+    HashSet<Descriptor>     visited = new HashSet<Descriptor>();
+
+    toVisit.add(dIn);
+
+    while( !toVisit.isEmpty() ) {
+      Descriptor d = toVisit.iterator().next();
+      toVisit.remove(d);
+      visited.add(d);
+
+      HashSet<AllocationSite> asSet = getAllocationSiteSet(d);
+      Iterator asItr = asSet.iterator();
+      while( asItr.hasNext() ) {
+        AllocationSite as = (AllocationSite) asItr.next();
+        if( as.getDisjointId() != null ) {
+          out.add(as);
+        }
+      }
+
+      // enqueue callees of this method to be searched for
+      // allocation sites also
+      Set callees = callGraph.getCalleeSet(d);
+      if( callees != null ) {
+        Iterator methItr = callees.iterator();
+        while( methItr.hasNext() ) {
+          MethodDescriptor md = (MethodDescriptor) methItr.next();
+
+          if( !visited.contains(md) ) {
+            toVisit.add(md);
+          }
+        }
+      }
+    }
+
+    return out;
+  }
+
+
   private HashSet<AllocationSite>
   getFlaggedAllocationSitesReachableFromTaskPRIVATE(TaskDescriptor td) {
 
@@ -740,32 +1355,226 @@ public class OwnershipAnalysis {
       HashSet<AllocationSite> asSet = getAllocationSiteSet(d);
       Iterator asItr = asSet.iterator();
       while( asItr.hasNext() ) {
-       AllocationSite as = (AllocationSite) asItr.next();
-       TypeDescriptor typed = as.getType();
-       if( typed != null ) {
-         ClassDescriptor cd = typed.getClassDesc();
-         if( cd != null && cd.hasFlags() ) {
-           asSetTotal.add(as);
-         }
-       }
+        AllocationSite as = (AllocationSite) asItr.next();
+        TypeDescriptor typed = as.getType();
+        if( typed != null ) {
+          ClassDescriptor cd = typed.getClassDesc();
+          if( cd != null && cd.hasFlags() ) {
+            asSetTotal.add(as);
+          }
+        }
       }
 
       // enqueue callees of this method to be searched for
       // allocation sites also
       Set callees = callGraph.getCalleeSet(d);
       if( callees != null ) {
-       Iterator methItr = callees.iterator();
-       while( methItr.hasNext() ) {
-         MethodDescriptor md = (MethodDescriptor) methItr.next();
-
-         if( !visited.contains(md) ) {
-           toVisit.add(md);
-         }
-       }
+        Iterator methItr = callees.iterator();
+        while( methItr.hasNext() ) {
+          MethodDescriptor md = (MethodDescriptor) methItr.next();
+
+          if( !visited.contains(md) ) {
+            toVisit.add(md);
+          }
+        }
       }
     }
 
 
     return asSetTotal;
   }
+
+
+  private LinkedList<MethodContext> topologicalSort(HashSet<MethodContext> set) {
+    HashSet   <MethodContext> discovered = new HashSet   <MethodContext>();
+    LinkedList<MethodContext> sorted     = new LinkedList<MethodContext>();
+
+    Iterator<MethodContext> itr = set.iterator();
+    while( itr.hasNext() ) {
+      MethodContext mc = itr.next();
+
+      if( !discovered.contains(mc) ) {
+        dfsVisit(set, mc, sorted, discovered);
+      }
+    }
+
+    return sorted;
+  }
+
+  private void dfsVisit(HashSet<MethodContext> set,
+                        MethodContext mc,
+                        LinkedList<MethodContext> sorted,
+                        HashSet   <MethodContext> discovered) {
+    discovered.add(mc);
+
+    Descriptor d = mc.getDescriptor();
+    if( d instanceof MethodDescriptor ) {
+      MethodDescriptor md = (MethodDescriptor) d;
+      Iterator itr = callGraph.getCallerSet(md).iterator();
+      while( itr.hasNext() ) {
+        Descriptor dCaller = (Descriptor) itr.next();
+
+        // only consider the callers in the original set to analyze
+        Set<MethodContext> callerContexts = mapDescriptorToAllMethodContexts.get(dCaller);
+        if( callerContexts == null )
+          continue;
+
+        // since the analysis hasn't started, there should be exactly one
+        // context if there are any at all
+        assert callerContexts.size() == 1;
+        MethodContext mcCaller = callerContexts.iterator().next();
+        assert set.contains(mcCaller);
+
+        if( !discovered.contains(mcCaller) ) {
+          dfsVisit(set, mcCaller, sorted, discovered);
+        }
+      }
+    }
+
+    sorted.addFirst(mc);
+  }
+
+
+
+  private String computeAliasContextHistogram() {
+
+    Hashtable<Integer, Integer> mapNumContexts2NumDesc =
+      new Hashtable<Integer, Integer>();
+
+    Iterator itr = mapDescriptorToAllMethodContexts.entrySet().iterator();
+    while( itr.hasNext() ) {
+      Map.Entry me = (Map.Entry)itr.next();
+      HashSet<MethodContext> s = (HashSet<MethodContext>)me.getValue();
+
+      Integer i = mapNumContexts2NumDesc.get(s.size() );
+      if( i == null ) {
+        i = new Integer(0);
+      }
+      mapNumContexts2NumDesc.put(s.size(), i + 1);
+    }
+
+    String s = "";
+    int total = 0;
+
+    itr = mapNumContexts2NumDesc.entrySet().iterator();
+    while( itr.hasNext() ) {
+      Map.Entry me = (Map.Entry)itr.next();
+      Integer c0 = (Integer) me.getKey();
+      Integer d0 = (Integer) me.getValue();
+      total += d0;
+      s += String.format("%4d methods had %4d unique alias contexts.\n", d0, c0);
+    }
+
+    s += String.format("\n%4d total methods analayzed.\n", total);
+
+    return s;
+  }
+
+  private int numMethodsAnalyzed() {
+    return descriptorsToAnalyze.size();
+  }
+
+
+
+
+  // insert a call to debugSnapshot() somewhere in the analysis
+  // to get successive captures of the analysis state
+  boolean takeDebugSnapshots = false;
+  String mcDescSymbolDebug = "setRoute";
+  boolean stopAfterCapture = true;
+
+  // increments every visit to debugSnapshot, don't fiddle with it
+  // IMPORTANT NOTE FOR SETTING THE FOLLOWING VALUES: this
+  // counter increments just after every node is analyzed
+  // from the body of the method whose symbol is specified
+  // above.
+  int debugCounter = 0;
+
+  // the value of debugCounter to start reporting the debugCounter
+  // to the screen to let user know what debug iteration we're at
+  int numStartCountReport = 0;
+
+  // the frequency of debugCounter values to print out, 0 no report
+  int freqCountReport = 0;
+
+  // the debugCounter value at which to start taking snapshots
+  int iterStartCapture = 0;
+
+  // the number of snapshots to take
+  int numIterToCapture = 300;
+
+  void debugSnapshot(OwnershipGraph og, FlatNode fn) {
+    if( debugCounter > iterStartCapture + numIterToCapture ) {
+      return;
+    }
+
+    ++debugCounter;
+    if( debugCounter > numStartCountReport &&
+        freqCountReport > 0 &&
+        debugCounter % freqCountReport == 0 ) {
+      System.out.println("    @@@ debug counter = "+debugCounter);
+    }
+    if( debugCounter > iterStartCapture ) {
+      System.out.println("    @@@ capturing debug "+(debugCounter-iterStartCapture)+" @@@");
+      String graphName = String.format("snap%04d",debugCounter-iterStartCapture);
+      if( fn != null ) {
+        graphName = graphName+fn;
+      }
+      try {
+        og.writeGraph(graphName,
+                      true,  // write labels (variables)
+                      true,  // selectively hide intermediate temp vars
+                      true,  // prune unreachable heap regions
+                      false, // show back edges to confirm graph validity
+                      false, // show parameter indices (unmaintained!)
+                      true,  // hide subset reachability states
+                      true); // hide edge taints
+      } catch( Exception e ) {
+        System.out.println("Error writing debug capture.");
+        System.exit(0);
+      }
+    }
+
+    if( debugCounter == iterStartCapture + numIterToCapture && stopAfterCapture ) {
+      System.out.println("Stopping analysis after debug captures.");
+      System.exit(0);
+    }
+  }
+
+  public MethodEffectsAnalysis getMethodEffectsAnalysis() {
+    return meAnalysis;
+  }
+
+  public OwnershipGraph getOwnvershipGraphByMethodContext(MethodContext mc) {
+    return mapMethodContextToCompleteOwnershipGraph.get(mc);
+  }
+
+  public HashSet<MethodContext> getAllMethodContextSetByDescriptor(Descriptor d) {
+    return mapDescriptorToAllMethodContexts.get(d);
+  }
+
+  public MethodContext getCalleeMethodContext(MethodContext callerMC, FlatCall fc) {
+
+    Hashtable<FlatNode, OwnershipGraph> table=mapMethodContextToFlatNodeOwnershipGraph.get(callerMC);
+
+    // merge previous ownership graph to calculate corresponding method context
+    OwnershipGraph mergeOG = new OwnershipGraph();
+
+    for(int i=0; i<fc.numPrev(); i++) {
+      FlatNode prevNode=fc.getPrev(i);
+      if(prevNode!=null) {
+        OwnershipGraph prevOG=table.get(prevNode);
+        mergeOG.merge(prevOG);
+      }
+    }
+
+    MethodDescriptor md=fc.getMethod();
+    FlatMethod flatm = state.getMethodFlat(md);
+    Set<Integer> aliasedParamIndices = mergeOG.calculateAliasedParamSet(fc, md.isStatic(), flatm);
+    MethodContext calleeMC = new MethodContext(md, aliasedParamIndices);
+
+    return calleeMC;
+  }
+
+
 }