implementing inheritance check + missing features.

diff --git a/Robust/src/Analysis/SSJava/BuildLattice.java b/Robust/src/Analysis/SSJava/BuildLattice.java
index fd2d0e8f6114fb1c787ba18a2ad1f11aa54582b2..b4f2e37d23fdef7eb30a4b6c727166713fb09695 100644 (file)
--- a/Robust/src/Analysis/SSJava/BuildLattice.java
+++ b/Robust/src/Analysis/SSJava/BuildLattice.java
@@ -293,7 +293,7 @@ public class BuildLattice {
       HNode sharedNode = (HNode) iterator.next();
       TripleItem item = mapSharedNodeToTripleItem.get(sharedNode);
       String nonSharedLocName = mapIntermediateLoc.get(item);
       HNode sharedNode = (HNode) iterator.next();
       TripleItem item = mapSharedNodeToTripleItem.get(sharedNode);
       String nonSharedLocName = mapIntermediateLoc.get(item);

-      
+

       System.out.println("sharedNode=" + sharedNode + "    locName=" + nonSharedLocName);
 
       String newLocName;
       System.out.println("sharedNode=" + sharedNode + "    locName=" + nonSharedLocName);
 
       String newLocName;


@@ -572,6 +572,7 @@ public class BuildLattice {
 
     if (curNode.isSharedNode()) {
       // if the current node is shared location, add a shared location to the lattice later
 
     if (curNode.isSharedNode()) {
       // if the current node is shared location, add a shared location to the lattice later

+      System.out.println("###SHARED ITEM=" + item);

       mapSharedNodeToTripleItem.put(curNode, item);
     } else {
       Set<Descriptor> descSet = simpleHierarchyGraph.getDescSetOfNode(curNode);
       mapSharedNodeToTripleItem.put(curNode, item);
     } else {
       Set<Descriptor> descSet = simpleHierarchyGraph.getDescSetOfNode(curNode);


@@ -664,6 +665,7 @@ public class BuildLattice {
     String locName = mapIntermediateLoc.get(item);
     if (curNode.isSharedNode()) {
       // if the current node is shared location, add a shared location to the lattice later
     String locName = mapIntermediateLoc.get(item);
     if (curNode.isSharedNode()) {
       // if the current node is shared location, add a shared location to the lattice later

+      System.out.println("###SHARED ITEM=" + item);

       mapSharedNodeToTripleItem.put(curNode, item);
     } else {
       Set<Descriptor> descSet = simpleHierarchyGraph.getDescSetOfNode(curNode);
       mapSharedNodeToTripleItem.put(curNode, item);
     } else {
       Set<Descriptor> descSet = simpleHierarchyGraph.getDescSetOfNode(curNode);

diff --git a/Robust/src/Analysis/SSJava/HierarchyGraph.java b/Robust/src/Analysis/SSJava/HierarchyGraph.java
index f9bb5e904d40f5e8625e1b8b845e87025e7b55e7..2da466cb1768baa4d9ce9acddd203d695d55119f 100644 (file)
--- a/Robust/src/Analysis/SSJava/HierarchyGraph.java
+++ b/Robust/src/Analysis/SSJava/HierarchyGraph.java
@@ -1222,6 +1222,8 @@ public class HierarchyGraph {
       graphName += "_PAPER";
     }
 
       graphName += "_PAPER";
     }
 

+    // System.out.println("***graphName=" + graphName + "   node siz=" + nodeSet.size());
+

     try {
       BufferedWriter bw = new BufferedWriter(new FileWriter(graphName + ".dot"));
 
     try {
       BufferedWriter bw = new BufferedWriter(new FileWriter(graphName + ".dot"));
 

diff --git a/Robust/src/Analysis/SSJava/InheritanceTree.java b/Robust/src/Analysis/SSJava/InheritanceTree.java
new file mode 100644 (file)
index 0000000..7d6b902
--- /dev/null
+++ b/Robust/src/Analysis/SSJava/InheritanceTree.java
@@ -0,0 +1,63 @@
+package Analysis.SSJava;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class InheritanceTree<T> {
+
+  private Node<T> root;
+  private Map<T, Node<T>> nodeMap;
+
+  public InheritanceTree(T rootData) {
+    root = new Node<T>(rootData);
+    root.children = new ArrayList<Node<T>>();
+    nodeMap = new HashMap<T, Node<T>>();
+    nodeMap.put(rootData, root);
+  }
+
+  public void addParentChild(T parent, T child) {
+    Node<T> parentNode = getTreeNode(parent);
+    Node<T> childNode = getTreeNode(child);
+    parentNode.children.add(childNode);
+    System.out.println("childNode=" + childNode);
+    childNode.parent = parentNode;
+  }
+
+  public Node<T> getTreeNode(T in) {
+    if (!nodeMap.containsKey(in)) {
+      Node<T> node = new Node(in);
+      nodeMap.put(in, node);
+    }
+    return nodeMap.get(in);
+  }
+
+  public Node<T> getRootNode() {
+    return root;
+  }
+
+}
+
+class Node<T> {
+  public T data;
+  public Node<T> parent;
+  public List<Node<T>> children;
+
+  public Node(T in) {
+    this.data = in;
+    children = new ArrayList<Node<T>>();
+  }
+
+  public Node<T> getParent() {
+    return parent;
+  }
+
+  public T getData() {
+    return data;
+  }
+
+  public List<Node<T>> getChildren() {
+    return children;
+  }
+}
\ No newline at end of file

diff --git a/Robust/src/Analysis/SSJava/LocationInference.java b/Robust/src/Analysis/SSJava/LocationInference.java
index fe7d2b92e68a75bd01bc9bd5747cb4dc612898dd..b2e9754d5d48a1167e54c5f8fdddac68d3b4bf12 100644 (file)
--- a/Robust/src/Analysis/SSJava/LocationInference.java
+++ b/Robust/src/Analysis/SSJava/LocationInference.java
@@ -55,6 +55,8 @@ import Util.Pair;
 
 public class LocationInference {
 
 
 public class LocationInference {
 

+  static int COUNT = 0;
+

   State state;
   SSJavaAnalysis ssjava;
 
   State state;
   SSJavaAnalysis ssjava;
 


@@ -64,6 +66,8 @@ public class LocationInference {
 
   LinkedList<MethodDescriptor> toanalyze_methodDescList;
 
 
   LinkedList<MethodDescriptor> toanalyze_methodDescList;
 

+  InheritanceTree<ClassDescriptor> inheritanceTree;
+

   // map a method descriptor to its set of parameter descriptors
   Map<MethodDescriptor, Set<Descriptor>> mapMethodDescriptorToParamDescSet;
 
   // map a method descriptor to its set of parameter descriptors
   Map<MethodDescriptor, Set<Descriptor>> mapMethodDescriptorToParamDescSet;
 


@@ -124,6 +128,16 @@ public class LocationInference {
 
   private Map<MethodDescriptor, Boolean> mapMethodDescriptorToCompositeReturnCase;
 
 
   private Map<MethodDescriptor, Boolean> mapMethodDescriptorToCompositeReturnCase;
 

+  private Map<MethodDescriptor, MethodDescriptor> mapMethodDescToHighestOverriddenMethodDesc;
+
+  private Map<MethodDescriptor, Set<MethodDescriptor>> mapHighestOverriddenMethodDescToMethodDescSet;
+
+  private Map<MethodDescriptor, Set<NTuple<Descriptor>>> mapHighestOverriddenMethodDescToSetHigherThanRLoc;
+
+  private Map<MethodDescriptor, NTuple<Descriptor>> mapHighestOverriddenMethodDescToReturnLocTuple;
+
+  private Map<MethodDescriptor, Set<NTuple<Descriptor>>> mapHighestOverriddenMethodDescToSetLowerThanPCLoc;
+

   public static final String GLOBALLOC = "GLOBALLOC";
 
   public static final String INTERLOC = "INTERLOC";
   public static final String GLOBALLOC = "GLOBALLOC";
 
   public static final String INTERLOC = "INTERLOC";


@@ -206,6 +220,20 @@ public class LocationInference {
 
     this.mapMethodDescriptorToCompositeReturnCase = new HashMap<MethodDescriptor, Boolean>();
 
 
     this.mapMethodDescriptorToCompositeReturnCase = new HashMap<MethodDescriptor, Boolean>();
 

+    mapMethodDescToHighestOverriddenMethodDesc = new HashMap<MethodDescriptor, MethodDescriptor>();
+
+    mapHighestOverriddenMethodDescToSetHigherThanRLoc =
+        new HashMap<MethodDescriptor, Set<NTuple<Descriptor>>>();
+
+    mapHighestOverriddenMethodDescToSetLowerThanPCLoc =
+        new HashMap<MethodDescriptor, Set<NTuple<Descriptor>>>();
+
+    mapHighestOverriddenMethodDescToMethodDescSet =
+        new HashMap<MethodDescriptor, Set<MethodDescriptor>>();
+
+    mapHighestOverriddenMethodDescToReturnLocTuple =
+        new HashMap<MethodDescriptor, NTuple<Descriptor>>();
+

   }
 
   public void setupToAnalyze() {
   }
 
   public void setupToAnalyze() {


@@ -254,6 +282,8 @@ public class LocationInference {
     // construct value flow graph
     constructFlowGraph();
 
     // construct value flow graph
     constructFlowGraph();
 

+    buildInheritanceTree();
+

     constructGlobalFlowGraph();
 
     checkReturnNodes();
     constructGlobalFlowGraph();
 
     checkReturnNodes();


@@ -269,9 +299,12 @@ public class LocationInference {
 
     constructHierarchyGraph();
 
 
     constructHierarchyGraph();
 

+    calculateReturnPCLocInheritance();
+    addInheritanceConstraints();
+

     debug_writeHierarchyDotFiles();
 
     debug_writeHierarchyDotFiles();
 

-    // System.exit(0);
+    System.exit(0);

 
     simplifyHierarchyGraph();
 
 
     simplifyHierarchyGraph();
 


@@ -295,10 +328,316 @@ public class LocationInference {
 
     generateAnnoatedCode();
 
 
     generateAnnoatedCode();
 

+    for (Iterator iterator = cd2lattice.keySet().iterator(); iterator.hasNext();) {
+      ClassDescriptor cd = (ClassDescriptor) iterator.next();
+      SSJavaLattice<String> lattice = getLattice(cd);
+      HierarchyGraph hg = mapDescriptorToHierarchyGraph.get(cd);
+      // System.out.println("~~~\t" + cd + "\t" + lattice.getKeySet().size() + "\t"
+      // + hg.getNodeSet().size());
+    }
+
+    for (Iterator iterator = md2lattice.keySet().iterator(); iterator.hasNext();) {
+      MethodDescriptor md = (MethodDescriptor) iterator.next();
+      SSJavaLattice<String> locOrder = getLattice(md);
+      // writeLatticeDotFile(md.getClassDesc(), md, getMethodLattice(md));
+      HierarchyGraph hg = mapDescriptorToHierarchyGraph.get(md);
+      // System.out.println("~~~\t" + md.getClassDesc() + "_" + md + "\t"
+      // + locOrder.getKeySet().size() + "\t" + hg.getNodeSet().size());
+    }
+

     System.exit(0);
 
   }
 
     System.exit(0);
 
   }
 

+  private void calculateReturnPCLocInheritance() {
+    DFSInheritanceTreeReturnPCLoc(inheritanceTree.getRootNode());
+
+    calculateLowestReturnLocInheritance();
+  }
+
+  private void calculateLowestReturnLocInheritance() {
+
+    Set<MethodDescriptor> keySet = mapHighestOverriddenMethodDescToMethodDescSet.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      MethodDescriptor highestMethodDesc = (MethodDescriptor) iterator.next();
+
+      if (getMethodSummary(highestMethodDesc).getRETURNLoc() != null) {
+        Set<MethodDescriptor> methodDescSet =
+            mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc);
+        for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) {
+          MethodDescriptor md = (MethodDescriptor) iterator2.next();
+          CompositeLocation returnLoc = getMethodSummary(md).getRETURNLoc();
+          if (returnLoc.getSize() == 1) {
+            Set<FlowNode> paramFlowNodeFlowingToReturnValueSet =
+                getParamNodeFlowingToReturnValue(md);
+
+            if (paramFlowNodeFlowingToReturnValueSet.size() == md.numParameters()) {
+              // means return loc is lower than a composite location starting with 'this'
+              NTuple<Descriptor> rTuple = new NTuple<Descriptor>();
+              rTuple.add(returnLoc.get(0).getLocDescriptor());
+              mapHighestOverriddenMethodDescToReturnLocTuple.put(highestMethodDesc, rTuple);
+            }
+          } else {
+            if (!mapHighestOverriddenMethodDescToReturnLocTuple.containsKey(highestMethodDesc)) {
+              NTuple<Descriptor> rTuple = new NTuple<Descriptor>();
+              for (int i = 0; i < returnLoc.getSize(); i++) {
+                rTuple.add(returnLoc.get(i).getLocDescriptor());
+              }
+              mapHighestOverriddenMethodDescToReturnLocTuple.put(highestMethodDesc, rTuple);
+            }
+          }
+        }
+
+      }
+
+    }
+
+  }
+
+  private void addMapHighestMethodDescToMethodDesc(MethodDescriptor highest, MethodDescriptor md) {
+    if (!mapHighestOverriddenMethodDescToMethodDescSet.containsKey(highest)) {
+      mapHighestOverriddenMethodDescToMethodDescSet.put(highest, new HashSet<MethodDescriptor>());
+    }
+    mapHighestOverriddenMethodDescToMethodDescSet.get(highest).add(md);
+  }
+
+  private void DFSInheritanceTreeReturnPCLoc(Node<ClassDescriptor> node) {
+
+    ClassDescriptor cd = node.getData();
+
+    for (Iterator iterator = cd.getMethods(); iterator.hasNext();) {
+      MethodDescriptor md = (MethodDescriptor) iterator.next();
+      MethodDescriptor highestMethodDesc = getHighestOverriddenMethod(md.getClassDesc(), md);
+      System.out.println("md=" + md + "  highest=" + highestMethodDesc);
+
+      mapMethodDescToHighestOverriddenMethodDesc.put(md, highestMethodDesc);
+      addMapHighestMethodDescToMethodDesc(highestMethodDesc, md);
+
+      MethodSummary summary = getMethodSummary(md);
+      FlowGraph flowGraph = getFlowGraph(md);
+
+      System.out.println("#####summary.getPCLoc()=" + summary.getPCLoc() + "  rloc="
+          + summary.getRETURNLoc());
+
+      // ////////////////////////////
+      // calculate PCLOC constraints
+      if (summary.getPCLoc().get(0).isTop()) {
+        mapHighestOverriddenMethodDescToSetLowerThanPCLoc.put(highestMethodDesc,
+            new HashSet<NTuple<Descriptor>>());
+      } else {
+        Set<NTuple<Descriptor>> lowerSet =
+            mapHighestOverriddenMethodDescToSetLowerThanPCLoc.get(highestMethodDesc);
+
+        if (lowerSet == null || lowerSet.size() > 0) {
+
+          if (lowerSet == null) {
+            lowerSet = new HashSet<NTuple<Descriptor>>();
+            mapHighestOverriddenMethodDescToSetLowerThanPCLoc.put(highestMethodDesc, lowerSet);
+          }
+
+          CompositeLocation pcLoc = summary.getPCLoc();
+          Set<FlowEdge> outEdgeSet =
+              flowGraph
+                  .getOutEdgeSet(flowGraph.getFlowNode(translateToDescTuple(pcLoc.getTuple())));
+
+          for (Iterator iterator2 = outEdgeSet.iterator(); iterator2.hasNext();) {
+            FlowEdge flowEdge = (FlowEdge) iterator2.next();
+            lowerSet.add(flowEdge.getEndTuple());
+          }
+        }
+
+        System.out.println("---lowerSet=" + lowerSet);
+      }
+
+      // ////////////////////////////
+      // calculate RETURN LOC constraints
+      CompositeLocation returnLoc = summary.getRETURNLoc();
+      if (returnLoc != null) {
+        System.out.println("md=" + md + "   returnloc=" + returnLoc);
+        Set<FlowNode> inNodeSet =
+            flowGraph.getIncomingFlowNodeSet(flowGraph.getFlowNode(translateToDescTuple(returnLoc
+                .getTuple())));
+
+        Set<NTuple<Descriptor>> higherSet =
+            mapHighestOverriddenMethodDescToSetHigherThanRLoc.get(highestMethodDesc);
+        if (higherSet == null) {
+          higherSet = new HashSet<NTuple<Descriptor>>();
+          mapHighestOverriddenMethodDescToSetHigherThanRLoc.put(highestMethodDesc, higherSet);
+        }
+
+        for (Iterator iterator2 = inNodeSet.iterator(); iterator2.hasNext();) {
+          FlowNode flowNode = (FlowNode) iterator2.next();
+          higherSet.add(flowNode.getCurrentDescTuple());
+        }
+      }
+
+    }
+
+    // traverse children
+    List<Node<ClassDescriptor>> children = node.getChildren();
+    for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+      Node<ClassDescriptor> child = (Node<ClassDescriptor>) iterator.next();
+      DFSInheritanceTreeReturnPCLoc(child);
+    }
+  }
+
+  private void addTupleLowerThanPCLoc(NTuple<Descriptor> tuple) {
+
+  }
+
+  private MethodDescriptor getHighestOverriddenMethod(ClassDescriptor curClassDesc,
+      MethodDescriptor curMethodDesc) {
+
+    Node<ClassDescriptor> curNode = inheritanceTree.getTreeNode(curClassDesc);
+    Node<ClassDescriptor> parentNode = curNode.getParent();
+
+    if (parentNode != null) {
+      ClassDescriptor parentClassDesc = parentNode.getData();
+      if (parentClassDesc.getMethodTable().contains(curMethodDesc.getSymbol())) {
+        Set<MethodDescriptor> methodDescSet =
+            parentClassDesc.getMethodTable().getSet(curMethodDesc.getSymbol());
+        for (Iterator iterator = methodDescSet.iterator(); iterator.hasNext();) {
+          MethodDescriptor md = (MethodDescriptor) iterator.next();
+          if (md.matches(curMethodDesc)) {
+            return getHighestOverriddenMethod(parentClassDesc, md);
+          }
+        }
+      }
+      // traverse to the parent!
+      return getHighestOverriddenMethod(parentNode.getData(), curMethodDesc);
+    }
+    return curMethodDesc;
+  }
+
+  private void buildInheritanceTree() {
+
+    LinkedList<MethodDescriptor> methodDescList =
+        (LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
+
+    System.out.println("methodDescList=" + methodDescList);
+
+    while (!methodDescList.isEmpty()) {
+      MethodDescriptor md = methodDescList.removeLast();
+      ClassDescriptor child = md.getClassDesc();
+      ClassDescriptor parent = child.getSuperDesc();
+      System.out.println("parent=" + child.getSuperDesc() + "  child=" + child);
+      if (parent != null) {
+        inheritanceTree.addParentChild(child.getSuperDesc(), child);
+      }
+    }
+
+  }
+
+  private void addInheritanceConstraints() {
+
+    // DFS the inheritance tree and propagates nodes/edges of parent to child
+
+    Node<ClassDescriptor> rootNode = inheritanceTree.getRootNode();
+    DFSInheritanceTree(rootNode);
+
+  }
+
+  private void DFSInheritanceTree(Node<ClassDescriptor> parentNode) {
+
+    ClassDescriptor parentClassDescriptor = parentNode.getData();
+
+    List<Node<ClassDescriptor>> children = parentNode.getChildren();
+    for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+      Node<ClassDescriptor> childNode = (Node<ClassDescriptor>) iterator.next();
+      ClassDescriptor childClassDescriptor = childNode.getData();
+
+      HierarchyGraph parentGraph = getHierarchyGraph(parentClassDescriptor);
+      HierarchyGraph childGraph = getHierarchyGraph(childClassDescriptor);
+
+      Set<HNode> parentNodeSet = parentGraph.getNodeSet();
+
+      // copies nodes/edges from the parent class...
+      for (Iterator iterator2 = parentNodeSet.iterator(); iterator2.hasNext();) {
+        HNode parentHNode = (HNode) iterator2.next();
+
+        Set<HNode> parentIncomingHNode = parentGraph.getIncomingNodeSet(parentHNode);
+        Set<HNode> parentOutgoingHNode = parentGraph.getOutgoingNodeSet(parentHNode);
+
+        for (Iterator iterator3 = parentIncomingHNode.iterator(); iterator3.hasNext();) {
+          HNode inHNode = (HNode) iterator3.next();
+          childGraph.addEdge(inHNode.getDescriptor(), parentHNode.getDescriptor());
+        }
+
+        for (Iterator iterator3 = parentOutgoingHNode.iterator(); iterator3.hasNext();) {
+          HNode outHNode = (HNode) iterator3.next();
+          childGraph.addEdge(parentHNode.getDescriptor(), outHNode.getDescriptor());
+        }
+
+      }
+
+      // copies nodes/edges from parent methods to overridden methods
+
+      for (Iterator iterator3 = childClassDescriptor.getMethods(); iterator3.hasNext();) {
+        MethodDescriptor childMethodDescriptor = (MethodDescriptor) iterator3.next();
+
+        MethodDescriptor parentMethodDesc =
+            getParentMethodDesc(childMethodDescriptor.getClassDesc(), childMethodDescriptor);
+
+        if (parentMethodDesc != null) {
+
+          HierarchyGraph parentMethodGraph = getHierarchyGraph(parentMethodDesc);
+          HierarchyGraph childMethodGraph = getHierarchyGraph(childMethodDescriptor);
+
+          // copies nodes/edges from the parent method...
+          for (Iterator iterator2 = parentMethodGraph.getNodeSet().iterator(); iterator2.hasNext();) {
+            HNode parentHNode = (HNode) iterator2.next();
+
+            Set<HNode> parentIncomingHNode = parentMethodGraph.getIncomingNodeSet(parentHNode);
+            Set<HNode> parentOutgoingHNode = parentMethodGraph.getOutgoingNodeSet(parentHNode);
+
+            for (Iterator iterator4 = parentIncomingHNode.iterator(); iterator4.hasNext();) {
+              HNode inHNode = (HNode) iterator4.next();
+              childMethodGraph.addEdge(inHNode.getDescriptor(), parentHNode.getDescriptor());
+            }
+
+            for (Iterator iterator4 = parentOutgoingHNode.iterator(); iterator4.hasNext();) {
+              HNode outHNode = (HNode) iterator4.next();
+              childMethodGraph.addEdge(parentHNode.getDescriptor(), outHNode.getDescriptor());
+            }
+
+          }
+
+        }
+
+      }
+
+      DFSInheritanceTree(childNode);
+    }
+
+  }
+
+  private MethodDescriptor getParentMethodDesc(ClassDescriptor classDesc,
+      MethodDescriptor methodDesc) {
+
+    Node<ClassDescriptor> childNode = inheritanceTree.getTreeNode(classDesc);
+    Node<ClassDescriptor> parentNode = childNode.getParent();
+
+    if (parentNode != null) {
+      ClassDescriptor parentClassDesc = parentNode.getData();
+      if (parentClassDesc.getMethodTable().contains(methodDesc.getSymbol())) {
+        Set<MethodDescriptor> methodDescSet =
+            parentClassDesc.getMethodTable().getSet(methodDesc.getSymbol());
+        for (Iterator iterator = methodDescSet.iterator(); iterator.hasNext();) {
+          MethodDescriptor md = (MethodDescriptor) iterator.next();
+          if (md.matches(methodDesc)) {
+            return md;
+          }
+        }
+      }
+
+      // traverse to the parent!
+      getParentMethodDesc(parentNode.getData(), methodDesc);
+
+    }
+
+    return null;
+  }
+

   private void checkReturnNodes() {
     LinkedList<MethodDescriptor> methodDescList =
         (LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
   private void checkReturnNodes() {
     LinkedList<MethodDescriptor> methodDescList =
         (LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();


@@ -2051,12 +2390,12 @@ public class LocationInference {
       // HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(key);
       HierarchyGraph scHierarchyGraph = getSkeletonCombinationHierarchyGraph(key);
       if (key instanceof ClassDescriptor) {
       // HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(key);
       HierarchyGraph scHierarchyGraph = getSkeletonCombinationHierarchyGraph(key);
       if (key instanceof ClassDescriptor) {

-        writeInferredLatticeDotFile((ClassDescriptor) key, scHierarchyGraph, simpleLattice,
-            "_SIMPLE");
+        // writeInferredLatticeDotFile((ClassDescriptor) key, scHierarchyGraph, simpleLattice,
+        // "_SIMPLE");

       } else if (key instanceof MethodDescriptor) {
         MethodDescriptor md = (MethodDescriptor) key;
       } else if (key instanceof MethodDescriptor) {
         MethodDescriptor md = (MethodDescriptor) key;

-        writeInferredLatticeDotFile(md.getClassDesc(), md, scHierarchyGraph, simpleLattice,
-            "_SIMPLE");
+        // writeInferredLatticeDotFile(md.getClassDesc(), md, scHierarchyGraph, simpleLattice,
+        // "_SIMPLE");

       }
 
       LocationSummary ls = getLocationSummary(key);
       }
 
       LocationSummary ls = getLocationSummary(key);


@@ -2068,6 +2407,7 @@ public class LocationInference {
       ClassDescriptor cd = (ClassDescriptor) iterator.next();
       writeInferredLatticeDotFile((ClassDescriptor) cd, getSkeletonCombinationHierarchyGraph(cd),
           cd2lattice.get(cd), "");
       ClassDescriptor cd = (ClassDescriptor) iterator.next();
       writeInferredLatticeDotFile((ClassDescriptor) cd, getSkeletonCombinationHierarchyGraph(cd),
           cd2lattice.get(cd), "");

+      COUNT += cd2lattice.get(cd).getKeySet().size();

     }
 
     Set<MethodDescriptor> mdKeySet = md2lattice.keySet();
     }
 
     Set<MethodDescriptor> mdKeySet = md2lattice.keySet();


@@ -2075,8 +2415,9 @@ public class LocationInference {
       MethodDescriptor md = (MethodDescriptor) iterator.next();
       writeInferredLatticeDotFile(md.getClassDesc(), md, getSkeletonCombinationHierarchyGraph(md),
           md2lattice.get(md), "");
       MethodDescriptor md = (MethodDescriptor) iterator.next();
       writeInferredLatticeDotFile(md.getClassDesc(), md, getSkeletonCombinationHierarchyGraph(md),
           md2lattice.get(md), "");

+      COUNT += md2lattice.get(md).getKeySet().size();

     }
     }

-
+    System.out.println("###COUNT=" + COUNT);

   }
 
   private void buildLattice() {
   }
 
   private void buildLattice() {


@@ -4128,6 +4469,10 @@ public class LocationInference {
     while (!toAnalyzeIsEmpty()) {
       ClassDescriptor cd = toAnalyzeNext();
 
     while (!toAnalyzeIsEmpty()) {
       ClassDescriptor cd = toAnalyzeNext();
 

+      if (cd.getClassName().equals("Object")) {
+        inheritanceTree = new InheritanceTree<ClassDescriptor>(cd);
+      }
+

       setupToAnalazeMethod(cd);
       temp_toanalyzeMethodList.removeAll(visited);
 
       setupToAnalazeMethod(cd);
       temp_toanalyzeMethodList.removeAll(visited);
 


@@ -5854,13 +6199,15 @@ public class LocationInference {
     String fileName = "lattice_";
     if (md != null) {
       fileName +=
     String fileName = "lattice_";
     if (md != null) {
       fileName +=

-      /* cd.getSymbol().replaceAll("[\\W_]", "") + "_" + */md.toString().replaceAll("[\\W_]", "");
+          cd.getSymbol().replaceAll("[\\W_]", "") + "_" + md.toString().replaceAll("[\\W_]", "");

     } else {
       fileName += cd.getSymbol().replaceAll("[\\W_]", "");
     }
 
     fileName += nameSuffix;
 
     } else {
       fileName += cd.getSymbol().replaceAll("[\\W_]", "");
     }
 
     fileName += nameSuffix;
 

+    System.out.println("***lattice=" + fileName + "    setsize=" + locOrder.getKeySet().size());
+

     Set<Pair<String, String>> pairSet = locOrder.getOrderingPairSet();
 
     Set<String> addedLocSet = new HashSet<String>();
     Set<Pair<String, String>> pairSet = locOrder.getOrderingPairSet();
 
     Set<String> addedLocSet = new HashSet<String>();

diff --git a/Robust/src/Analysis/SSJava/SSJavaAnalysis.java b/Robust/src/Analysis/SSJava/SSJavaAnalysis.java
index da84de637057414a997d1f109248415384feb6e9..80f678d53b551f8b2aebde08425e925c23b84d02 100644 (file)
--- a/Robust/src/Analysis/SSJava/SSJavaAnalysis.java
+++ b/Robust/src/Analysis/SSJava/SSJavaAnalysis.java
@@ -155,6 +155,14 @@ public class SSJavaAnalysis {
       doDefinitelyWrittenCheck();
       doLoopCheck();
     }
       doDefinitelyWrittenCheck();
       doLoopCheck();
     }

+
+    for (Iterator iterator = annotationRequireSet.iterator(); iterator.hasNext();) {
+      MethodDescriptor md = (MethodDescriptor) iterator.next();
+      MethodLattice<String> locOrder = getMethodLattice(md);
+      writeLatticeDotFile(md.getClassDesc(), md, getMethodLattice(md));
+      // System.out.println("~~~\t" + md.getClassDesc() + "_" + md + "\t"
+      // + locOrder.getKeySet().size());
+    }

   }
 
   public void init() {
   }
 
   public void init() {


@@ -314,6 +322,7 @@ public class SSJavaAnalysis {
           if (state.SSJAVADEBUG) {
             // generate lattice dot file
             writeLatticeDotFile(cd, null, locOrder);
           if (state.SSJAVADEBUG) {
             // generate lattice dot file
             writeLatticeDotFile(cd, null, locOrder);

+            System.out.println("~~~\t" + cd + "\t" + locOrder.getKeySet().size());

           }
 
         } else if (marker.equals(METHODDEFAULT)) {
           }
 
         } else if (marker.equals(METHODDEFAULT)) {


@@ -321,6 +330,7 @@ public class SSJavaAnalysis {
               new MethodLattice<String>(SSJavaAnalysis.TOP, SSJavaAnalysis.BOTTOM);
           cd2methodDefault.put(cd, locOrder);
           parseMethodDefaultLatticeDefinition(cd, an.getValue(), locOrder);
               new MethodLattice<String>(SSJavaAnalysis.TOP, SSJavaAnalysis.BOTTOM);
           cd2methodDefault.put(cd, locOrder);
           parseMethodDefaultLatticeDefinition(cd, an.getValue(), locOrder);

+          // writeLatticeDotFile(cd, null, locOrder, "METHOD_DEFAULT");

         }
       }
 
         }
       }
 


@@ -339,6 +349,7 @@ public class SSJavaAnalysis {
                     new MethodLattice<String>(SSJavaAnalysis.TOP, SSJavaAnalysis.BOTTOM);
                 md2lattice.put(md, locOrder);
                 parseMethodDefaultLatticeDefinition(cd, an.getValue(), locOrder);
                     new MethodLattice<String>(SSJavaAnalysis.TOP, SSJavaAnalysis.BOTTOM);
                 md2lattice.put(md, locOrder);
                 parseMethodDefaultLatticeDefinition(cd, an.getValue(), locOrder);

+                writeLatticeDotFile(cd, md, locOrder, "");

               } else if (an.getMarker().equals(TERMINATE)) {
                 // developer explicitly wants to skip loop termination analysis
                 String value = an.getValue();
               } else if (an.getMarker().equals(TERMINATE)) {
                 // developer explicitly wants to skip loop termination analysis
                 String value = an.getValue();