changes.
[IRC.git] / Robust / src / Analysis / SSJava / LocationInference.java
index cd5a58d38ff71bb4b8c464221a5b06566f83b6d5..148733af05c4a9d1dcdf388f219285d407658164 100644 (file)
@@ -47,6 +47,7 @@ import IR.Tree.NameNode;
 import IR.Tree.OpNode;
 import IR.Tree.ReturnNode;
 import IR.Tree.SubBlockNode;
+import IR.Tree.SwitchBlockNode;
 import IR.Tree.SwitchStatementNode;
 import IR.Tree.TertiaryNode;
 import IR.Tree.TreeNode;
@@ -57,10 +58,12 @@ public class LocationInference {
   State state;
   SSJavaAnalysis ssjava;
 
-  List<ClassDescriptor> toanalyzeList;
-  List<MethodDescriptor> toanalyzeMethodList;
+  List<ClassDescriptor> temp_toanalyzeList;
+  List<MethodDescriptor> temp_toanalyzeMethodList;
   Map<MethodDescriptor, FlowGraph> mapMethodDescriptorToFlowGraph;
 
+  LinkedList<MethodDescriptor> toanalyze_methodDescList;
+
   // map a method descriptor to its set of parameter descriptors
   Map<MethodDescriptor, Set<Descriptor>> mapMethodDescriptorToParamDescSet;
 
@@ -73,12 +76,28 @@ public class LocationInference {
   // map a method descriptor to a method lattice
   private Map<MethodDescriptor, SSJavaLattice<String>> md2lattice;
 
+  // map a method/class descriptor to a hierarchy graph
+  private Map<Descriptor, HierarchyGraph> mapDescriptorToHierarchyGraph;
+
+  // map a method/class descriptor to a skeleton hierarchy graph
+  private Map<Descriptor, HierarchyGraph> mapDescriptorToSkeletonHierarchyGraph;
+
+  private Map<Descriptor, HierarchyGraph> mapDescriptorToSimpleHierarchyGraph;
+
+  // map a method/class descriptor to a skeleton hierarchy graph with combination nodes
+  private Map<Descriptor, HierarchyGraph> mapDescriptorToCombineSkeletonHierarchyGraph;
+
+  // map a descriptor to a simple lattice
+  private Map<Descriptor, SSJavaLattice<String>> mapDescriptorToSimpleLattice;
+
   // map a method descriptor to the set of method invocation nodes which are
   // invoked by the method descriptor
   private Map<MethodDescriptor, Set<MethodInvokeNode>> mapMethodDescriptorToMethodInvokeNodeSet;
 
   private Map<MethodInvokeNode, Map<Integer, NodeTupleSet>> mapMethodInvokeNodeToArgIdxMap;
 
+  private Map<MethodInvokeNode, NTuple<Descriptor>> mapMethodInvokeNodeToBaseTuple;
+
   private Map<MethodDescriptor, MethodLocationInfo> mapMethodDescToMethodLocationInfo;
 
   private Map<ClassDescriptor, LocationInfo> mapClassToLocationInfo;
@@ -91,10 +110,18 @@ public class LocationInference {
 
   private Map<Descriptor, Integer> mapDescToDefinitionLine;
 
+  private Map<Descriptor, LocationSummary> mapDescToLocationSummary;
+
+  // maps a method descriptor to a sub global flow graph that captures all value flows caused by the
+  // set of callees reachable from the method
+  private Map<MethodDescriptor, FlowGraph> mapMethodDescriptorToSubGlobalFlowGraph;
+
   public static final String GLOBALLOC = "GLOBALLOC";
 
   public static final String TOPLOC = "TOPLOC";
 
+  public static final String INTERLOC = "INTERLOC";
+
   public static final Descriptor GLOBALDESC = new NameDescriptor(GLOBALLOC);
 
   public static final Descriptor TOPDESC = new NameDescriptor(TOPLOC);
@@ -105,11 +132,13 @@ public class LocationInference {
 
   boolean debug = true;
 
+  private static int locSeed = 0;
+
   public LocationInference(SSJavaAnalysis ssjava, State state) {
     this.ssjava = ssjava;
     this.state = state;
-    this.toanalyzeList = new ArrayList<ClassDescriptor>();
-    this.toanalyzeMethodList = new ArrayList<MethodDescriptor>();
+    this.temp_toanalyzeList = new ArrayList<ClassDescriptor>();
+    this.temp_toanalyzeMethodList = new ArrayList<MethodDescriptor>();
     this.mapMethodDescriptorToFlowGraph = new HashMap<MethodDescriptor, FlowGraph>();
     this.cd2lattice = new HashMap<ClassDescriptor, SSJavaLattice<String>>();
     this.md2lattice = new HashMap<MethodDescriptor, SSJavaLattice<String>>();
@@ -126,12 +155,26 @@ public class LocationInference {
     this.mapDescToDefinitionLine = new HashMap<Descriptor, Integer>();
     this.mapMethodDescToParamNodeFlowsToReturnValue =
         new HashMap<MethodDescriptor, Set<FlowNode>>();
+
+    this.mapDescriptorToHierarchyGraph = new HashMap<Descriptor, HierarchyGraph>();
+    this.mapMethodInvokeNodeToBaseTuple = new HashMap<MethodInvokeNode, NTuple<Descriptor>>();
+
+    this.mapDescriptorToSkeletonHierarchyGraph = new HashMap<Descriptor, HierarchyGraph>();
+    this.mapDescriptorToCombineSkeletonHierarchyGraph = new HashMap<Descriptor, HierarchyGraph>();
+    this.mapDescriptorToSimpleHierarchyGraph = new HashMap<Descriptor, HierarchyGraph>();
+
+    this.mapDescriptorToSimpleLattice = new HashMap<Descriptor, SSJavaLattice<String>>();
+
+    this.mapDescToLocationSummary = new HashMap<Descriptor, LocationSummary>();
+
+    mapMethodDescriptorToSubGlobalFlowGraph = new HashMap<MethodDescriptor, FlowGraph>();
+
   }
 
   public void setupToAnalyze() {
     SymbolTable classtable = state.getClassSymbolTable();
-    toanalyzeList.clear();
-    toanalyzeList.addAll(classtable.getValueSet());
+    temp_toanalyzeList.clear();
+    temp_toanalyzeList.addAll(classtable.getValueSet());
     // Collections.sort(toanalyzeList, new Comparator<ClassDescriptor>() {
     // public int compare(ClassDescriptor o1, ClassDescriptor o2) {
     // return o1.getClassName().compareToIgnoreCase(o2.getClassName());
@@ -142,9 +185,9 @@ public class LocationInference {
   public void setupToAnalazeMethod(ClassDescriptor cd) {
 
     SymbolTable methodtable = cd.getMethodTable();
-    toanalyzeMethodList.clear();
-    toanalyzeMethodList.addAll(methodtable.getValueSet());
-    Collections.sort(toanalyzeMethodList, new Comparator<MethodDescriptor>() {
+    temp_toanalyzeMethodList.clear();
+    temp_toanalyzeMethodList.addAll(methodtable.getValueSet());
+    Collections.sort(temp_toanalyzeMethodList, new Comparator<MethodDescriptor>() {
       public int compare(MethodDescriptor o1, MethodDescriptor o2) {
         return o1.getSymbol().compareToIgnoreCase(o2.getSymbol());
       }
@@ -152,19 +195,19 @@ public class LocationInference {
   }
 
   public boolean toAnalyzeMethodIsEmpty() {
-    return toanalyzeMethodList.isEmpty();
+    return temp_toanalyzeMethodList.isEmpty();
   }
 
   public boolean toAnalyzeIsEmpty() {
-    return toanalyzeList.isEmpty();
+    return temp_toanalyzeList.isEmpty();
   }
 
   public ClassDescriptor toAnalyzeNext() {
-    return toanalyzeList.remove(0);
+    return temp_toanalyzeList.remove(0);
   }
 
   public MethodDescriptor toAnalyzeMethodNext() {
-    return toanalyzeMethodList.remove(0);
+    return temp_toanalyzeMethodList.remove(0);
   }
 
   public void inference() {
@@ -172,19 +215,607 @@ public class LocationInference {
     // 1) construct value flow graph
     constructFlowGraph();
 
+    constructGlobalFlowGraph();
+
+    System.exit(0);
+
+    constructHierarchyGraph();
+
+    debug_writeHierarchyDotFiles();
+
+    simplifyHierarchyGraph();
+
+    debug_writeSimpleHierarchyDotFiles();
+
+    constructSkeletonHierarchyGraph();
+
+    debug_writeSkeletonHierarchyDotFiles();
+
+    insertCombinationNodes();
+
+    debug_writeSkeletonCombinationHierarchyDotFiles();
+
+    buildLattice();
+
+    debug_writeLattices();
+
+    generateMethodSummary();
+
+    System.exit(0);
+
     // 2) construct lattices
     inferLattices();
 
     simplifyLattices();
 
-    debug_writeLatticeDotFile();
+    // 3) check properties
+    checkLattices();
+
+    // calculate RETURNLOC,PCLOC
+    calculateExtraLocations();
+
+    debug_writeLatticeDotFile();
+
+    // 4) generate annotated source codes
+    generateAnnoatedCode();
+
+  }
+
+  private void constructGlobalFlowGraph() {
+
+    System.out.println("");
+    LinkedList<MethodDescriptor> methodDescList =
+        (LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
+
+    System.out.println("@@@methodDescList=" + methodDescList);
+    // System.exit(0);
+
+    while (!methodDescList.isEmpty()) {
+      MethodDescriptor md = methodDescList.removeLast();
+      if (state.SSJAVADEBUG) {
+        System.out.println();
+        System.out.println("SSJAVA: Constructing a global flow graph: " + md);
+
+        FlowGraph flowGraph = getFlowGraph(md);
+        FlowGraph subGlobalFlowGraph = flowGraph.clone();
+        mapMethodDescriptorToSubGlobalFlowGraph.put(md, subGlobalFlowGraph);
+
+        addValueFlowsFromCalleeSubGlobalFlowGraph(md, subGlobalFlowGraph);
+
+        try {
+          subGlobalFlowGraph.writeGraph("_SUBGLOBAL");
+        } catch (IOException e) {
+          e.printStackTrace();
+        }
+        // FlowGraph fg = new FlowGraph(md, mapParamDescToIdx);
+        // mapMethodDescriptorToFlowGraph.put(md, fg);
+        // analyzeMethodBody(md.getClassDesc(), md);
+
+      }
+    }
+    // _debug_printGraph();
+
+  }
+
+  private void addValueFlowsFromCalleeSubGlobalFlowGraph(MethodDescriptor mdCaller,
+      FlowGraph subGlobalFlowGraph) {
+
+    // the transformation for a call site propagates flows through parameters
+    // if the method is virtual, it also grab all relations from any possible
+    // callees
+
+    Set<MethodInvokeNode> setMethodInvokeNode = getMethodInvokeNodeSet(mdCaller);
+
+    for (Iterator iterator = setMethodInvokeNode.iterator(); iterator.hasNext();) {
+      MethodInvokeNode min = (MethodInvokeNode) iterator.next();
+      MethodDescriptor mdCallee = min.getMethod();
+      Set<MethodDescriptor> setPossibleCallees = new HashSet<MethodDescriptor>();
+      if (mdCallee.isStatic()) {
+        setPossibleCallees.add(mdCallee);
+      } else {
+        Set<MethodDescriptor> calleeSet = ssjava.getCallGraph().getMethods(mdCallee);
+        // removes method descriptors that are not invoked by the caller
+        calleeSet.retainAll(mapMethodToCalleeSet.get(mdCaller));
+        setPossibleCallees.addAll(calleeSet);
+      }
+
+      for (Iterator iterator2 = setPossibleCallees.iterator(); iterator2.hasNext();) {
+        MethodDescriptor possibleMdCallee = (MethodDescriptor) iterator2.next();
+        propagateValueFlowsToCallerFromSubGlobalFlowGraph(min, mdCaller, possibleMdCallee);
+        // propagateFlowsToCallerWithNoCompositeLocation(min, mdCaller, possibleMdCallee);
+      }
+
+    }
+
+  }
+
+  private void propagateValueFlowsToCallerFromSubGlobalFlowGraph(MethodInvokeNode min,
+      MethodDescriptor mdCaller, MethodDescriptor possibleMdCallee) {
+
+    NTuple<Descriptor> baseTuple = mapMethodInvokeNodeToBaseTuple.get(min);
+
+    FlowGraph callerSubGlobalGraph = getSubGlobalFlowGraph(mdCaller);
+    FlowGraph calleeSubGlobalGraph = getSubGlobalFlowGraph(possibleMdCallee);
+
+    int numParam = calleeSubGlobalGraph.getNumParameters();
+    for (int idx = 0; idx < numParam; idx++) {
+      FlowNode paramNode = calleeSubGlobalGraph.getParamFlowNode(idx);
+      NodeTupleSet argTupleSet = mapMethodInvokeNodeToArgIdxMap.get(min).get(idx);
+      System.out.println("argTupleSet=" + argTupleSet + "   param=" + paramNode);
+      for (Iterator<NTuple<Descriptor>> iter = argTupleSet.iterator(); iter.hasNext();) {
+        NTuple<Descriptor> argTuple = iter.next();
+        addValueFlowsFromCalleeParam(calleeSubGlobalGraph, paramNode, callerSubGlobalGraph,
+            argTuple, baseTuple);
+      }
+    }
+
+  }
+
+  private void addValueFlowsFromCalleeParam(FlowGraph calleeSubGlobalGraph, FlowNode paramNode,
+      FlowGraph callerSubGlobalGraph, NTuple<Descriptor> argTuple, NTuple<Descriptor> baseTuple) {
+
+    Set<FlowNode> visited = new HashSet<FlowNode>();
+
+    visited.add(paramNode);
+    recurAddValueFlowsFromCalleeParam(calleeSubGlobalGraph, paramNode, callerSubGlobalGraph,
+        argTuple, visited, baseTuple);
+  }
+
+  private void recurAddValueFlowsFromCalleeParam(FlowGraph calleeSubGlobalGraph,
+      FlowNode calleeSrcNode, FlowGraph callerSubGlobalGraph, NTuple<Descriptor> callerSrcTuple,
+      Set<FlowNode> visited, NTuple<Descriptor> baseTuple) {
+
+    MethodDescriptor mdCallee = calleeSubGlobalGraph.getMethodDescriptor();
+
+    Set<FlowEdge> edgeSet = calleeSubGlobalGraph.getOutEdgeSet(calleeSrcNode);
+    for (Iterator iterator = edgeSet.iterator(); iterator.hasNext();) {
+      FlowEdge flowEdge = (FlowEdge) iterator.next();
+      FlowNode dstNode = flowEdge.getDst();
+
+      NTuple<Descriptor> dstDescTuple = dstNode.getCurrentDescTuple();
+      if (dstDescTuple.get(0).equals(mdCallee.getThis())) {
+        // destination node is started with 'this' variable
+        // need to translate it in terms of the caller's base node
+        dstDescTuple = translateToCaller(dstDescTuple, baseTuple);
+      }
+
+      callerSubGlobalGraph.addValueFlowEdge(callerSrcTuple, dstDescTuple);
+
+      if (!visited.contains(dstNode)) {
+        visited.add(dstNode);
+        recurAddValueFlowsFromCalleeParam(calleeSubGlobalGraph, dstNode, callerSubGlobalGraph,
+            dstDescTuple, visited, baseTuple);
+      }
+
+    }
+
+  }
+
+  private NTuple<Descriptor> translateToCaller(NTuple<Descriptor> dstDescTuple,
+      NTuple<Descriptor> baseTuple) {
+    NTuple<Descriptor> callerDescTuple = new NTuple<Descriptor>();
+
+    callerDescTuple.addAll(baseTuple);
+    for (int i = 1; i < dstDescTuple.size(); i++) {
+      callerDescTuple.add(dstDescTuple.get(i));
+    }
+
+    return callerDescTuple;
+  }
+
+  public LocationSummary getLocationSummary(Descriptor d) {
+    if (!mapDescToLocationSummary.containsKey(d)) {
+      if (d instanceof MethodDescriptor) {
+        mapDescToLocationSummary.put(d, new MethodSummary((MethodDescriptor) d));
+      } else if (d instanceof ClassDescriptor) {
+        mapDescToLocationSummary.put(d, new FieldSummary());
+      }
+    }
+    return mapDescToLocationSummary.get(d);
+  }
+
+  private void generateMethodSummary() {
+
+    Set<MethodDescriptor> keySet = md2lattice.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      MethodDescriptor md = (MethodDescriptor) iterator.next();
+
+      System.out.println("\nSSJAVA: generate method summary: " + md);
+
+      FlowGraph flowGraph = getFlowGraph(md);
+      MethodSummary methodSummary = getMethodSummary(md);
+
+      // construct a parameter mapping that maps a parameter descriptor to an inferred composite
+      // location
+
+      for (int paramIdx = 0; paramIdx < flowGraph.getNumParameters(); paramIdx++) {
+        FlowNode flowNode = flowGraph.getParamFlowNode(paramIdx);
+        NTuple<Descriptor> descTuple = flowNode.getDescTuple();
+
+        CompositeLocation assignedCompLoc = flowNode.getCompositeLocation();
+        CompositeLocation inferredCompLoc;
+        if (assignedCompLoc != null) {
+          inferredCompLoc = translateCompositeLocation(assignedCompLoc);
+        } else {
+          Descriptor locDesc = descTuple.get(0);
+          Location loc = new Location(md, locDesc.getSymbol());
+          loc.setLocDescriptor(locDesc);
+          inferredCompLoc = new CompositeLocation(loc);
+        }
+        System.out.println("-paramIdx=" + paramIdx + "   infer=" + inferredCompLoc);
+        methodSummary.addMapParamIdxToInferLoc(paramIdx, inferredCompLoc);
+      }
+
+    }
+
+  }
+
+  private CompositeLocation translateCompositeLocation(CompositeLocation compLoc) {
+    CompositeLocation newCompLoc = new CompositeLocation();
+
+    // System.out.println("compLoc=" + compLoc);
+    for (int i = 0; i < compLoc.getSize(); i++) {
+      Location loc = compLoc.get(i);
+      Descriptor enclosingDescriptor = loc.getDescriptor();
+      Descriptor locDescriptor = loc.getLocDescriptor();
+
+      HNode hnode = getHierarchyGraph(enclosingDescriptor).getHNode(locDescriptor);
+      // System.out.println("-hnode=" + hnode + "    from=" + locDescriptor +
+      // " enclosingDescriptor="
+      // + enclosingDescriptor);
+      // System.out.println("-getLocationSummary(enclosingDescriptor)="
+      // + getLocationSummary(enclosingDescriptor));
+      String locName = getLocationSummary(enclosingDescriptor).getLocationName(hnode.getName());
+      // System.out.println("-locName=" + locName);
+      Location newLoc = new Location(enclosingDescriptor, locName);
+      newLoc.setLocDescriptor(locDescriptor);
+      newCompLoc.addLocation(newLoc);
+    }
+
+    return newCompLoc;
+  }
+
+  private void debug_writeLattices() {
+
+    Set<Descriptor> keySet = mapDescriptorToSimpleLattice.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      Descriptor key = (Descriptor) iterator.next();
+      SSJavaLattice<String> simpleLattice = mapDescriptorToSimpleLattice.get(key);
+      // HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(key);
+      HierarchyGraph scHierarchyGraph = getSkeletonCombinationHierarchyGraph(key);
+      if (key instanceof ClassDescriptor) {
+        writeInferredLatticeDotFile((ClassDescriptor) key, scHierarchyGraph, simpleLattice,
+            "_SIMPLE");
+      } else if (key instanceof MethodDescriptor) {
+        MethodDescriptor md = (MethodDescriptor) key;
+        writeInferredLatticeDotFile(md.getClassDesc(), md, scHierarchyGraph, simpleLattice,
+            "_SIMPLE");
+      }
+
+      LocationSummary ls = getLocationSummary(key);
+      System.out.println("####LOC SUMMARY=" + key + "\n" + ls.getMapHNodeNameToLocationName());
+    }
+
+    Set<ClassDescriptor> cdKeySet = cd2lattice.keySet();
+    for (Iterator iterator = cdKeySet.iterator(); iterator.hasNext();) {
+      ClassDescriptor cd = (ClassDescriptor) iterator.next();
+      writeInferredLatticeDotFile((ClassDescriptor) cd, getSkeletonCombinationHierarchyGraph(cd),
+          cd2lattice.get(cd), "");
+    }
+
+    Set<MethodDescriptor> mdKeySet = md2lattice.keySet();
+    for (Iterator iterator = mdKeySet.iterator(); iterator.hasNext();) {
+      MethodDescriptor md = (MethodDescriptor) iterator.next();
+      writeInferredLatticeDotFile(md.getClassDesc(), md, getSkeletonCombinationHierarchyGraph(md),
+          md2lattice.get(md), "");
+    }
+
+  }
+
+  private void buildLattice() {
+
+    BuildLattice buildLattice = new BuildLattice(this);
+
+    Set<Descriptor> keySet = mapDescriptorToCombineSkeletonHierarchyGraph.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      Descriptor desc = (Descriptor) iterator.next();
+
+      SSJavaLattice<String> simpleLattice = buildLattice.buildLattice(desc);
+
+      addMapDescToSimpleLattice(desc, simpleLattice);
+
+      HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(desc);
+      System.out.println("## insertIntermediateNodesToStraightLine:"
+          + simpleHierarchyGraph.getName());
+      SSJavaLattice<String> lattice =
+          buildLattice.insertIntermediateNodesToStraightLine(desc, simpleLattice);
+      lattice.removeRedundantEdges();
+
+      if (desc instanceof ClassDescriptor) {
+        // field lattice
+        cd2lattice.put((ClassDescriptor) desc, lattice);
+        // ssjava.writeLatticeDotFile((ClassDescriptor) desc, null, lattice);
+      } else if (desc instanceof MethodDescriptor) {
+        // method lattice
+        md2lattice.put((MethodDescriptor) desc, lattice);
+        MethodDescriptor md = (MethodDescriptor) desc;
+        ClassDescriptor cd = md.getClassDesc();
+        // ssjava.writeLatticeDotFile(cd, md, lattice);
+      }
+
+      // System.out.println("\nSSJAVA: Insering Combination Nodes:" + desc);
+      // HierarchyGraph skeletonGraph = getSkeletonHierarchyGraph(desc);
+      // HierarchyGraph skeletonGraphWithCombinationNode = skeletonGraph.clone();
+      // skeletonGraphWithCombinationNode.setName(desc + "_SC");
+      //
+      // HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(desc);
+      // System.out.println("Identifying Combination Nodes:");
+      // skeletonGraphWithCombinationNode.insertCombinationNodesToGraph(simpleHierarchyGraph);
+      // skeletonGraphWithCombinationNode.simplifySkeletonCombinationHierarchyGraph();
+      // mapDescriptorToCombineSkeletonHierarchyGraph.put(desc, skeletonGraphWithCombinationNode);
+    }
+
+  }
+
+  public void addMapDescToSimpleLattice(Descriptor desc, SSJavaLattice<String> lattice) {
+    mapDescriptorToSimpleLattice.put(desc, lattice);
+  }
+
+  public SSJavaLattice<String> getSimpleLattice(Descriptor desc) {
+    return mapDescriptorToSimpleLattice.get(desc);
+  }
+
+  private void simplifyHierarchyGraph() {
+    Set<Descriptor> keySet = mapDescriptorToHierarchyGraph.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      Descriptor desc = (Descriptor) iterator.next();
+      HierarchyGraph simpleHierarchyGraph = getHierarchyGraph(desc).clone();
+      simpleHierarchyGraph.setName(desc + "_SIMPLE");
+      simpleHierarchyGraph.removeRedundantEdges();
+      // simpleHierarchyGraph.simplifyHierarchyGraph();
+      mapDescriptorToSimpleHierarchyGraph.put(desc, simpleHierarchyGraph);
+    }
+  }
+
+  private void insertCombinationNodes() {
+    Set<Descriptor> keySet = mapDescriptorToSkeletonHierarchyGraph.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      Descriptor desc = (Descriptor) iterator.next();
+      System.out.println("\nSSJAVA: Insering Combination Nodes:" + desc);
+      HierarchyGraph skeletonGraph = getSkeletonHierarchyGraph(desc);
+      HierarchyGraph skeletonGraphWithCombinationNode = skeletonGraph.clone();
+      skeletonGraphWithCombinationNode.setName(desc + "_SC");
+
+      HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(desc);
+      System.out.println("Identifying Combination Nodes:");
+      skeletonGraphWithCombinationNode.insertCombinationNodesToGraph(simpleHierarchyGraph);
+      skeletonGraphWithCombinationNode.simplifySkeletonCombinationHierarchyGraph();
+      mapDescriptorToCombineSkeletonHierarchyGraph.put(desc, skeletonGraphWithCombinationNode);
+    }
+  }
+
+  private void constructSkeletonHierarchyGraph() {
+    Set<Descriptor> keySet = mapDescriptorToHierarchyGraph.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      Descriptor desc = (Descriptor) iterator.next();
+      HierarchyGraph simpleGraph = getSimpleHierarchyGraph(desc);
+      HierarchyGraph skeletonGraph = simpleGraph.generateSkeletonGraph();
+      skeletonGraph.setMapDescToHNode(simpleGraph.getMapDescToHNode());
+      skeletonGraph.setMapHNodeToDescSet(simpleGraph.getMapHNodeToDescSet());
+      skeletonGraph.simplifyHierarchyGraph();
+      // skeletonGraph.combineRedundantNodes(false);
+      // skeletonGraph.removeRedundantEdges();
+      mapDescriptorToSkeletonHierarchyGraph.put(desc, skeletonGraph);
+    }
+  }
+
+  private void debug_writeHierarchyDotFiles() {
+
+    Set<Descriptor> keySet = mapDescriptorToHierarchyGraph.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      Descriptor desc = (Descriptor) iterator.next();
+      getHierarchyGraph(desc).writeGraph();
+    }
+
+  }
+
+  private void debug_writeSimpleHierarchyDotFiles() {
+
+    Set<Descriptor> keySet = mapDescriptorToHierarchyGraph.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      Descriptor desc = (Descriptor) iterator.next();
+      getHierarchyGraph(desc).writeGraph();
+      getSimpleHierarchyGraph(desc).writeGraph();
+    }
+
+  }
+
+  private void debug_writeSkeletonHierarchyDotFiles() {
+
+    Set<Descriptor> keySet = mapDescriptorToHierarchyGraph.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      Descriptor desc = (Descriptor) iterator.next();
+      getSkeletonHierarchyGraph(desc).writeGraph();
+    }
+
+  }
+
+  private void debug_writeSkeletonCombinationHierarchyDotFiles() {
+
+    Set<Descriptor> keySet = mapDescriptorToHierarchyGraph.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      Descriptor desc = (Descriptor) iterator.next();
+      getSkeletonCombinationHierarchyGraph(desc).writeGraph();
+    }
+
+  }
+
+  public HierarchyGraph getSimpleHierarchyGraph(Descriptor d) {
+    return mapDescriptorToSimpleHierarchyGraph.get(d);
+  }
+
+  private HierarchyGraph getSkeletonHierarchyGraph(Descriptor d) {
+    if (!mapDescriptorToSkeletonHierarchyGraph.containsKey(d)) {
+      mapDescriptorToSkeletonHierarchyGraph.put(d, new HierarchyGraph(d));
+    }
+    return mapDescriptorToSkeletonHierarchyGraph.get(d);
+  }
+
+  public HierarchyGraph getSkeletonCombinationHierarchyGraph(Descriptor d) {
+    if (!mapDescriptorToCombineSkeletonHierarchyGraph.containsKey(d)) {
+      mapDescriptorToCombineSkeletonHierarchyGraph.put(d, new HierarchyGraph(d));
+    }
+    return mapDescriptorToCombineSkeletonHierarchyGraph.get(d);
+  }
+
+  private void constructHierarchyGraph() {
+
+    // do fixed-point analysis
+
+    ssjava.init();
+    LinkedList<MethodDescriptor> descriptorListToAnalyze = ssjava.getSortedDescriptors();
+
+    // Collections.sort(descriptorListToAnalyze, new
+    // Comparator<MethodDescriptor>() {
+    // public int compare(MethodDescriptor o1, MethodDescriptor o2) {
+    // return o1.getSymbol().compareToIgnoreCase(o2.getSymbol());
+    // }
+    // });
+
+    // current descriptors to visit in fixed-point interprocedural analysis,
+    // prioritized by dependency in the call graph
+    methodDescriptorsToVisitStack.clear();
+
+    Set<MethodDescriptor> methodDescriptorToVistSet = new HashSet<MethodDescriptor>();
+    methodDescriptorToVistSet.addAll(descriptorListToAnalyze);
+
+    while (!descriptorListToAnalyze.isEmpty()) {
+      MethodDescriptor md = descriptorListToAnalyze.removeFirst();
+      methodDescriptorsToVisitStack.add(md);
+    }
+
+    // analyze scheduled methods until there are no more to visit
+    while (!methodDescriptorsToVisitStack.isEmpty()) {
+      // start to analyze leaf node
+      MethodDescriptor md = methodDescriptorsToVisitStack.pop();
+
+      HierarchyGraph hierarchyGraph = new HierarchyGraph(md);
+      // MethodSummary methodSummary = new MethodSummary(md);
+
+      // MethodLocationInfo methodInfo = new MethodLocationInfo(md);
+      // curMethodInfo = methodInfo;
+
+      System.out.println();
+      System.out.println("SSJAVA: Construcing the hierarchy graph from " + md);
+
+      constructHierarchyGraph(md, hierarchyGraph);
+
+      HierarchyGraph prevHierarchyGraph = getHierarchyGraph(md);
+      // MethodSummary prevMethodSummary = getMethodSummary(md);
+
+      if (!hierarchyGraph.equals(prevHierarchyGraph)) {
+
+        mapDescriptorToHierarchyGraph.put(md, hierarchyGraph);
+        // mapDescToLocationSummary.put(md, methodSummary);
+
+        // results for callee changed, so enqueue dependents caller for
+        // further analysis
+        Iterator<MethodDescriptor> depsItr = ssjava.getDependents(md).iterator();
+        while (depsItr.hasNext()) {
+          MethodDescriptor methodNext = depsItr.next();
+          if (!methodDescriptorsToVisitStack.contains(methodNext)
+              && methodDescriptorToVistSet.contains(methodNext)) {
+            methodDescriptorsToVisitStack.add(methodNext);
+          }
+        }
+
+      }
+
+    }
+
+  }
+
+  private HierarchyGraph getHierarchyGraph(Descriptor d) {
+    if (!mapDescriptorToHierarchyGraph.containsKey(d)) {
+      mapDescriptorToHierarchyGraph.put(d, new HierarchyGraph(d));
+    }
+    return mapDescriptorToHierarchyGraph.get(d);
+  }
+
+  private void constructHierarchyGraph(MethodDescriptor md, HierarchyGraph methodGraph) {
+
+    // visit each node of method flow graph
+    FlowGraph fg = getFlowGraph(md);
+    Set<FlowNode> nodeSet = fg.getNodeSet();
+
+    Set<Descriptor> paramDescSet = fg.getMapParamDescToIdx().keySet();
+    for (Iterator iterator = paramDescSet.iterator(); iterator.hasNext();) {
+      Descriptor desc = (Descriptor) iterator.next();
+      methodGraph.getHNode(desc).setSkeleton(true);
+    }
+
+    // for the method lattice, we need to look at the first element of
+    // NTuple<Descriptor>
+    for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
+      FlowNode srcNode = (FlowNode) iterator.next();
+
+      Set<FlowEdge> outEdgeSet = fg.getOutEdgeSet(srcNode);
+      for (Iterator iterator2 = outEdgeSet.iterator(); iterator2.hasNext();) {
+        FlowEdge outEdge = (FlowEdge) iterator2.next();
+        FlowNode dstNode = outEdge.getDst();
+
+        NTuple<Descriptor> srcNodeTuple = srcNode.getDescTuple();
+        NTuple<Descriptor> dstNodeTuple = dstNode.getDescTuple();
+
+        if (outEdge.getInitTuple().equals(srcNodeTuple)
+            && outEdge.getEndTuple().equals(dstNodeTuple)) {
+
+          NTuple<Descriptor> srcCurTuple = srcNode.getCurrentDescTuple();
+          NTuple<Descriptor> dstCurTuple = dstNode.getCurrentDescTuple();
+
+          if ((srcCurTuple.size() > 1 && dstCurTuple.size() > 1)
+              && srcCurTuple.get(0).equals(dstCurTuple.get(0))) {
+
+            // value flows between fields
+            Descriptor desc = srcCurTuple.get(0);
+            ClassDescriptor classDesc;
+
+            if (desc.equals(GLOBALDESC)) {
+              classDesc = md.getClassDesc();
+            } else {
+              VarDescriptor varDesc = (VarDescriptor) srcCurTuple.get(0);
+              classDesc = varDesc.getType().getClassDesc();
+            }
+            extractFlowsBetweenFields(classDesc, srcNode, dstNode, 1);
+
+          } else {
+            // value flow between local var - local var or local var - field
+
+            Descriptor srcDesc = srcCurTuple.get(0);
+            Descriptor dstDesc = dstCurTuple.get(0);
+
+            methodGraph.addEdge(srcDesc, dstDesc);
+
+            if (fg.isParamDesc(srcDesc)) {
+              methodGraph.setParamHNode(srcDesc);
+            }
+            if (fg.isParamDesc(dstDesc)) {
+              methodGraph.setParamHNode(dstDesc);
+            }
+
+          }
 
-    // 3) check properties
-    checkLattices();
+        }
+      }
+    }
 
-    // 4) generate annotated source codes
-    generateAnnoatedCode();
+  }
 
+  private MethodSummary getMethodSummary(MethodDescriptor md) {
+    if (!mapDescToLocationSummary.containsKey(md)) {
+      mapDescToLocationSummary.put(md, new MethodSummary(md));
+    }
+    return (MethodSummary) mapDescToLocationSummary.get(md);
   }
 
   private void addMapClassDefinitionToLineNum(ClassDescriptor cd, String strLine, int lineNum) {
@@ -325,7 +956,7 @@ public class LocationInference {
       rtr += "\n@GLOBALLOC(\"GLOBALLOC\")";
 
       CompositeLocation pcLoc = methodLocInfo.getPCLoc();
-      if (pcLoc != null) {
+      if ((pcLoc != null) && (!pcLoc.get(0).isTop())) {
         rtr += "\n@PCLOC(\"" + generateLocationAnnoatation(pcLoc) + "\")";
       }
 
@@ -574,7 +1205,28 @@ public class LocationInference {
 
   private void simplifyLattices() {
 
-    // generate lattice dot file
+    setupToAnalyze();
+
+    while (!toAnalyzeIsEmpty()) {
+      ClassDescriptor cd = toAnalyzeNext();
+      setupToAnalazeMethod(cd);
+
+      SSJavaLattice<String> classLattice = cd2lattice.get(cd);
+      if (classLattice != null) {
+        System.out.println("@@@check lattice=" + cd);
+        checkLatticeProperty(cd, classLattice);
+      }
+
+      while (!toAnalyzeMethodIsEmpty()) {
+        MethodDescriptor md = toAnalyzeMethodNext();
+        SSJavaLattice<String> methodLattice = md2lattice.get(md);
+        if (methodLattice != null) {
+          System.out.println("@@@check lattice=" + md);
+          checkLatticeProperty(md, methodLattice);
+        }
+      }
+    }
+
     setupToAnalyze();
 
     while (!toAnalyzeIsEmpty()) {
@@ -598,6 +1250,113 @@ public class LocationInference {
 
   }
 
+  private boolean checkLatticeProperty(Descriptor d, SSJavaLattice<String> lattice) {
+    // if two elements has the same incoming node set,
+    // we need to merge two elements ...
+
+    boolean isUpdated;
+    boolean isModified = false;
+    do {
+      isUpdated = removeNodeSharingSameIncomingNodes(d, lattice);
+      if (!isModified && isUpdated) {
+        isModified = true;
+      }
+    } while (isUpdated);
+
+    return isModified;
+  }
+
+  private boolean removeNodeSharingSameIncomingNodes(Descriptor d, SSJavaLattice<String> lattice) {
+    LocationInfo locInfo = getLocationInfo(d);
+    Map<String, Set<String>> map = lattice.getIncomingElementMap();
+    Set<String> keySet = map.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      String key = (String) iterator.next();
+      Set<String> incomingSetKey = map.get(key);
+
+      // System.out.println("key=" + key + "   incomingSetKey=" +
+      // incomingSetKey);
+      if (incomingSetKey.size() > 0) {
+        for (Iterator iterator2 = keySet.iterator(); iterator2.hasNext();) {
+          String cur = (String) iterator2.next();
+          if (!cur.equals(key)) {
+            Set<String> incomingSetCur = map.get(cur);
+            if (incomingSetCur.equals(incomingSetKey)) {
+              if (!(incomingSetCur.size() == 1 && incomingSetCur.contains(lattice.getTopItem()))) {
+                // NEED TO MERGE HERE!!!!
+                System.out.println("@@@Try merge=" + cur + "  " + key);
+
+                Set<String> mergeSet = new HashSet<String>();
+                mergeSet.add(cur);
+                mergeSet.add(key);
+
+                String newMergeLoc = "MLoc" + (SSJavaLattice.seed++);
+
+                System.out.println("---ASSIGN NEW MERGE LOC=" + newMergeLoc + "   to  " + mergeSet);
+                lattice.mergeIntoNewLocation(mergeSet, newMergeLoc);
+
+                for (Iterator miterator = mergeSet.iterator(); miterator.hasNext();) {
+                  String oldLocSymbol = (String) miterator.next();
+
+                  Set<Pair<Descriptor, Descriptor>> inferLocSet =
+                      locInfo.getRelatedInferLocSet(oldLocSymbol);
+                  System.out.println("---update related locations=" + inferLocSet
+                      + " oldLocSymbol=" + oldLocSymbol);
+
+                  for (Iterator miterator2 = inferLocSet.iterator(); miterator2.hasNext();) {
+                    Pair<Descriptor, Descriptor> pair =
+                        (Pair<Descriptor, Descriptor>) miterator2.next();
+                    Descriptor enclosingDesc = pair.getFirst();
+                    Descriptor desc = pair.getSecond();
+
+                    System.out.println("---inferLoc pair=" + pair);
+
+                    CompositeLocation inferLoc =
+                        getLocationInfo(enclosingDesc).getInferLocation(desc);
+                    System.out.println("oldLoc=" + inferLoc);
+                    // if (curMethodInfo.md.equals(enclosingDesc)) {
+                    // inferLoc = curMethodInfo.getInferLocation(desc);
+                    // } else {
+                    // inferLoc =
+                    // getLocationInfo(enclosingDesc).getInferLocation(desc);
+                    // }
+
+                    Location locElement = inferLoc.get(inferLoc.getSize() - 1);
+
+                    locElement.setLocIdentifier(newMergeLoc);
+                    locInfo.addMapLocSymbolToRelatedInferLoc(newMergeLoc, enclosingDesc, desc);
+
+                    // if (curMethodInfo.md.equals(enclosingDesc)) {
+                    // inferLoc = curMethodInfo.getInferLocation(desc);
+                    // } else {
+                    // inferLoc =
+                    // getLocationInfo(enclosingDesc).getInferLocation(desc);
+                    // }
+
+                    inferLoc = getLocationInfo(enclosingDesc).getInferLocation(desc);
+                    System.out.println("---New Infer Loc=" + inferLoc);
+
+                  }
+
+                  locInfo.removeRelatedInferLocSet(oldLocSymbol, newMergeLoc);
+
+                }
+
+                for (Iterator iterator3 = mergeSet.iterator(); iterator3.hasNext();) {
+                  String oldLoc = (String) iterator3.next();
+                  lattice.remove(oldLoc);
+                }
+                return true;
+              }
+            }
+          }
+        }
+      }
+
+    }
+    return false;
+  }
+
   private void checkLattices() {
 
     LinkedList<MethodDescriptor> descriptorListToAnalyze = ssjava.getSortedDescriptors();
@@ -730,12 +1489,14 @@ public class LocationInference {
 
     }
 
-    descriptorListToAnalyze = ssjava.getSortedDescriptors();
+  }
+
+  private void calculateExtraLocations() {
+    LinkedList<MethodDescriptor> descriptorListToAnalyze = ssjava.getSortedDescriptors();
     for (Iterator iterator = descriptorListToAnalyze.iterator(); iterator.hasNext();) {
       MethodDescriptor md = (MethodDescriptor) iterator.next();
       calculateExtraLocations(md);
     }
-
   }
 
   private void setMethodLocInfo(MethodDescriptor md, MethodLocationInfo methodInfo) {
@@ -862,7 +1623,7 @@ public class LocationInference {
     for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
       FlowNode srcNode = (FlowNode) iterator.next();
 
-      Set<FlowEdge> outEdgeSet = srcNode.getOutEdgeSet();
+      Set<FlowEdge> outEdgeSet = fg.getOutEdgeSet(srcNode);
       for (Iterator iterator2 = outEdgeSet.iterator(); iterator2.hasNext();) {
         FlowEdge outEdge = (FlowEdge) iterator2.next();
         FlowNode dstNode = outEdge.getDst();
@@ -1190,6 +1951,493 @@ public class LocationInference {
 
   }
 
+  // private void propagateFlowsFromCallee(MethodInvokeNode min, MethodDescriptor mdCaller,
+  // MethodDescriptor mdCallee) {
+  //
+  // // the transformation for a call site propagates all relations between
+  // // parameters from the callee
+  // // if the method is virtual, it also grab all relations from any possible
+  // // callees
+  //
+  // Set<MethodDescriptor> setPossibleCallees = new HashSet<MethodDescriptor>();
+  // if (mdCallee.isStatic()) {
+  // setPossibleCallees.add(mdCallee);
+  // } else {
+  // Set<MethodDescriptor> calleeSet = ssjava.getCallGraph().getMethods(mdCallee);
+  // // removes method descriptors that are not invoked by the caller
+  // calleeSet.retainAll(mapMethodToCalleeSet.get(mdCaller));
+  // setPossibleCallees.addAll(calleeSet);
+  // }
+  //
+  // for (Iterator iterator2 = setPossibleCallees.iterator(); iterator2.hasNext();) {
+  // MethodDescriptor possibleMdCallee = (MethodDescriptor) iterator2.next();
+  // propagateFlowsToCaller(min, mdCaller, possibleMdCallee);
+  // }
+  //
+  // }
+
+  private void contributeCalleeFlows(MethodInvokeNode min, MethodDescriptor mdCaller,
+      MethodDescriptor mdCallee) {
+
+    System.out.println("\n##contributeCalleeFlows callee=" + mdCallee + "TO caller=" + mdCaller);
+
+    getSubGlobalFlowGraph(mdCallee);
+
+  }
+
+  private FlowGraph getSubGlobalFlowGraph(MethodDescriptor md) {
+    return mapMethodDescriptorToSubGlobalFlowGraph.get(md);
+  }
+
+  private void propagateFlowsToCallerWithNoCompositeLocation(MethodInvokeNode min,
+      MethodDescriptor mdCaller, MethodDescriptor mdCallee) {
+
+    System.out.println("\n##PROPAGATE callee=" + mdCallee + "TO caller=" + mdCaller);
+
+    // if the parameter A reaches to the parameter B
+    // then, add an edge the argument A -> the argument B to the caller's flow
+    // graph
+
+    FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
+    FlowGraph callerFlowGraph = getFlowGraph(mdCaller);
+    int numParam = calleeFlowGraph.getNumParameters();
+
+    for (int i = 0; i < numParam; i++) {
+      for (int k = 0; k < numParam; k++) {
+
+        if (i != k) {
+
+          FlowNode paramNode1 = calleeFlowGraph.getParamFlowNode(i);
+          FlowNode paramNode2 = calleeFlowGraph.getParamFlowNode(k);
+
+          NodeTupleSet tupleSetArg1 = getNodeTupleSetByArgIdx(min, i);
+          NodeTupleSet tupleSetArg2 = getNodeTupleSetByArgIdx(min, k);
+
+          for (Iterator<NTuple<Descriptor>> iter1 = tupleSetArg1.iterator(); iter1.hasNext();) {
+            NTuple<Descriptor> arg1Tuple = iter1.next();
+
+            for (Iterator<NTuple<Descriptor>> iter2 = tupleSetArg2.iterator(); iter2.hasNext();) {
+              NTuple<Descriptor> arg2Tuple = iter2.next();
+
+              // check if the callee propagates an ordering constraints through
+              // parameters
+
+              Set<FlowNode> localReachSet =
+                  calleeFlowGraph.getLocalReachFlowNodeSetFrom(paramNode1);
+
+              if (localReachSet.contains(paramNode2)) {
+                // need to propagate an ordering relation s.t. arg1 is higher
+                // than arg2
+
+                System.out
+                    .println("-param1=" + paramNode1 + " is higher than param2=" + paramNode2);
+                System.out.println("-arg1Tuple=" + arg1Tuple + " is higher than arg2Tuple="
+                    + arg2Tuple);
+
+                // otherwise, flows between method/field locations...
+                callerFlowGraph.addValueFlowEdge(arg1Tuple, arg2Tuple);
+                System.out.println("arg1=" + arg1Tuple + "   arg2=" + arg2Tuple);
+
+              }
+
+            }
+
+          }
+          System.out.println();
+        }
+      }
+    }
+    System.out.println("##\n");
+
+  }
+
+  private void propagateFlowsToCaller(MethodInvokeNode min, MethodDescriptor mdCaller,
+      MethodDescriptor mdCallee) {
+
+    System.out.println("\n##PROPAGATE callee=" + mdCallee + "TO caller=" + mdCaller);
+
+    // if the parameter A reaches to the parameter B
+    // then, add an edge the argument A -> the argument B to the caller's flow
+    // graph
+
+    // TODO
+    // also if a parameter is a composite location and is started with "this" reference,
+    // need to make sure that the corresponding argument is higher than the translated location of
+    // the parameter.
+
+    FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
+    FlowGraph callerFlowGraph = getFlowGraph(mdCaller);
+    int numParam = calleeFlowGraph.getNumParameters();
+
+    for (int i = 0; i < numParam; i++) {
+      for (int k = 0; k < numParam; k++) {
+
+        if (i != k) {
+
+          FlowNode paramNode1 = calleeFlowGraph.getParamFlowNode(i);
+          FlowNode paramNode2 = calleeFlowGraph.getParamFlowNode(k);
+
+          System.out.println("param1=" + paramNode1 + " curDescTuple="
+              + paramNode1.getCurrentDescTuple());
+          System.out.println("param2=" + paramNode2 + " curDescTuple="
+              + paramNode2.getCurrentDescTuple());
+
+          NodeTupleSet tupleSetArg1 = getNodeTupleSetByArgIdx(min, i);
+          NodeTupleSet tupleSetArg2 = getNodeTupleSetByArgIdx(min, k);
+
+          for (Iterator<NTuple<Descriptor>> iter1 = tupleSetArg1.iterator(); iter1.hasNext();) {
+            NTuple<Descriptor> arg1Tuple = iter1.next();
+
+            for (Iterator<NTuple<Descriptor>> iter2 = tupleSetArg2.iterator(); iter2.hasNext();) {
+              NTuple<Descriptor> arg2Tuple = iter2.next();
+
+              // check if the callee propagates an ordering constraints through
+              // parameters
+
+              Set<FlowNode> localReachSet =
+                  calleeFlowGraph.getLocalReachFlowNodeSetFrom(paramNode1);
+
+              if (localReachSet.contains(paramNode2)) {
+                // need to propagate an ordering relation s.t. arg1 is higher
+                // than arg2
+
+                System.out
+                    .println("-param1=" + paramNode1 + " is higher than param2=" + paramNode2);
+                System.out.println("-arg1Tuple=" + arg1Tuple + " is higher than arg2Tuple="
+                    + arg2Tuple);
+
+                if (!min.getMethod().isStatic()) {
+                  // check if this is the case that values flow to/from the
+                  // current object reference 'this'
+
+                  NTuple<Descriptor> baseTuple = mapMethodInvokeNodeToBaseTuple.get(min);
+                  Descriptor baseRef = baseTuple.get(baseTuple.size() - 1);
+
+                  System.out.println("paramNode1.getCurrentDescTuple()="
+                      + paramNode1.getCurrentDescTuple());
+                  // calculate the prefix of the argument
+
+                  if (arg2Tuple.size() == 1 && arg2Tuple.get(0).equals(baseRef)) {
+                    // in this case, the callee flow causes a caller flow to the object whose method
+                    // is invoked.
+
+                    if (!paramNode1.getCurrentDescTuple().startsWith(mdCallee.getThis())) {
+                      // check whether ???
+
+                      NTuple<Descriptor> param1Prefix =
+                          calculatePrefixForParam(callerFlowGraph, calleeFlowGraph, min, arg1Tuple,
+                              paramNode1);
+
+                      if (param1Prefix != null && param1Prefix.startsWith(mdCallee.getThis())) {
+                        // in this case, we need to create a new edge 'this.FIELD'->'this'
+                        // but we couldn't... instead we assign a new composite location started
+                        // with 'this' reference to the corresponding parameter
+
+                        CompositeLocation compLocForParam1 =
+                            generateCompositeLocation(mdCallee, param1Prefix);
+
+                        System.out
+                            .println("set comp loc=" + compLocForParam1 + " to " + paramNode1);
+                        paramNode1.setCompositeLocation(compLocForParam1);
+
+                        // then, we need to make sure that the corresponding argument in the caller
+                        // is required to be higher than or equal to the translated parameter
+                        // location
+
+                        NTuple<Descriptor> translatedParamTuple =
+                            translateCompositeLocationToCaller(min, compLocForParam1);
+
+                        // TODO : check if the arg >= the tranlated parameter
+
+                        System.out.println("add a flow edge= " + arg1Tuple + "->"
+                            + translatedParamTuple);
+                        callerFlowGraph.addValueFlowEdge(arg1Tuple, translatedParamTuple);
+
+                        continue;
+
+                      }
+
+                    } else {
+                      // param1 has already been assigned a composite location
+
+                      System.out.println("--param1 has already been assigned a composite location");
+                      CompositeLocation compLocForParam1 = paramNode1.getCompositeLocation();
+                      NTuple<Descriptor> translatedParamTuple =
+                          translateCompositeLocationToCaller(min, compLocForParam1);
+
+                      // TODO : check if the arg >= the tranlated parameter
+
+                      System.out.println("add a flow edge= " + arg1Tuple + "->"
+                          + translatedParamTuple);
+                      callerFlowGraph.addValueFlowEdge(arg1Tuple, translatedParamTuple);
+
+                      continue;
+
+                    }
+
+                  } else if (arg1Tuple.size() == 1 && arg1Tuple.get(0).equals(baseRef)) {
+                    // in this case, the callee flow causes a caller flow originated from the object
+                    // whose
+                    // method is invoked.
+
+                    System.out.println("###FROM CASE");
+
+                    if (!paramNode2.getCurrentDescTuple().startsWith(mdCallee.getThis())) {
+
+                      NTuple<Descriptor> param2Prefix =
+                          calculatePrefixForParam(callerFlowGraph, calleeFlowGraph, min, arg2Tuple,
+                              paramNode2);
+
+                      if (param2Prefix != null && param2Prefix.startsWith(mdCallee.getThis())) {
+                        // in this case, we need to create a new edge 'this' ->
+                        // 'this.FIELD' but we couldn't... instead we assign the corresponding
+                        // parameter a new composite location started with 'this' reference
+
+                        CompositeLocation compLocForParam2 =
+                            generateCompositeLocation(mdCallee, param2Prefix);
+
+                        // System.out.println("set comp loc=" + compLocForParam2
+                        // +
+                        // " to " + paramNode2);
+                        paramNode1.setCompositeLocation(compLocForParam2);
+                        continue;
+                      }
+                    }
+
+                  }
+                }
+
+                // otherwise, flows between method/field locations...
+                callerFlowGraph.addValueFlowEdge(arg1Tuple, arg2Tuple);
+                System.out.println("arg1=" + arg1Tuple + "   arg2=" + arg2Tuple);
+
+              }
+
+            }
+
+          }
+          System.out.println();
+        }
+      }
+    }
+    System.out.println("##\n");
+  }
+
+  private NTuple<Descriptor> translateCompositeLocationToCaller(MethodInvokeNode min,
+      CompositeLocation compLocForParam1) {
+    NTuple<Descriptor> baseTuple = mapMethodInvokeNodeToBaseTuple.get(min);
+
+    NTuple<Descriptor> tuple = new NTuple<Descriptor>();
+
+    for (int i = 0; i < baseTuple.size(); i++) {
+      tuple.add(baseTuple.get(i));
+    }
+
+    for (int i = 1; i < compLocForParam1.getSize(); i++) {
+      Location loc = compLocForParam1.get(i);
+      tuple.add(loc.getLocDescriptor());
+    }
+
+    return tuple;
+  }
+
+  private CompositeLocation generateCompositeLocation(MethodDescriptor md,
+      NTuple<Descriptor> paramPrefix) {
+
+    System.out.println("generateCompositeLocation=" + paramPrefix);
+
+    CompositeLocation newCompLoc = convertToCompositeLocation(md, paramPrefix);
+
+    Descriptor lastDescOfPrefix = paramPrefix.get(paramPrefix.size() - 1);
+    // System.out.println("lastDescOfPrefix=" + lastDescOfPrefix + "  kind="
+    // + lastDescOfPrefix.getClass());
+    ClassDescriptor enclosingDescriptor;
+    if (lastDescOfPrefix instanceof FieldDescriptor) {
+      enclosingDescriptor = ((FieldDescriptor) lastDescOfPrefix).getType().getClassDesc();
+      // System.out.println("enclosingDescriptor0=" + enclosingDescriptor);
+    } else {
+      // var descriptor case
+      enclosingDescriptor = ((VarDescriptor) lastDescOfPrefix).getType().getClassDesc();
+    }
+    // System.out.println("enclosingDescriptor=" + enclosingDescriptor);
+
+    LocationDescriptor newLocDescriptor = generateNewLocationDescriptor();
+    newLocDescriptor.setEnclosingClassDesc(enclosingDescriptor);
+
+    Location newLoc = new Location(enclosingDescriptor, newLocDescriptor.getSymbol());
+    newLoc.setLocDescriptor(newLocDescriptor);
+    newCompLoc.addLocation(newLoc);
+
+    // System.out.println("--newCompLoc=" + newCompLoc);
+    return newCompLoc;
+  }
+
+  private NTuple<Descriptor> calculatePrefixForParam(FlowGraph callerFlowGraph,
+      FlowGraph calleeFlowGraph, MethodInvokeNode min, NTuple<Descriptor> arg1Tuple,
+      FlowNode paramNode1) {
+
+    NTuple<Descriptor> baseTuple = mapMethodInvokeNodeToBaseTuple.get(min);
+    Descriptor baseRef = baseTuple.get(baseTuple.size() - 1);
+    System.out.println("baseRef=" + baseRef);
+
+    FlowNode flowNodeArg1 = callerFlowGraph.getFlowNode(arg1Tuple);
+    List<NTuple<Descriptor>> callerPrefixList = calculatePrefixList(callerFlowGraph, flowNodeArg1);
+    System.out.println("callerPrefixList=" + callerPrefixList);
+
+    List<NTuple<Descriptor>> prefixList = calculatePrefixList(calleeFlowGraph, paramNode1);
+    System.out.println("###prefixList from node=" + paramNode1 + " =" + prefixList);
+
+    List<NTuple<Descriptor>> calleePrefixList =
+        translatePrefixListToCallee(baseRef, min.getMethod(), callerPrefixList);
+
+    System.out.println("calleePrefixList=" + calleePrefixList);
+
+    Set<FlowNode> reachNodeSetFromParam1 = calleeFlowGraph.getReachFlowNodeSetFrom(paramNode1);
+    System.out.println("reachNodeSetFromParam1=" + reachNodeSetFromParam1);
+
+    for (int i = 0; i < calleePrefixList.size(); i++) {
+      NTuple<Descriptor> curPrefix = calleePrefixList.get(i);
+      Set<NTuple<Descriptor>> reachableCommonPrefixSet = new HashSet<NTuple<Descriptor>>();
+
+      for (Iterator iterator2 = reachNodeSetFromParam1.iterator(); iterator2.hasNext();) {
+        FlowNode reachNode = (FlowNode) iterator2.next();
+        if (reachNode.getCurrentDescTuple().startsWith(curPrefix)) {
+          reachableCommonPrefixSet.add(reachNode.getCurrentDescTuple());
+        }
+      }
+
+      if (!reachableCommonPrefixSet.isEmpty()) {
+        System.out.println("###REACHABLECOMONPREFIX=" + reachableCommonPrefixSet
+            + " with curPreFix=" + curPrefix);
+        return curPrefix;
+      }
+
+    }
+
+    return null;
+  }
+
+  private List<NTuple<Descriptor>> translatePrefixListToCallee(Descriptor baseRef,
+      MethodDescriptor mdCallee, List<NTuple<Descriptor>> callerPrefixList) {
+
+    List<NTuple<Descriptor>> calleePrefixList = new ArrayList<NTuple<Descriptor>>();
+
+    for (int i = 0; i < callerPrefixList.size(); i++) {
+      NTuple<Descriptor> prefix = callerPrefixList.get(i);
+      if (prefix.startsWith(baseRef)) {
+        NTuple<Descriptor> calleePrefix = new NTuple<Descriptor>();
+        calleePrefix.add(mdCallee.getThis());
+        for (int k = 1; k < prefix.size(); k++) {
+          calleePrefix.add(prefix.get(k));
+        }
+        calleePrefixList.add(calleePrefix);
+      }
+    }
+
+    return calleePrefixList;
+
+  }
+
+  private List<NTuple<Descriptor>> calculatePrefixList(FlowGraph flowGraph, FlowNode flowNode) {
+
+    System.out.println("\n##### calculatePrefixList=" + flowNode);
+
+    Set<FlowNode> inNodeSet = flowGraph.getIncomingFlowNodeSet(flowNode);
+    inNodeSet.add(flowNode);
+
+    System.out.println("inNodeSet=" + inNodeSet);
+
+    List<NTuple<Descriptor>> prefixList = new ArrayList<NTuple<Descriptor>>();
+
+    for (Iterator iterator = inNodeSet.iterator(); iterator.hasNext();) {
+      FlowNode inNode = (FlowNode) iterator.next();
+
+      NTuple<Descriptor> inNodeTuple = inNode.getCurrentDescTuple();
+
+      // CompositeLocation inNodeInferredLoc =
+      // generateInferredCompositeLocation(methodInfo, inNodeTuple);
+      // NTuple<Location> inNodeInferredLocTuple = inNodeInferredLoc.getTuple();
+
+      for (int i = 1; i < inNodeTuple.size(); i++) {
+        NTuple<Descriptor> prefix = inNodeTuple.subList(0, i);
+        if (!prefixList.contains(prefix)) {
+          prefixList.add(prefix);
+        }
+      }
+    }
+
+    Collections.sort(prefixList, new Comparator<NTuple<Descriptor>>() {
+      public int compare(NTuple<Descriptor> arg0, NTuple<Descriptor> arg1) {
+        int s0 = arg0.size();
+        int s1 = arg1.size();
+        if (s0 > s1) {
+          return -1;
+        } else if (s0 == s1) {
+          return 0;
+        } else {
+          return 1;
+        }
+      }
+    });
+
+    return prefixList;
+
+  }
+
+  public CompositeLocation convertToCompositeLocation(MethodDescriptor md, NTuple<Descriptor> tuple) {
+
+    CompositeLocation compLoc = new CompositeLocation();
+
+    Descriptor enclosingDescriptor = md;
+
+    for (int i = 0; i < tuple.size(); i++) {
+      Descriptor curDescriptor = tuple.get(i);
+      Location locElement = new Location(enclosingDescriptor, curDescriptor.getSymbol());
+      locElement.setLocDescriptor(curDescriptor);
+      compLoc.addLocation(locElement);
+
+      if (curDescriptor instanceof VarDescriptor) {
+        enclosingDescriptor = md.getClassDesc();
+      } else if (curDescriptor instanceof NameDescriptor) {
+        // it is "GLOBAL LOC" case!
+        enclosingDescriptor = GLOBALDESC;
+      } else {
+        enclosingDescriptor = ((FieldDescriptor) curDescriptor).getClassDescriptor();
+      }
+
+    }
+
+    System.out.println("-convertToCompositeLocation from=" + tuple + " to " + compLoc);
+
+    return compLoc;
+  }
+
+  private LocationDescriptor generateNewLocationDescriptor() {
+    return new LocationDescriptor("Loc" + (locSeed++));
+  }
+
+  private int getPrefixIndex(NTuple<Descriptor> tuple1, NTuple<Descriptor> tuple2) {
+
+    // return the index where the prefix shared by tuple1 and tuple2 is ended
+    // if there is no prefix shared by both of them, return -1
+
+    int minSize = tuple1.size();
+    if (minSize > tuple2.size()) {
+      minSize = tuple2.size();
+    }
+
+    int idx = -1;
+    for (int i = 0; i < minSize; i++) {
+      if (!tuple1.get(i).equals(tuple2.get(i))) {
+        break;
+      } else {
+        idx++;
+      }
+    }
+
+    return idx;
+  }
+
   private void analyzeLatticeMethodInvocationNode(MethodDescriptor mdCaller,
       SSJavaLattice<String> methodLattice, MethodLocationInfo methodInfo)
       throws CyclicFlowException {
@@ -1393,7 +2641,7 @@ public class LocationInference {
     FlowGraph flowGraph = getFlowGraph(md);
     try {
       System.out.println("***** src composite case::");
-      calculateCompositeLocation(flowGraph, methodLattice, methodInfo, srcNode);
+      calculateCompositeLocation(flowGraph, methodLattice, methodInfo, srcNode, null);
 
       CompositeLocation srcInferLoc =
           generateInferredCompositeLocation(methodInfo, flowGraph.getLocationTuple(srcNode));
@@ -1404,7 +2652,7 @@ public class LocationInference {
       // there is a cyclic value flow... try to calculate a composite location
       // for the destination node
       System.out.println("***** dst composite case::");
-      calculateCompositeLocation(flowGraph, methodLattice, methodInfo, dstNode);
+      calculateCompositeLocation(flowGraph, methodLattice, methodInfo, dstNode, srcNode);
       CompositeLocation srcInferLoc =
           generateInferredCompositeLocation(methodInfo, flowGraph.getLocationTuple(srcNode));
       CompositeLocation dstInferLoc =
@@ -1488,8 +2736,8 @@ public class LocationInference {
   }
 
   private boolean calculateCompositeLocation(FlowGraph flowGraph,
-      SSJavaLattice<String> methodLattice, MethodLocationInfo methodInfo, FlowNode flowNode)
-      throws CyclicFlowException {
+      SSJavaLattice<String> methodLattice, MethodLocationInfo methodInfo, FlowNode flowNode,
+      FlowNode srcNode) throws CyclicFlowException {
 
     Descriptor localVarDesc = flowNode.getDescTuple().get(0);
     NTuple<Location> flowNodelocTuple = flowGraph.getLocationTuple(flowNode);
@@ -1499,7 +2747,7 @@ public class LocationInference {
     }
 
     Set<FlowNode> inNodeSet = flowGraph.getIncomingFlowNodeSet(flowNode);
-    Set<FlowNode> reachableNodeSet = flowGraph.getReachableFlowNodeSet(flowNode);
+    Set<FlowNode> reachableNodeSet = flowGraph.getReachFlowNodeSetFrom(flowNode);
 
     Map<NTuple<Location>, Set<NTuple<Location>>> mapPrefixToIncomingLocTupleSet =
         new HashMap<NTuple<Location>, Set<NTuple<Location>>>();
@@ -1538,8 +2786,8 @@ public class LocationInference {
       }
     });
 
-    System.out.println("prefixList=" + prefixList);
-    System.out.println("reachableNodeSet=" + reachableNodeSet);
+    // System.out.println("prefixList=" + prefixList);
+    // System.out.println("reachableNodeSet=" + reachableNodeSet);
 
     // find out reachable nodes that have the longest common prefix
     for (int i = 0; i < prefixList.size(); i++) {
@@ -1585,6 +2833,43 @@ public class LocationInference {
           // the same infer location is already existed. no need to do
           // anything
           System.out.println("NO ATTEMPT TO MAKE A COMPOSITE LOCATION curPrefix=" + curPrefix);
+
+          // TODO: refactoring!
+          if (srcNode != null) {
+            CompositeLocation newLoc = new CompositeLocation();
+            String newLocSymbol = "Loc" + (SSJavaLattice.seed++);
+            for (int locIdx = 0; locIdx < curPrefix.size(); locIdx++) {
+              newLoc.addLocation(curPrefix.get(locIdx));
+            }
+            Location newLocationElement = new Location(desc, newLocSymbol);
+            newLoc.addLocation(newLocationElement);
+
+            Descriptor srcLocalVar = srcNode.getDescTuple().get(0);
+            methodInfo.mapDescriptorToLocation(srcLocalVar, newLoc.clone());
+            addMapLocSymbolToInferredLocation(methodInfo.getMethodDesc(), srcLocalVar, newLoc);
+            methodInfo.removeMaplocalVarToLocSet(srcLocalVar);
+
+            // add the field/var descriptor to the set of the location symbol
+            int lastIdx = srcNode.getDescTuple().size() - 1;
+            Descriptor lastFlowNodeDesc = srcNode.getDescTuple().get(lastIdx);
+            NTuple<Location> srcNodelocTuple = flowGraph.getLocationTuple(srcNode);
+            Descriptor enclosinglastLastFlowNodeDesc = srcNodelocTuple.get(lastIdx).getDescriptor();
+
+            CompositeLocation newlyInferredLocForFlowNode =
+                generateInferredCompositeLocation(methodInfo, srcNodelocTuple);
+            Location lastInferLocElement =
+                newlyInferredLocForFlowNode.get(newlyInferredLocForFlowNode.getSize() - 1);
+            Descriptor enclosingLastInferLocElement = lastInferLocElement.getDescriptor();
+
+            // getLocationInfo(enclosingLastInferLocElement).addMapLocSymbolToDescSet(
+            // lastInferLocElement.getLocIdentifier(), lastFlowNodeDesc);
+            getLocationInfo(enclosingLastInferLocElement).addMapLocSymbolToRelatedInferLoc(
+                lastInferLocElement.getLocIdentifier(), enclosinglastLastFlowNodeDesc,
+                lastFlowNodeDesc);
+
+            System.out.println("@@@@@@@ ASSIGN " + newLoc + " to SRC=" + srcNode);
+          }
+
           return true;
         } else {
           // assign a new composite location
@@ -1752,7 +3037,8 @@ public class LocationInference {
       String newSharedLoc = "SharedLoc" + (SSJavaLattice.seed++);
 
       System.out.println("---ASSIGN NEW SHARED LOC=" + newSharedLoc + "   to  " + cycleElementSet);
-      lattice.mergeIntoSharedLocation(cycleElementSet, newSharedLoc);
+      lattice.mergeIntoNewLocation(cycleElementSet, newSharedLoc);
+      lattice.addSharedLoc(newSharedLoc);
 
       for (Iterator iterator = cycleElementSet.iterator(); iterator.hasNext();) {
         String oldLocSymbol = (String) iterator.next();
@@ -1851,6 +3137,40 @@ public class LocationInference {
     md2lattice.put(md, lattice);
   }
 
+  private void extractFlowsBetweenFields(ClassDescriptor cd, FlowNode srcNode, FlowNode dstNode,
+      int idx) {
+
+    NTuple<Descriptor> srcCurTuple = srcNode.getCurrentDescTuple();
+    NTuple<Descriptor> dstCurTuple = dstNode.getCurrentDescTuple();
+
+    if (srcCurTuple.get(idx).equals(dstCurTuple.get(idx)) && srcCurTuple.size() > (idx + 1)
+        && dstCurTuple.size() > (idx + 1)) {
+      // value flow between fields: we don't need to add a binary relation
+      // for this case
+
+      Descriptor desc = srcCurTuple.get(idx);
+      ClassDescriptor classDesc;
+
+      if (idx == 0) {
+        classDesc = ((VarDescriptor) desc).getType().getClassDesc();
+      } else {
+        classDesc = ((FieldDescriptor) desc).getType().getClassDesc();
+      }
+
+      extractFlowsBetweenFields(classDesc, srcNode, dstNode, idx + 1);
+
+    } else {
+
+      Descriptor srcFieldDesc = srcCurTuple.get(idx);
+      Descriptor dstFieldDesc = dstCurTuple.get(idx);
+
+      // add a new edge
+      getHierarchyGraph(cd).addEdge(srcFieldDesc, dstFieldDesc);
+
+    }
+
+  }
+
   private void extractRelationFromFieldFlows(ClassDescriptor cd, FlowNode srcNode,
       FlowNode dstNode, int idx) throws CyclicFlowException {
 
@@ -1908,7 +3228,7 @@ public class LocationInference {
       ClassDescriptor cd = toAnalyzeNext();
 
       setupToAnalazeMethod(cd);
-      toanalyzeMethodList.removeAll(visited);
+      temp_toanalyzeMethodList.removeAll(visited);
 
       while (!toAnalyzeMethodIsEmpty()) {
         MethodDescriptor md = toAnalyzeMethodNext();
@@ -1931,7 +3251,7 @@ public class LocationInference {
             if ((!ssjava.isTrustMethod(calleemd))
                 && (!ssjava.isSSJavaUtil(calleemd.getClassDesc()))) {
               if (!visited.contains(calleemd)) {
-                toanalyzeMethodList.add(calleemd);
+                temp_toanalyzeMethodList.add(calleemd);
               }
               reachableCallee.add(calleemd);
               needToAnalyzeCalleeSet.add(calleemd);
@@ -1953,7 +3273,14 @@ public class LocationInference {
 
   public void constructFlowGraph() {
 
-    LinkedList<MethodDescriptor> methodDescList = computeMethodList();
+    System.out.println("");
+    toanalyze_methodDescList = computeMethodList();
+
+    LinkedList<MethodDescriptor> methodDescList =
+        (LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
+
+    System.out.println("@@@methodDescList=" + methodDescList);
+    // System.exit(0);
 
     while (!methodDescList.isEmpty()) {
       MethodDescriptor md = methodDescList.removeLast();
@@ -1978,12 +3305,167 @@ public class LocationInference {
         mapMethodDescriptorToFlowGraph.put(md, fg);
 
         analyzeMethodBody(md.getClassDesc(), md);
+        propagateFlowsFromCalleesWithNoCompositeLocation(md);
+        // assignCompositeLocation(md);
+
       }
     }
     _debug_printGraph();
 
   }
 
+  private Set<MethodInvokeNode> getMethodInvokeNodeSet(MethodDescriptor md) {
+    if (!mapMethodDescriptorToMethodInvokeNodeSet.containsKey(md)) {
+      mapMethodDescriptorToMethodInvokeNodeSet.put(md, new HashSet<MethodInvokeNode>());
+    }
+    return mapMethodDescriptorToMethodInvokeNodeSet.get(md);
+  }
+
+  private void constructSubGlobalFlowGraph(MethodDescriptor md) {
+
+    FlowGraph flowGraph = getFlowGraph(md);
+
+    Set<MethodInvokeNode> setMethodInvokeNode = getMethodInvokeNodeSet(md);
+
+    for (Iterator<MethodInvokeNode> iter = setMethodInvokeNode.iterator(); iter.hasNext();) {
+      MethodInvokeNode min = iter.next();
+      propagateFlowsFromMethodInvokeNode(md, min);
+    }
+
+  }
+
+  private void propagateFlowsFromMethodInvokeNode(MethodDescriptor mdCaller, MethodInvokeNode min) {
+    // the transformation for a call site propagates flows through parameters
+    // if the method is virtual, it also grab all relations from any possible
+    // callees
+
+    MethodDescriptor mdCallee = min.getMethod();
+    Set<MethodDescriptor> setPossibleCallees = new HashSet<MethodDescriptor>();
+    if (mdCallee.isStatic()) {
+      setPossibleCallees.add(mdCallee);
+    } else {
+      Set<MethodDescriptor> calleeSet = ssjava.getCallGraph().getMethods(mdCallee);
+      // removes method descriptors that are not invoked by the caller
+      calleeSet.retainAll(mapMethodToCalleeSet.get(mdCaller));
+      setPossibleCallees.addAll(calleeSet);
+    }
+
+    for (Iterator iterator2 = setPossibleCallees.iterator(); iterator2.hasNext();) {
+      MethodDescriptor possibleMdCallee = (MethodDescriptor) iterator2.next();
+      contributeCalleeFlows(min, mdCaller, possibleMdCallee);
+    }
+
+  }
+
+  private void assignCompositeLocation(MethodDescriptor md) {
+
+    FlowGraph flowGraph = getFlowGraph(md);
+
+    Set<FlowNode> nodeSet = flowGraph.getNodeSet();
+
+    next: for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
+      FlowNode flowNode = (FlowNode) iterator.next();
+
+      // assign a composite location only to the local variable
+      if (flowNode.getCurrentDescTuple().size() == 1) {
+
+        List<NTuple<Descriptor>> prefixList = calculatePrefixList(flowGraph, flowNode);
+        Set<FlowNode> reachSet = flowGraph.getReachFlowNodeSetFrom(flowNode);
+
+        for (int i = 0; i < prefixList.size(); i++) {
+          NTuple<Descriptor> curPrefix = prefixList.get(i);
+          Set<NTuple<Descriptor>> reachableCommonPrefixSet = new HashSet<NTuple<Descriptor>>();
+
+          for (Iterator iterator2 = reachSet.iterator(); iterator2.hasNext();) {
+            FlowNode reachNode = (FlowNode) iterator2.next();
+            if (reachNode.getCurrentDescTuple().startsWith(curPrefix)) {
+              reachableCommonPrefixSet.add(reachNode.getCurrentDescTuple());
+            }
+          }
+
+          if (!reachableCommonPrefixSet.isEmpty()) {
+            System.out.println("NEED TO ASSIGN COMP LOC TO " + flowNode + " with prefix="
+                + curPrefix);
+            CompositeLocation newCompLoc = generateCompositeLocation(md, curPrefix);
+            flowNode.setCompositeLocation(newCompLoc);
+            continue next;
+          }
+
+        }
+      }
+
+    }
+
+  }
+
+  private void propagateFlowsFromCalleesWithNoCompositeLocation(MethodDescriptor mdCaller) {
+
+    // the transformation for a call site propagates flows through parameters
+    // if the method is virtual, it also grab all relations from any possible
+    // callees
+
+    Set<MethodInvokeNode> setMethodInvokeNode =
+        mapMethodDescriptorToMethodInvokeNodeSet.get(mdCaller);
+
+    if (setMethodInvokeNode != null) {
+
+      for (Iterator iterator = setMethodInvokeNode.iterator(); iterator.hasNext();) {
+        MethodInvokeNode min = (MethodInvokeNode) iterator.next();
+        MethodDescriptor mdCallee = min.getMethod();
+        Set<MethodDescriptor> setPossibleCallees = new HashSet<MethodDescriptor>();
+        if (mdCallee.isStatic()) {
+          setPossibleCallees.add(mdCallee);
+        } else {
+          Set<MethodDescriptor> calleeSet = ssjava.getCallGraph().getMethods(mdCallee);
+          // removes method descriptors that are not invoked by the caller
+          calleeSet.retainAll(mapMethodToCalleeSet.get(mdCaller));
+          setPossibleCallees.addAll(calleeSet);
+        }
+
+        for (Iterator iterator2 = setPossibleCallees.iterator(); iterator2.hasNext();) {
+          MethodDescriptor possibleMdCallee = (MethodDescriptor) iterator2.next();
+          propagateFlowsToCallerWithNoCompositeLocation(min, mdCaller, possibleMdCallee);
+        }
+
+      }
+    }
+
+  }
+
+  private void propagateFlowsFromCallees(MethodDescriptor mdCaller) {
+
+    // the transformation for a call site propagates flows through parameters
+    // if the method is virtual, it also grab all relations from any possible
+    // callees
+
+    Set<MethodInvokeNode> setMethodInvokeNode =
+        mapMethodDescriptorToMethodInvokeNodeSet.get(mdCaller);
+
+    if (setMethodInvokeNode != null) {
+
+      for (Iterator iterator = setMethodInvokeNode.iterator(); iterator.hasNext();) {
+        MethodInvokeNode min = (MethodInvokeNode) iterator.next();
+        MethodDescriptor mdCallee = min.getMethod();
+        Set<MethodDescriptor> setPossibleCallees = new HashSet<MethodDescriptor>();
+        if (mdCallee.isStatic()) {
+          setPossibleCallees.add(mdCallee);
+        } else {
+          Set<MethodDescriptor> calleeSet = ssjava.getCallGraph().getMethods(mdCallee);
+          // removes method descriptors that are not invoked by the caller
+          calleeSet.retainAll(mapMethodToCalleeSet.get(mdCaller));
+          setPossibleCallees.addAll(calleeSet);
+        }
+
+        for (Iterator iterator2 = setPossibleCallees.iterator(); iterator2.hasNext();) {
+          MethodDescriptor possibleMdCallee = (MethodDescriptor) iterator2.next();
+          propagateFlowsToCaller(min, mdCaller, possibleMdCallee);
+        }
+
+      }
+    }
+
+  }
+
   private void analyzeMethodBody(ClassDescriptor cd, MethodDescriptor md) {
     BlockNode bn = state.getMethodBody(md);
     NodeTupleSet implicitFlowTupleSet = new NodeTupleSet();
@@ -2033,16 +3515,48 @@ public class LocationInference {
       break;
 
     case Kind.SwitchStatementNode:
-      analyzeSwitchStatementNode(md, nametable, (SwitchStatementNode) bsn);
+      analyzeSwitchStatementNode(md, nametable, (SwitchStatementNode) bsn, implicitFlowTupleSet);
       break;
 
     }
 
   }
 
+  private void analyzeSwitchBlockNode(MethodDescriptor md, SymbolTable nametable,
+      SwitchBlockNode sbn, NodeTupleSet implicitFlowTupleSet) {
+
+    analyzeFlowBlockNode(md, nametable, sbn.getSwitchBlockStatement(), implicitFlowTupleSet);
+
+  }
+
   private void analyzeSwitchStatementNode(MethodDescriptor md, SymbolTable nametable,
-      SwitchStatementNode bsn) {
-    // TODO Auto-generated method stub
+      SwitchStatementNode ssn, NodeTupleSet implicitFlowTupleSet) {
+
+    NodeTupleSet condTupleNode = new NodeTupleSet();
+    analyzeFlowExpressionNode(md, nametable, ssn.getCondition(), condTupleNode, null,
+        implicitFlowTupleSet, false);
+
+    NodeTupleSet newImplicitTupleSet = new NodeTupleSet();
+
+    newImplicitTupleSet.addTupleSet(implicitFlowTupleSet);
+    newImplicitTupleSet.addTupleSet(condTupleNode);
+
+    if (newImplicitTupleSet.size() > 1) {
+      // need to create an intermediate node for the GLB of conditional locations & implicit flows
+      NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+      for (Iterator<NTuple<Descriptor>> idxIter = newImplicitTupleSet.iterator(); idxIter.hasNext();) {
+        NTuple<Descriptor> tuple = idxIter.next();
+        addFlowGraphEdge(md, tuple, interTuple);
+      }
+      newImplicitTupleSet.clear();
+      newImplicitTupleSet.addTuple(interTuple);
+    }
+
+    BlockNode sbn = ssn.getSwitchBody();
+    for (int i = 0; i < sbn.size(); i++) {
+      analyzeSwitchBlockNode(md, nametable, (SwitchBlockNode) sbn.get(i), newImplicitTupleSet);
+    }
+
   }
 
   private void analyzeFlowSubBlockNode(MethodDescriptor md, SymbolTable nametable,
@@ -2057,19 +3571,46 @@ public class LocationInference {
 
     if (returnExp != null) {
       NodeTupleSet nodeSet = new NodeTupleSet();
+      // if a return expression returns a literal value, nodeSet is empty
       analyzeFlowExpressionNode(md, nametable, returnExp, nodeSet, false);
-
       FlowGraph fg = getFlowGraph(md);
 
-      // annotate the elements of the node set as the return location
-      for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
-        NTuple<Descriptor> returnDescTuple = (NTuple<Descriptor>) iterator.next();
-        fg.addReturnFlowNode(returnDescTuple);
-        for (Iterator iterator2 = implicitFlowTupleSet.iterator(); iterator2.hasNext();) {
-          NTuple<Descriptor> implicitFlowDescTuple = (NTuple<Descriptor>) iterator2.next();
-          fg.addValueFlowEdge(implicitFlowDescTuple, returnDescTuple);
+      // if (implicitFlowTupleSet.size() == 1
+      // && fg.getFlowNode(implicitFlowTupleSet.iterator().next()).isIntermediate()) {
+      //
+      // // since there is already an intermediate node for the GLB of implicit flows
+      // // we don't need to create another intermediate node.
+      // // just re-use the intermediate node for implicit flows.
+      //
+      // FlowNode meetNode = fg.getFlowNode(implicitFlowTupleSet.iterator().next());
+      //
+      // for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
+      // NTuple<Descriptor> returnNodeTuple = (NTuple<Descriptor>) iterator.next();
+      // fg.addValueFlowEdge(returnNodeTuple, meetNode.getDescTuple());
+      // }
+      //
+      // }
+
+      NodeTupleSet currentFlowTupleSet = new NodeTupleSet();
+
+      // add tuples from return node
+      currentFlowTupleSet.addTupleSet(nodeSet);
+
+      // add tuples corresponding to the current implicit flows
+      currentFlowTupleSet.addTupleSet(implicitFlowTupleSet);
+
+      if (currentFlowTupleSet.size() > 1) {
+        FlowNode meetNode = fg.createIntermediateNode();
+        for (Iterator iterator = currentFlowTupleSet.iterator(); iterator.hasNext();) {
+          NTuple<Descriptor> currentFlowTuple = (NTuple<Descriptor>) iterator.next();
+          fg.addValueFlowEdge(currentFlowTuple, meetNode.getDescTuple());
         }
+        fg.addReturnFlowNode(meetNode.getDescTuple());
+      } else if (currentFlowTupleSet.size() == 1) {
+        NTuple<Descriptor> tuple = currentFlowTupleSet.iterator().next();
+        fg.addReturnFlowNode(tuple);
       }
+
     }
 
   }
@@ -2082,10 +3623,49 @@ public class LocationInference {
       NodeTupleSet condTupleNode = new NodeTupleSet();
       analyzeFlowExpressionNode(md, nametable, ln.getCondition(), condTupleNode, null,
           implicitFlowTupleSet, false);
-      condTupleNode.addTupleSet(implicitFlowTupleSet);
+
+      NodeTupleSet newImplicitTupleSet = new NodeTupleSet();
+
+      newImplicitTupleSet.addTupleSet(implicitFlowTupleSet);
+      newImplicitTupleSet.addTupleSet(condTupleNode);
+
+      if (newImplicitTupleSet.size() > 1) {
+        // need to create an intermediate node for the GLB of conditional locations & implicit flows
+        NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+        for (Iterator<NTuple<Descriptor>> idxIter = newImplicitTupleSet.iterator(); idxIter
+            .hasNext();) {
+          NTuple<Descriptor> tuple = idxIter.next();
+          addFlowGraphEdge(md, tuple, interTuple);
+        }
+        newImplicitTupleSet.clear();
+        newImplicitTupleSet.addTuple(interTuple);
+
+      }
+
+      // ///////////
+      // System.out.println("condTupleNode="+condTupleNode);
+      // NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+      //
+      // for (Iterator<NTuple<Descriptor>> idxIter = condTupleNode.iterator(); idxIter.hasNext();) {
+      // NTuple<Descriptor> tuple = idxIter.next();
+      // addFlowGraphEdge(md, tuple, interTuple);
+      // }
+
+      // for (Iterator<NTuple<Descriptor>> idxIter = implicitFlowTupleSet.iterator(); idxIter
+      // .hasNext();) {
+      // NTuple<Descriptor> tuple = idxIter.next();
+      // addFlowGraphEdge(md, tuple, interTuple);
+      // }
+
+      // NodeTupleSet newImplicitSet = new NodeTupleSet();
+      // newImplicitSet.addTuple(interTuple);
+      analyzeFlowBlockNode(md, nametable, ln.getBody(), newImplicitTupleSet);
+      // ///////////
+
+      // condTupleNode.addTupleSet(implicitFlowTupleSet);
 
       // add edges from condNodeTupleSet to all nodes of conditional nodes
-      analyzeFlowBlockNode(md, nametable, ln.getBody(), condTupleNode);
+      // analyzeFlowBlockNode(md, nametable, ln.getBody(), condTupleNode);
 
     } else {
       // check 'for loop' case
@@ -2099,10 +3679,33 @@ public class LocationInference {
       NodeTupleSet condTupleNode = new NodeTupleSet();
       analyzeFlowExpressionNode(md, bn.getVarTable(), ln.getCondition(), condTupleNode, null,
           implicitFlowTupleSet, false);
-      condTupleNode.addTupleSet(implicitFlowTupleSet);
 
-      analyzeFlowBlockNode(md, bn.getVarTable(), ln.getUpdate(), condTupleNode);
-      analyzeFlowBlockNode(md, bn.getVarTable(), ln.getBody(), condTupleNode);
+      // ///////////
+      NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+
+      for (Iterator<NTuple<Descriptor>> idxIter = condTupleNode.iterator(); idxIter.hasNext();) {
+        NTuple<Descriptor> tuple = idxIter.next();
+        addFlowGraphEdge(md, tuple, interTuple);
+      }
+
+      for (Iterator<NTuple<Descriptor>> idxIter = implicitFlowTupleSet.iterator(); idxIter
+          .hasNext();) {
+        NTuple<Descriptor> tuple = idxIter.next();
+        addFlowGraphEdge(md, tuple, interTuple);
+      }
+
+      NodeTupleSet newImplicitSet = new NodeTupleSet();
+      newImplicitSet.addTuple(interTuple);
+      analyzeFlowBlockNode(md, bn.getVarTable(), ln.getUpdate(), newImplicitSet);
+      analyzeFlowBlockNode(md, bn.getVarTable(), ln.getBody(), newImplicitSet);
+      // ///////////
+
+      // condTupleNode.addTupleSet(implicitFlowTupleSet);
+      //
+      // analyzeFlowBlockNode(md, bn.getVarTable(), ln.getUpdate(),
+      // condTupleNode);
+      // analyzeFlowBlockNode(md, bn.getVarTable(), ln.getBody(),
+      // condTupleNode);
 
     }
 
@@ -2111,16 +3714,37 @@ public class LocationInference {
   private void analyzeFlowIfStatementNode(MethodDescriptor md, SymbolTable nametable,
       IfStatementNode isn, NodeTupleSet implicitFlowTupleSet) {
 
+    System.out.println("analyzeFlowIfStatementNode=" + isn.printNode(0));
+
     NodeTupleSet condTupleNode = new NodeTupleSet();
     analyzeFlowExpressionNode(md, nametable, isn.getCondition(), condTupleNode, null,
         implicitFlowTupleSet, false);
 
-    // add edges from condNodeTupleSet to all nodes of conditional nodes
-    condTupleNode.addTupleSet(implicitFlowTupleSet);
-    analyzeFlowBlockNode(md, nametable, isn.getTrueBlock(), condTupleNode);
+    NodeTupleSet newImplicitTupleSet = new NodeTupleSet();
+
+    newImplicitTupleSet.addTupleSet(implicitFlowTupleSet);
+    newImplicitTupleSet.addTupleSet(condTupleNode);
+
+    System.out.println("condTupleNode=" + condTupleNode);
+    System.out.println("implicitFlowTupleSet=" + implicitFlowTupleSet);
+    System.out.println("newImplicitTupleSet=" + newImplicitTupleSet);
+
+    if (newImplicitTupleSet.size() > 1) {
+
+      // need to create an intermediate node for the GLB of conditional locations & implicit flows
+      NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+      for (Iterator<NTuple<Descriptor>> idxIter = newImplicitTupleSet.iterator(); idxIter.hasNext();) {
+        NTuple<Descriptor> tuple = idxIter.next();
+        addFlowGraphEdge(md, tuple, interTuple);
+      }
+      newImplicitTupleSet.clear();
+      newImplicitTupleSet.addTuple(interTuple);
+    }
+
+    analyzeFlowBlockNode(md, nametable, isn.getTrueBlock(), newImplicitTupleSet);
 
     if (isn.getFalseBlock() != null) {
-      analyzeFlowBlockNode(md, nametable, isn.getFalseBlock(), condTupleNode);
+      analyzeFlowBlockNode(md, nametable, isn.getFalseBlock(), newImplicitTupleSet);
     }
 
   }
@@ -2137,14 +3761,25 @@ public class LocationInference {
 
     if (dn.getExpression() != null) {
 
-      NodeTupleSet tupleSetRHS = new NodeTupleSet();
-      analyzeFlowExpressionNode(md, nametable, dn.getExpression(), tupleSetRHS, null,
+      NodeTupleSet nodeSetRHS = new NodeTupleSet();
+      analyzeFlowExpressionNode(md, nametable, dn.getExpression(), nodeSetRHS, null,
           implicitFlowTupleSet, false);
 
-      // add a new flow edge from rhs to lhs
-      for (Iterator<NTuple<Descriptor>> iter = tupleSetRHS.iterator(); iter.hasNext();) {
-        NTuple<Descriptor> from = iter.next();
-        addFlowGraphEdge(md, from, tupleLHS);
+      // creates edges from RHS to LHS
+      NTuple<Descriptor> interTuple = null;
+      if (nodeSetRHS.size() > 1) {
+        interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+      }
+
+      for (Iterator<NTuple<Descriptor>> iter = nodeSetRHS.iterator(); iter.hasNext();) {
+        NTuple<Descriptor> fromTuple = iter.next();
+        addFlowGraphEdge(md, fromTuple, interTuple, tupleLHS);
+      }
+
+      // creates edges from implicitFlowTupleSet to LHS
+      for (Iterator<NTuple<Descriptor>> iter = implicitFlowTupleSet.iterator(); iter.hasNext();) {
+        NTuple<Descriptor> implicitTuple = iter.next();
+        addFlowGraphEdge(md, implicitTuple, tupleLHS);
       }
 
     }
@@ -2303,8 +3938,6 @@ public class LocationInference {
       nodeSet = new NodeTupleSet();
     }
 
-    addMapCallerMethodDescToMethodInvokeNodeSet(md, min);
-
     MethodDescriptor calleeMethodDesc = min.getMethod();
 
     NameDescriptor baseName = min.getBaseName();
@@ -2316,15 +3949,22 @@ public class LocationInference {
     if (!ssjava.isSSJavaUtil(calleeMethodDesc.getClassDesc())
         && !ssjava.isTrustMethod(calleeMethodDesc) && !isSystemout) {
 
+      addMapCallerMethodDescToMethodInvokeNodeSet(md, min);
+
       FlowGraph calleeFlowGraph = getFlowGraph(calleeMethodDesc);
       Set<FlowNode> calleeReturnSet = calleeFlowGraph.getReturnNodeSet();
 
+      System.out.println("#calleeReturnSet=" + calleeReturnSet);
+
       if (min.getExpression() != null) {
 
         NodeTupleSet baseNodeSet = new NodeTupleSet();
         analyzeFlowExpressionNode(md, nametable, min.getExpression(), baseNodeSet, null,
             implicitFlowTupleSet, false);
 
+        assert (baseNodeSet.size() == 1);
+        mapMethodInvokeNodeToBaseTuple.put(min, baseNodeSet.iterator().next());
+
         if (!min.getMethod().isStatic()) {
           addArgIdxMap(min, 0, baseNodeSet);
 
@@ -2352,6 +3992,7 @@ public class LocationInference {
             }
           }
         }
+
       }
 
       // analyze parameter flows
@@ -2369,7 +4010,7 @@ public class LocationInference {
           ExpressionNode en = min.getArg(i);
           int idx = i + offset;
           NodeTupleSet argTupleSet = new NodeTupleSet();
-          analyzeFlowExpressionNode(md, nametable, en, argTupleSet, true);
+          analyzeFlowExpressionNode(md, nametable, en, argTupleSet, false);
           // if argument is liternal node, argTuple is set to NULL.
           addArgIdxMap(min, idx, argTupleSet);
           FlowNode paramNode = calleeFlowGraph.getParamFlowNode(idx);
@@ -2382,13 +4023,15 @@ public class LocationInference {
 
       }
 
+      // propagateFlowsFromCallee(min, md, min.getMethod());
+
     }
 
   }
 
   private boolean hasInFlowTo(FlowGraph fg, FlowNode inNode, Set<FlowNode> nodeSet) {
     // return true if inNode has in-flows to nodeSet
-    Set<FlowNode> reachableSet = fg.getReachableFlowNodeSet(inNode);
+    Set<FlowNode> reachableSet = fg.getReachFlowNodeSetFrom(inNode);
     for (Iterator iterator = reachableSet.iterator(); iterator.hasNext();) {
       FlowNode fn = (FlowNode) iterator.next();
       if (nodeSet.contains(fn)) {
@@ -2542,6 +4185,8 @@ public class LocationInference {
   private NTuple<Descriptor> analyzeFlowNameNode(MethodDescriptor md, SymbolTable nametable,
       NameNode nn, NodeTupleSet nodeSet, NTuple<Descriptor> base, NodeTupleSet implicitFlowTupleSet) {
 
+    // System.out.println("analyzeFlowNameNode=" + nn.printNode(0));
+
     if (base == null) {
       base = new NTuple<Descriptor>();
     }
@@ -2592,7 +4237,7 @@ public class LocationInference {
       } else if (d == null) {
         // access static field
         base.add(GLOBALDESC);
-        // base.add(nn.getField());
+        base.add(nn.getField());
         return base;
 
         // FieldDescriptor fd = nn.getField();addFlowGraphEdge
@@ -2641,12 +4286,14 @@ public class LocationInference {
     }
 
     NodeTupleSet idxNodeTupleSet = new NodeTupleSet();
+
     if (left instanceof ArrayAccessNode) {
 
       ArrayAccessNode aan = (ArrayAccessNode) left;
       left = aan.getExpression();
       analyzeFlowExpressionNode(md, nametable, aan.getIndex(), idxNodeTupleSet, base,
           implicitFlowTupleSet, isLHS);
+
       nodeSet.addTupleSet(idxNodeTupleSet);
     }
     base =
@@ -2676,7 +4323,6 @@ public class LocationInference {
           getFlowGraph(md).addValueFlowEdge(idxTuple, flowFieldTuple);
         }
       }
-
       return flowFieldTuple;
 
     }
@@ -2720,6 +4366,7 @@ public class LocationInference {
 
       if (an.getOperation().getOp() >= 2 && an.getOperation().getOp() <= 12) {
         // if assignment contains OP+EQ operator, creates edges from LHS to LHS
+
         for (Iterator<NTuple<Descriptor>> iter = nodeSetLHS.iterator(); iter.hasNext();) {
           NTuple<Descriptor> fromTuple = iter.next();
           for (Iterator<NTuple<Descriptor>> iter2 = nodeSetLHS.iterator(); iter2.hasNext();) {
@@ -2730,11 +4377,16 @@ public class LocationInference {
       }
 
       // creates edges from RHS to LHS
+      NTuple<Descriptor> interTuple = null;
+      if (nodeSetRHS.size() > 1) {
+        interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+      }
+
       for (Iterator<NTuple<Descriptor>> iter = nodeSetRHS.iterator(); iter.hasNext();) {
         NTuple<Descriptor> fromTuple = iter.next();
         for (Iterator<NTuple<Descriptor>> iter2 = nodeSetLHS.iterator(); iter2.hasNext();) {
           NTuple<Descriptor> toTuple = iter2.next();
-          addFlowGraphEdge(md, fromTuple, toTuple);
+          addFlowGraphEdge(md, fromTuple, interTuple, toTuple);
         }
       }
 
@@ -2749,6 +4401,7 @@ public class LocationInference {
 
     } else {
       // postinc case
+
       for (Iterator<NTuple<Descriptor>> iter2 = nodeSetLHS.iterator(); iter2.hasNext();) {
         NTuple<Descriptor> tuple = iter2.next();
         addFlowGraphEdge(md, tuple, tuple);
@@ -2776,13 +4429,119 @@ public class LocationInference {
 
   private boolean addFlowGraphEdge(MethodDescriptor md, NTuple<Descriptor> from,
       NTuple<Descriptor> to) {
-    // TODO
-    // return true if it adds a new edge
     FlowGraph graph = getFlowGraph(md);
     graph.addValueFlowEdge(from, to);
     return true;
   }
 
+  private void addFlowGraphEdge(MethodDescriptor md, NTuple<Descriptor> from,
+      NTuple<Descriptor> inter, NTuple<Descriptor> to) {
+
+    FlowGraph graph = getFlowGraph(md);
+
+    if (inter != null) {
+      graph.addValueFlowEdge(from, inter);
+      graph.addValueFlowEdge(inter, to);
+    } else {
+      graph.addValueFlowEdge(from, to);
+    }
+
+  }
+
+  public void writeInferredLatticeDotFile(ClassDescriptor cd, HierarchyGraph simpleHierarchyGraph,
+      SSJavaLattice<String> locOrder, String nameSuffix) {
+    writeInferredLatticeDotFile(cd, null, simpleHierarchyGraph, locOrder, nameSuffix);
+  }
+
+  public void writeInferredLatticeDotFile(ClassDescriptor cd, MethodDescriptor md,
+      HierarchyGraph simpleHierarchyGraph, SSJavaLattice<String> locOrder, String nameSuffix) {
+
+    String fileName = "lattice_";
+    if (md != null) {
+      fileName +=
+          cd.getSymbol().replaceAll("[\\W_]", "") + "_" + md.toString().replaceAll("[\\W_]", "");
+    } else {
+      fileName += cd.getSymbol().replaceAll("[\\W_]", "");
+    }
+
+    fileName += nameSuffix;
+
+    Set<Pair<String, String>> pairSet = locOrder.getOrderingPairSet();
+
+    Set<String> addedLocSet = new HashSet<String>();
+
+    if (pairSet.size() > 0) {
+      try {
+        BufferedWriter bw = new BufferedWriter(new FileWriter(fileName + ".dot"));
+
+        bw.write("digraph " + fileName + " {\n");
+
+        for (Iterator iterator = pairSet.iterator(); iterator.hasNext();) {
+          // pair is in the form of <higher, lower>
+          Pair<String, String> pair = (Pair<String, String>) iterator.next();
+
+          String highLocId = pair.getFirst();
+          String lowLocId = pair.getSecond();
+
+          if (!addedLocSet.contains(highLocId)) {
+            addedLocSet.add(highLocId);
+            drawNode(bw, locOrder, simpleHierarchyGraph, highLocId);
+          }
+
+          if (!addedLocSet.contains(lowLocId)) {
+            addedLocSet.add(lowLocId);
+            drawNode(bw, locOrder, simpleHierarchyGraph, lowLocId);
+          }
+
+          bw.write(highLocId + " -> " + lowLocId + ";\n");
+        }
+        bw.write("}\n");
+        bw.close();
+
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
+
+    }
+
+  }
+
+  private String convertMergeSetToString(HierarchyGraph graph, Set<HNode> mergeSet) {
+    String str = "";
+    for (Iterator iterator = mergeSet.iterator(); iterator.hasNext();) {
+      HNode merged = (HNode) iterator.next();
+      if (merged.isMergeNode()) {
+        str += convertMergeSetToString(graph, graph.getMapHNodetoMergeSet().get(merged));
+      } else {
+        str += " " + merged.getName();
+      }
+    }
+    return str;
+  }
+
+  private void drawNode(BufferedWriter bw, SSJavaLattice<String> lattice, HierarchyGraph graph,
+      String locName) throws IOException {
+
+    HNode node = graph.getHNode(locName);
+
+    if (node == null) {
+      return;
+    }
+
+    String prettyStr;
+    if (lattice.isSharedLoc(locName)) {
+      prettyStr = locName + "*";
+    } else {
+      prettyStr = locName;
+    }
+
+    if (node.isMergeNode()) {
+      Set<HNode> mergeSet = graph.getMapHNodetoMergeSet().get(node);
+      prettyStr += ":" + convertMergeSetToString(graph, mergeSet);
+    }
+    bw.write(locName + " [label=\"" + prettyStr + "\"]" + ";\n");
+  }
+
   public void _debug_printGraph() {
     Set<MethodDescriptor> keySet = mapMethodDescriptorToFlowGraph.keySet();
 
@@ -2803,3 +4562,11 @@ public class LocationInference {
 class CyclicFlowException extends Exception {
 
 }
+
+class InterDescriptor extends Descriptor {
+
+  public InterDescriptor(String name) {
+    super(name);
+  }
+
+}