Fixed up another canonical misuse, changed wording of alias reporting to see the...
[IRC.git] / Robust / src / Analysis / OwnershipAnalysis / OwnershipAnalysis.java
index 630ca3d325b4b83be167403e5bec7ffecfad9d3e..b0dcfb47a193e390bb8ed8bf04889e7f65433564 100644 (file)
@@ -3,144 +3,142 @@ package Analysis.OwnershipAnalysis;
 import Analysis.CallGraph.*;
 import IR.*;
 import IR.Flat.*;
+import IR.Tree.Modifiers;
 import java.util.*;
 import java.io.*;
 
 
 public class OwnershipAnalysis {
 
+
   ///////////////////////////////////////////
   //
   //  Public interface to discover possible
   //  aliases in the program under analysis
   //
   ///////////////////////////////////////////
-  /*
-     public HashSet<AllocationSite>
-      getFlaggedAllocationSitesReachableFromTask( TaskDescriptor td ) {
 
-      return getFlaggedAllocationSitesReachableFromTaskPRIVATE( td );
-     }
+  public HashSet<AllocationSite>
+  getFlaggedAllocationSitesReachableFromTask(TaskDescriptor td) {
+    return getFlaggedAllocationSitesReachableFromTaskPRIVATE(td);
+  }
 
-     public AllocationSite getAllocationSiteFromFlatNew( FlatNew fn ) {
-      return getAllocationSiteFromFlatNewPRIVATE( fn );
-     }
+  public AllocationSite getAllocationSiteFromFlatNew(FlatNew fn) {
+    return getAllocationSiteFromFlatNewPRIVATE(fn);
+  }
 
-     public boolean createsPotentialAliases( Descriptor     taskOrMethod,
-                                          int            paramIndex1,
-                                          int            paramIndex2 ) {
+  public boolean createsPotentialAliases(Descriptor taskOrMethod,
+                                         int paramIndex1,
+                                         int paramIndex2) {
 
-      OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get( taskOrMethod );
-      assert( og != null );
+    OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get(taskOrMethod);
+    assert(og != null);
+    return og.hasPotentialAlias(paramIndex1, paramIndex2);
+  }
 
-      return createsPotentialAliases( og,
-                                      getHeapRegionIDset( og, paramIndex1 ),
-                                      getHeapRegionIDset( og, paramIndex2 ) );
-     }
+  public boolean createsPotentialAliases(Descriptor taskOrMethod,
+                                         int paramIndex,
+                                         AllocationSite alloc) {
 
-     public boolean createsPotentialAliases( Descriptor     taskOrMethod,
-                                          int            paramIndex,
-                                          AllocationSite alloc ) {
+    OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get(taskOrMethod);
+    assert(og != null);
+    return og.hasPotentialAlias(paramIndex, alloc);
+  }
 
-      OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get( taskOrMethod );
-      assert( og != null );
+  public boolean createsPotentialAliases(Descriptor taskOrMethod,
+                                         AllocationSite alloc,
+                                         int paramIndex) {
 
-      return createsPotentialAliases( og,
-                                      getHeapRegionIDset( og, paramIndex ),
-                                      getHeapRegionIDset( alloc ) );
-     }
+    OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get(taskOrMethod);
+    assert(og != null);
+    return og.hasPotentialAlias(paramIndex, alloc);
+  }
 
-     public boolean createsPotentialAliases( Descriptor     taskOrMethod,
-                                          AllocationSite alloc,
-                                          int            paramIndex ) {
+  public boolean createsPotentialAliases(Descriptor taskOrMethod,
+                                         AllocationSite alloc1,
+                                         AllocationSite alloc2) {
 
-      OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get( taskOrMethod );
-      assert( og != null );
+    OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get(taskOrMethod);
+    assert(og != null);
+    return og.hasPotentialAlias(alloc1, alloc2);
+  }
 
-      return createsPotentialAliases( og,
-                                      getHeapRegionIDset( og, paramIndex ),
-                                      getHeapRegionIDset( alloc ) );
-     }
+  // 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 boolean createsPotentialAliases( Descriptor     taskOrMethod,
-                                          AllocationSite alloc1,
-                                          AllocationSite alloc2 ) {
+    BufferedWriter bw = new BufferedWriter(new FileWriter(outputFile) );
 
-      OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get( taskOrMethod );
-      assert( og != null );
+    bw.write("Conducting ownership analysis with allocation depth = "+allocationDepth);
 
-      return createsPotentialAliases( og,
-                                      getHeapRegionIDset( alloc1 ),
-                                      getHeapRegionIDset( alloc2 ) );
-     }
+    // look through every task for potential aliases
+    Iterator taskItr = state.getTaskSymbolTable().getDescriptorsIterator();
+    while( taskItr.hasNext() ) {
+      TaskDescriptor td = (TaskDescriptor) taskItr.next();
 
-     public boolean createsPotentialAliases( Descriptor              taskOrMethod,
-                                          AllocationSite          alloc,
-                                          HashSet<AllocationSite> allocSet ) {
+      bw.write("\n---------"+td+"--------\n");
 
-      OwnershipGraph og = mapDescriptorToCompleteOwnershipGraph.get( taskOrMethod );
-      assert( og != null );
+      HashSet<AllocationSite> allocSites = getFlaggedAllocationSitesReachableFromTask(td);
 
-      return createsPotentialAliases( og,
-                                      getHeapRegionIDset( alloc ),
-                                      getHeapRegionIDset( allocSet ) );
-     }
-   */
+      // for each task parameter, check for aliases with
+      // other task parameters and every allocation site
+      // reachable from this task
+      boolean foundSomeAlias = false;
 
-  // 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 {
+      FlatMethod fm = state.getMethodFlat(td);
+      for( int i = 0; i < fm.numParameters(); ++i ) {
 
-    BufferedWriter bw = new BufferedWriter(new FileWriter(outputFile) );
-    /*
-       // look through every task for potential aliases
-       Iterator taskItr = state.getTaskSymbolTable().getDescriptorsIterator();
-       while( taskItr.hasNext() ) {
-        TaskDescriptor td = (TaskDescriptor) taskItr.next();
-
-        HashSet<AllocationSite> allocSites = getFlaggedAllocationSitesReachableFromTask( td );
-
-        // for each task parameter, check for aliases with
-        // other task parameters and every allocation site
-        // reachable from this task
-        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 ) ) {
-                    bw.write( "Task "+td+" potentially aliases 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 ) ) {
-                    bw.write( "Task "+td+" potentially aliases parameter "+i+" and "+as+".\n" );
-                }
-            }
-        }
-
-        // for each allocation site check for aliases with
-        // other allocation sites in the context of execution
-        // of this task
-        Iterator allocItr = allocSites.iterator();
-        while( allocItr.hasNext() ) {
-            AllocationSite as = (AllocationSite) allocItr.next();
-            if( createsPotentialAliases( td, as, allocSites ) ) {
-                bw.write( "Task "+td+" potentially aliases "+as+" and the rest of the set.\n" );
-            }
-        }
-       }
-
-       bw.close();
-     */
+       // 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.getFlatNew()+".\n");
+         }
+       }
+      }
+
+      // 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) &&
+             createsPotentialAliases(td, as1, as2) ) {
+           foundSomeAlias = true;
+           bw.write("Potential alias between "+as1.getFlatNew()+" and "+as2.getFlatNew()+".\n");
+         }
+       }
+
+       outerChecked.add(as1);
+      }
+
+      if( !foundSomeAlias ) {
+       bw.write("No aliases between flagged objects in Task "+td+".\n");
+      }
+    }
+
+    bw.close();
   }
 
   ///////////////////////////////////////////
