changes.

[IRC.git] / Robust / src / Analysis / SSJava / FlowGraph.java

diff --git a/Robust/src/Analysis/SSJava/FlowGraph.java b/Robust/src/Analysis/SSJava/FlowGraph.java
index a2d1791bb8a698609a668910a803c9a742774a76..d4051fb508c497381b92ac8b3ae2db7c49a391a3 100644 (file)
--- a/Robust/src/Analysis/SSJava/FlowGraph.java
+++ b/Robust/src/Analysis/SSJava/FlowGraph.java
@@ -86,7 +86,7 @@ public class FlowGraph {
     }
     set.add(neighbor);
 
-    System.out.println("add a new neighbor " + neighbor + " to " + node);
+    // System.out.println("add a new neighbor " + neighbor + " to " + node);
   }
 
   public boolean hasEdge(NTuple<Descriptor> fromDescTuple, NTuple<Descriptor> toDescTuple) {
@@ -111,10 +111,10 @@ public class FlowGraph {
 
   public void addValueFlowEdge(NTuple<Descriptor> fromDescTuple, NTuple<Descriptor> toDescTuple) {
 
-    FlowNode fromNode = mapDescTupleToInferNode.get(fromDescTuple);
-    FlowNode toNode = mapDescTupleToInferNode.get(toDescTuple);
+    FlowNode fromNode = getFlowNode(fromDescTuple);
+    FlowNode toNode = getFlowNode(toDescTuple);
 
-    System.out.println("create an edge from " + fromNode + " to " + toNode);
+    // System.out.println("create an edge from " + fromNode + " to " + toNode);
 
     int fromTupleSize = fromDescTuple.size();
     NTuple<Descriptor> curTuple = new NTuple<Descriptor>();
@@ -140,7 +140,7 @@ public class FlowGraph {
     FlowEdge edge = new FlowEdge(fromNode, toNode, initTuple, endTuple);
     fromNode.addOutEdge(edge);
 
-    System.out.println("add a new edge=" + edge);
+    // System.out.println("add a new edge=" + edge);
 
   }
 
@@ -161,7 +161,7 @@ public class FlowGraph {
 
     if (!mapDescTupleToInferNode.containsKey(tuple)) {
 
-      FlowNode node = new FlowNode(tuple, isParamter(tuple));
+      FlowNode node = new FlowNode(tuple, isParameter(tuple));
       mapDescTupleToInferNode.put(tuple, node);
       nodeSet.add(node);
 
@@ -172,7 +172,7 @@ public class FlowGraph {
         getFlowNode(baseTuple).addFieldNode(node);
       }
 
-      System.out.println("Creating new node=" + node);
+      // System.out.println("Creating new node=" + node);
       return node;
     } else {
       return mapDescTupleToInferNode.get(tuple);
@@ -238,6 +238,10 @@ public class FlowGraph {
     return visited;
   }
 
+  public NTuple<Location> getLocationTuple(NTuple<Descriptor> descTuple) {
+    return getLocationTuple(getFlowNode(descTuple));
+  }
+
   public NTuple<Location> getLocationTuple(FlowNode fn) {
 
     if (!mapFlowNodeToLocTuple.containsKey(fn)) {
@@ -245,20 +249,31 @@ public class FlowGraph {
       NTuple<Location> locTuple = new NTuple<Location>();
       ClassDescriptor cd = null;
 
-      for (int i = 0; i < descTuple.size(); i++) {
-        Descriptor curDesc = descTuple.get(i);
-        Location loc;
-        if (i == 0) {
-          loc = new Location(md, curDesc.getSymbol());
-          loc.setLocDescriptor(md);
-          cd = ((VarDescriptor) curDesc).getType().getClassDesc();
-        } else {
-          loc = new Location(cd, curDesc.getSymbol());
-          loc.setLocDescriptor(curDesc);
-          cd = ((FieldDescriptor) curDesc).getType().getClassDesc();
+      Descriptor localDesc = fn.getDescTuple().get(0);
+      if (localDesc.getSymbol().equals(LocationInference.TOPLOC)) {
+        Location topLoc = new Location(md, Location.TOP);
+        locTuple.add(topLoc);
+      } else if (localDesc.getSymbol().equals(LocationInference.GLOBALLOC)) {
+        Location topLoc = new Location(md, LocationInference.GLOBALLOC);
+        locTuple.add(topLoc);
+      } else {
+        // normal case
+        for (int i = 0; i < descTuple.size(); i++) {
+          Descriptor curDesc = descTuple.get(i);
+          Location loc;
+          if (i == 0) {
+            loc = new Location(md, curDesc.getSymbol());
+            loc.setLocDescriptor(curDesc);
+            cd = ((VarDescriptor) curDesc).getType().getClassDesc();
+          } else {
+            loc = new Location(cd, curDesc.getSymbol());
+            loc.setLocDescriptor(curDesc);
+            cd = ((FieldDescriptor) curDesc).getType().getClassDesc();
+          }
+          locTuple.add(loc);
         }
-        locTuple.add(loc);
       }
+
       mapFlowNodeToLocTuple.put(fn, locTuple);
     }
     return mapFlowNodeToLocTuple.get(fn);
@@ -327,7 +342,7 @@ public class FlowGraph {
     return set;
   }
 
-  public boolean isParamter(NTuple<Descriptor> tuple) {
+  public boolean isParameter(NTuple<Descriptor> tuple) {
     // return true if a descriptor tuple is started with a parameter descriptor
     Descriptor firstIdxDesc = tuple.get(0);
     return mapParamDescToIdx.containsKey(firstIdxDesc);