@@ -158,6 +156,7 @@ public class OwnershipAnalysis {
 
   // data from the compiler
   private State state;
+  private TypeUtil typeUtil;
   private CallGraph callGraph;
   private int allocationDepth;
 
@@ -175,9 +174,11 @@ public class OwnershipAnalysis {
   // 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;
 
   // Use these data structures to track progress of one pass of
   // processing the FlatNodes of a particular method
@@ -196,20 +197,40 @@ public class OwnershipAnalysis {
   // 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);
+  // for controlling DOT file output
+  private boolean writeDOTs;
+  private boolean writeAllDOTs;
+
 
 
   // this analysis generates an ownership graph for every task
   // in the program
   public OwnershipAnalysis(State state,
+                           TypeUtil tu,
                            CallGraph callGraph,
-                           int allocationDepth) throws java.io.IOException {
+                           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;
 
     descriptorsToAnalyze = new HashSet<Descriptor>();
 
+    mapFlatMethodToInitialParamAllocGraph =
+      new Hashtable<FlatMethod, OwnershipGraph>();
+
     mapDescriptorToCompleteOwnershipGraph =
       new Hashtable<Descriptor, OwnershipGraph>();
 
@@ -219,6 +240,9 @@ public class OwnershipAnalysis {
     mapDescriptorToAllocationSiteSet =
       new Hashtable<Descriptor, HashSet<AllocationSite> >();
 
+    if( writeAllDOTs ) {
+      mapDescriptorToNumUpdates = new Hashtable<Descriptor, Integer>();
+    }
 
     // initialize methods to visit as the set of all tasks in the
     // program and then any method that could be called starting
@@ -235,7 +259,7 @@ public class OwnershipAnalysis {
     Iterator<Descriptor> dItr = descriptorsToAnalyze.iterator();
     while( dItr.hasNext() ) {
       Descriptor d  = dItr.next();
-      OwnershipGraph og = new OwnershipGraph(allocationDepth);
+      OwnershipGraph og = new OwnershipGraph(allocationDepth, typeUtil);
 
       FlatMethod fm;
       if( d instanceof MethodDescriptor ) {
@@ -247,8 +271,8 @@ public class OwnershipAnalysis {
 
       System.out.println("Previsiting " + d);
 
-      analyzeFlatNode(d, fm, null, og);
-      mapDescriptorToCompleteOwnershipGraph.put(d, og);
+      og = analyzeFlatNode(d, fm, null, og);
+      setGraphForDescriptor(d, og);
     }
 
     System.out.println("");
@@ -256,6 +280,12 @@ public class OwnershipAnalysis {
     // as mentioned above, analyze methods one-by-one, possibly revisiting
     // a method if the methods that it calls are updated
     analyzeMethods();
+
+    System.out.println("");
+
+    if( aliasFile != null ) {
+      writeAllAliases(aliasFile);
+    }
   }
 
   // called from the constructor to help initialize the set
@@ -317,13 +347,7 @@ public class OwnershipAnalysis {
       OwnershipGraph og = analyzeFlatMethod(d, fm);
       OwnershipGraph ogPrev = mapDescriptorToCompleteOwnershipGraph.get(d);
       if( !og.equals(ogPrev) ) {
-       mapDescriptorToCompleteOwnershipGraph.put(d, og);
-
-       /* boolean writeLabels,
-          boolean labelSelect,
-          boolean pruneGarbage,
-          boolean writeReferencers */
-       og.writeGraph(d, true, true, true, false);
+       setGraphForDescriptor(d, og);
 
        // only methods have dependents, tasks cannot
        // be invoked by any user program calls
@@ -355,19 +379,10 @@ public class OwnershipAnalysis {
     // initialize flat nodes to visit as the flat method
     // because all other nodes in this flat method are
     // decendents of the flat method itself
+
     flatNodesToVisit = new HashSet<FlatNode>();
     flatNodesToVisit.add(flatm);
 
-
-    // A YUCKY HACK--this is to make sure that an initially empty
-    // graph (no parameters) will get passed the first "any changes?"
-    // test when it comes up for analysis.  It's ugly but throwing
-    // a child in works.
-    FlatNode fnJ = flatm.getNext(0);
-    assert fnJ != null;
-    flatNodesToVisit.add(fnJ);
-
-
     // initilize the mapping of flat nodes in this flat method to
     // ownership graph results to an empty mapping
     mapFlatNodeToOwnershipGraph = new Hashtable<FlatNode, OwnershipGraph>();
@@ -381,34 +396,42 @@ 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);
+      OwnershipGraph og = new OwnershipGraph(allocationDepth, typeUtil);
 
       // 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
-      analyzeFlatNode(mDesc,
-                      fn,
-                      returnNodesToCombineForCompleteOwnershipGraph,
-                      og);
+      og = analyzeFlatNode(mDesc,
+                           fn,
+                           returnNodesToCombineForCompleteOwnershipGraph,
+                           og);
+
+
+      //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);
@@ -420,18 +443,20 @@ public class OwnershipAnalysis {
     // 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);
+    OwnershipGraph completeGraph = new OwnershipGraph(allocationDepth, typeUtil);
     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 void
+  private OwnershipGraph
   analyzeFlatNode(Descriptor methodDesc,
                   FlatNode fn,
                   HashSet<FlatReturnNode> setRetNodes,
@@ -452,13 +477,30 @@ public class OwnershipAnalysis {
       // parent of all other FlatNode objects, so take
       // the opportunity to construct the initial graph by
       // adding parameters labels to new heap regions
-      for( int i = 0; i < fm.numParameters(); ++i ) {
-       TempDescriptor tdParam = fm.getParameter(i);
-       og.assignTempEqualToParamAlloc(tdParam,
-                                      methodDesc instanceof TaskDescriptor,
-                                      new Integer(i) );
-      }
+      // AND this should be done once globally so that the
+      // 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);
+      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);
 
+      } else {
+       // or just leverage the cached copy
+       og.merge(ogInitParamAlloc);
+      }
       break;
 
     case FKind.FlatOpNode:
@@ -475,7 +517,7 @@ public class OwnershipAnalysis {
       lhs = ffn.getDst();
       rhs = ffn.getSrc();
       fld = ffn.getField();
-      if( !fld.getType().isPrimitive() ) {
+      if( !fld.getType().isImmutable() ) {
        og.assignTempXEqualToTempYFieldF(lhs, rhs, fld);
       }
       break;
@@ -485,74 +527,122 @@ public class OwnershipAnalysis {
       lhs = fsfn.getDst();
       fld = fsfn.getField();
       rhs = fsfn.getSrc();
-      og.assignTempXFieldFEqualToTempY(lhs, fld, rhs);
+      if( !fld.getType().isImmutable() ) {
+       og.assignTempXFieldFEqualToTempY(lhs, fld, rhs);
+      }
+      break;
+
+    case FKind.FlatElementNode:
+      FlatElementNode fen = (FlatElementNode) fn;
+      lhs = fen.getDst();
+      rhs = fen.getSrc();
+      if( !lhs.getType().isImmutable() ) {
+       og.assignTempXEqualToTempYFieldF(lhs, rhs, fdElement);
+      }
+      break;
+
+    case FKind.FlatSetElementNode:
+      FlatSetElementNode fsen = (FlatSetElementNode) fn;
+      lhs = fsen.getDst();
+      rhs = fsen.getSrc();
+      if( !rhs.getType().isImmutable() ) {
+       og.assignTempXFieldFEqualToTempY(lhs, fdElement, rhs);
+      }
       break;
 
     case FKind.FlatNew:
       FlatNew fnn = (FlatNew) fn;
       lhs = fnn.getDst();
-      AllocationSite as = getAllocationSiteFromFlatNewPRIVATE(fnn);
-
-      og.assignTempEqualToNewAlloc(lhs, as);
+      if( !lhs.getType().isImmutable() ) {
+       AllocationSite as = getAllocationSiteFromFlatNewPRIVATE(fnn);
+       og.assignTempEqualToNewAlloc(lhs, as);
+      }
       break;
 
     case FKind.FlatCall:
       FlatCall fc = (FlatCall) fn;
       MethodDescriptor md = fc.getMethod();
       FlatMethod flatm = state.getMethodFlat(md);
-      OwnershipGraph ogAllPossibleCallees = new OwnershipGraph(allocationDepth);
+      OwnershipGraph ogMergeOfAllPossibleCalleeResults = new OwnershipGraph(allocationDepth, typeUtil);
 
       if( md.isStatic() ) {
        // a static method is simply always the same, makes life easy
        OwnershipGraph onlyPossibleCallee = mapDescriptorToCompleteOwnershipGraph.get(md);
-       ogAllPossibleCallees.merge(onlyPossibleCallee);
-
+       ogMergeOfAllPossibleCalleeResults = og;
+       ogMergeOfAllPossibleCalleeResults.resolveMethodCall(fc, md.isStatic(), flatm, onlyPossibleCallee);
       } 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 graphs together
+       // 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();
+
+         // 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);
-         ogAllPossibleCallees.merge(ogPotentialCallee);
+         ogCopy.resolveMethodCall(fc, md.isStatic(), flatm, ogPotentialCallee);
+         ogMergeOfAllPossibleCalleeResults.merge(ogCopy);
        }
       }
 
-      // Now we should have the following information to resolve this method call:
-      //
-      // 1. A FlatCall fc to query for the caller's context (argument labels, etc)
-      //
-      // 2. Whether the method is static; if not we need to deal with the "this" pointer
-      //
-      // *******************************************************************************************
-      // 3. The original FlatMethod flatm to query for callee's context (paramter labels)
-      //   NOTE!  I assume FlatMethod before virtual dispatch accurately describes all possible methods!
-      // *******************************************************************************************
-      //
-      // 4. The OwnershipGraph ogAllPossibleCallees is a merge of every ownership graph of all the possible
-      // methods to capture any possible references made.
-      //
-      og.resolveMethodCall(fc, md.isStatic(), flatm, ogAllPossibleCallees);
+      og = ogMergeOfAllPossibleCalleeResults;      
       break;
 
     case FKind.FlatReturnNode:
       FlatReturnNode frn = (FlatReturnNode) fn;
       rhs = frn.getReturnTemp();
-
-      if( rhs != null ) {
+      if( rhs != null && !rhs.getType().isImmutable() ) {
        og.assignReturnEqualToTemp(rhs);
       }
-
       setRetNodes.add(frn);
       break;
     }
+
+    return og;
   }
 
 
+  // insert a call to debugSnapshot() somewhere in the analysis to get
+  // successive captures of the analysis state
+  int debugCounter        = 0;
+  int numStartCountReport = 0;
+  int freqCountReport     = 1000;
+  int iterStartCapture    = 20000;
+  int numIterToCapture    = 400;
+  void debugSnapshot( OwnershipGraph og, FlatNode fn ) {
+    ++debugCounter;
+    if( debugCounter > numStartCountReport &&
+       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, true, false, false, false );
+      } catch( Exception e ) {
+       System.out.println( "Error writing debug capture." );
+       System.exit( 0 );       
+      }
+    }
+    if( debugCounter == iterStartCapture + numIterToCapture ) {
+      System.out.println( "Stopping analysis after debug captures." );
+      System.exit( 0 );
+    }
+  }
+
+
+
   // this method should generate integers strictly greater than zero!
   // special "shadow" regions are made from a heap region by negating
   // the ID
@@ -562,28 +652,40 @@ public class OwnershipAnalysis {
   }
 
 
-  private OwnershipGraph getGraphFromFlatNode(FlatNode fn) {
-    if( !mapFlatNodeToOwnershipGraph.containsKey(fn) ) {
-      mapFlatNodeToOwnershipGraph.put(fn, new OwnershipGraph(allocationDepth) );
-    }
+  private void setGraphForDescriptor(Descriptor d, OwnershipGraph og)
+  throws IOException {
 
-    return mapFlatNodeToOwnershipGraph.get(fn);
-  }
-
-  private void setGraphForFlatNode(FlatNode fn, OwnershipGraph og) {
-    mapFlatNodeToOwnershipGraph.put(fn, og);
-  }
+    mapDescriptorToCompleteOwnershipGraph.put(d, og);
 
+    // arguments to writeGraph are:
+    // boolean writeLabels,
+    // boolean labelSelect,
+    // boolean pruneGarbage,
+    // boolean writeReferencers
+    // boolean writeParamMappings
 
+    if( writeDOTs ) {
 
+      if( !writeAllDOTs ) {
+       og.writeGraph(d, true, true, true, false, false);
 
+      } else {
+       if( !mapDescriptorToNumUpdates.containsKey(d) ) {
+         mapDescriptorToNumUpdates.put(d, new Integer(0) );
+       }
+       Integer n = mapDescriptorToNumUpdates.get(d);
+       og.writeGraph(d, n, true, true, true, false, false);
+       mapDescriptorToNumUpdates.put(d, n + 1);
+      }
+    }
+  }
 
 
   // 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 );
 
       // the newest nodes are single objects
       for( int i = 0; i < allocationDepth; ++i ) {
@@ -672,8 +774,12 @@ public class OwnershipAnalysis {
       Iterator asItr = asSet.iterator();
       while( asItr.hasNext() ) {
        AllocationSite as = (AllocationSite) asItr.next();
-       if( as.getType().getClassDesc().hasFlags() ) {
-         asSetTotal.add(as);
+       TypeDescriptor typed = as.getType();
+       if( typed != null ) {
+         ClassDescriptor cd = typed.getClassDesc();
+         if( cd != null && cd.hasFlags() ) {
+           asSetTotal.add(as);
+         }
        }
       }
 
@@ -695,78 +801,4 @@ public class OwnershipAnalysis {
 
     return asSetTotal;
   }
-
-
-
-  private HashSet<Integer> getHeapRegionIDset(OwnershipGraph og,
-                                              int paramIndex) {
-
-    assert og.paramIndex2id.containsKey(paramIndex);
-    Integer idParam = og.paramIndex2id.get(paramIndex);
-
-    HashSet<Integer> idSet = new HashSet<Integer>();
-    idSet.add(idParam);
-
-    return idSet;
-  }
-
-
-  private HashSet<Integer> getHeapRegionIDset(AllocationSite alloc) {
-
-    HashSet<Integer> idSet = new HashSet<Integer>();
-
-    for( int i = 0; i < alloc.getAllocationDepth(); ++i ) {
-      Integer id = alloc.getIthOldest(i);
-      idSet.add(id);
-    }
-
-    Integer idSummary = alloc.getSummary();
-    idSet.add(idSummary);
-
-    return idSet;
-  }
-
-  private HashSet<Integer> getHeapRegionIDset(HashSet<AllocationSite> allocSet) {
-
-    HashSet<Integer> idSet = new HashSet<Integer>();
-
-    Iterator allocItr = allocSet.iterator();
-    while( allocItr.hasNext() ) {
-      AllocationSite alloc = (AllocationSite) allocItr.next();
-
-      for( int i = 0; i < alloc.getAllocationDepth(); ++i ) {
-       Integer id = alloc.getIthOldest(i);
-       idSet.add(id);
-      }
-
-      Integer idSummary = alloc.getSummary();
-      idSet.add(idSummary);
-    }
-
-    return idSet;
-  }
-
-  private boolean createsPotentialAliases(OwnershipGraph og,
-                                          HashSet<Integer> idSetA,
-                                          HashSet<Integer> idSetB) {
-    boolean potentialAlias = false;
-
-    /*
-       // first expand set B into the set of all heap region node ID's
-       // reachable from the nodes in set B
-       HashSet<Integer> idSetReachableFromB = og.getReachableSet( idSetB );
-
-       // then see if anything in A can reach a node in the set reachable
-       // from B.  If so, there is a potential alias.
-       Iterator i = idSetA.iterator();
-       while( i.hasNext() ) {
-        Integer id = (Integer) i.next();
-        if( og.canIdReachSet( id, idSetB ) ) {
-            return true;
-        }
-       }
-     */
-
-    return false;
-  }
 }