public class BuildLattice {
- public static int seed = 0;
private LocationInference infer;
- private final HNode topNode;
- private final HNode bottomNode;
-
public BuildLattice(LocationInference infer) {
this.infer = infer;
- topNode = new HNode(infer.ssjava.TOP);
- bottomNode = new HNode(infer.ssjava.BOTTOM);
}
public SSJavaLattice<String> buildLattice(Descriptor desc) {
Map<TripleItem, String> mapIntermediateLoc = new HashMap<TripleItem, String>();
+ System.out.println("*insert=" + desc);
+ System.out.println("***nodeSet=" + nodeSet);
for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
HNode node = (HNode) iterator.next();
- // System.out.println("node=" + node);
+ System.out.println("node=" + node);
+
if (node.isSkeleton() && (!visited.contains(node))) {
visited.add(node);
if (!outNode.isSkeleton()) {
if (outNode.isCombinationNode()) {
- // expand the combination node 'outNode'
- // here we need to expand the corresponding combination location in the lattice
- HNode combinationNodeInSCGraph = getCombinationNodeInSCGraph(desc, outNode);
-
- Set<HNode> combineSkeletonNodeSet =
- simpleGraph.getCombineSetByCombinationNode(outNode);
-
- // System.out.println("combineSkeletonNodeSet=" + combineSkeletonNodeSet);
-
- Set<HNode> combinationNodeSet =
- simpleGraph.getCombinationNodeSetByCombineNodeSet(combineSkeletonNodeSet);
-
- // System.out.println("combinationNodeSet=" + combinationNodeSet);
-
- Set<HNode> endNodeSetFromSimpleGraph =
- simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(outNode,
- combinationNodeSet);
- // System.out.println("-endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph);
- Set<HNode> endCombNodeSet = new HashSet<HNode>();
- for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) {
- HNode endNode = (HNode) iterator3.next();
- endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode));
- }
- visited.add(outNode);
-
- // follows the straight line up to another skeleton/combination node
- if (endCombNodeSet.size() > 0) {
- endCombNodeSet =
- removeTransitivelyReachToNode(desc, combinationNodeInSCGraph, endCombNodeSet);
- recurDFS(desc, lattice, combinationNodeInSCGraph, endCombNodeSet, visited,
- mapIntermediateLoc, 1, locSummary, outNode);
- }
-
+ expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode);
} else {
// we have a node that is neither combination or skeleton node
// System.out.println("%%%skeleton node=" + node + " outNode=" + outNode);
} else if (endCombNodeSet.size() == 0) {
// the outNode is (directly/transitively) connected to the bottom node
// therefore, we just add a dummy bottom HNode to the endCombNodeSet.
- endCombNodeSet.add(bottomNode);
+ endCombNodeSet.add(LocationInference.BOTTOMHNODE);
}
+
recurDFSNormalNode(desc, lattice, startNode, endCombNodeSet, visited,
mapIntermediateLoc, 1, locSummary, outNode);
}
} else if (!node.isSkeleton() && !node.isCombinationNode() && !node.isMergeNode()
&& !visited.contains(node)) {
+ System.out.println("n=" + node);
+
// an intermediate node 'node' may be located between "TOP" location and a skeleton node
- int sizeIncomingNode = simpleGraph.getIncomingNodeSet(node).size();
+ if (simpleGraph.getIncomingNodeSet(node).size() == 0) {
- if (sizeIncomingNode == 0) {
// this node will be directly connected to the TOP location
// start adding the following nodes from this node
endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode));
}
- HNode startNode = topNode;
+ System.out.println("endCombNodeSet=" + endCombNodeSet);
+ HNode startNode = LocationInference.TOPHNODE;
visited.add(startNode);
if (endCombNodeSet.size() > 0) {
// follows the straight line up to another skeleton/combination node
}
+ private void expandCombinationNode(Descriptor desc, SSJavaLattice<String> lattice,
+ Set<HNode> visited, Map<TripleItem, String> mapIntermediateLoc, LocationSummary locSummary,
+ HNode cnode) {
+
+ System.out.println("expandCombinationNode=" + cnode);
+ // expand the combination node 'outNode'
+ // here we need to expand the corresponding combination location in the lattice
+ HNode combinationNodeInSCGraph = getCombinationNodeInSCGraph(desc, cnode);
+
+ HierarchyGraph simpleGraph = infer.getSimpleHierarchyGraph(desc);
+
+ Set<HNode> combineSkeletonNodeSet = simpleGraph.getCombineSetByCombinationNode(cnode);
+
+ // System.out.println("combineSkeletonNodeSet=" + combineSkeletonNodeSet);
+
+ Set<HNode> combinationNodeSet =
+ simpleGraph.getCombinationNodeSetByCombineNodeSet(combineSkeletonNodeSet);
+
+ // System.out.println("combinationNodeSet=" + combinationNodeSet);
+
+ Set<HNode> endNodeSetFromSimpleGraph =
+ simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(cnode, combinationNodeSet);
+ // System.out.println("-endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph);
+ Set<HNode> endCombNodeSet = new HashSet<HNode>();
+ for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) {
+ HNode endNode = (HNode) iterator3.next();
+ endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode));
+ }
+ visited.add(cnode);
+
+ // follows the straight line up to another skeleton/combination node
+ if (endCombNodeSet.size() > 0) {
+ System.out.println("---endCombNodeSet=" + endCombNodeSet);
+ endCombNodeSet =
+ removeTransitivelyReachToNode(desc, combinationNodeInSCGraph, endCombNodeSet);
+
+ recurDFS(desc, lattice, combinationNodeInSCGraph, endCombNodeSet, visited,
+ mapIntermediateLoc, 1, locSummary, cnode);
+ } else {
+ endCombNodeSet.add(LocationInference.BOTTOMHNODE);
+ // System.out.println("---endCombNodeSet is zero");
+ // System.out.println("---endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph);
+ // System.out.println("---incoming=" + simpleGraph.getIncomingNodeSet(cnode));
+ recurDFS(desc, lattice, combinationNodeInSCGraph, endCombNodeSet, visited,
+ mapIntermediateLoc, 1, locSummary, cnode);
+
+ }
+
+ }
+
private Set<HNode> removeTransitivelyReachToNode(Descriptor desc, HNode startNode,
Set<HNode> endNodeSet) {
// replace it with a directly connected one which transitively reaches to it.
HierarchyGraph scGraph = infer.getSkeletonCombinationHierarchyGraph(desc);
- Set<HNode> newEndNodeSet = new HashSet<HNode>();
+ Set<HNode> newEndNodeSet = new HashSet<HNode>();
for (Iterator iterator = endNodeSet.iterator(); iterator.hasNext();) {
HNode endNode = (HNode) iterator.next();
if (scGraph.isDirectlyConnectedTo(startNode, endNode)) {
}
+ private HNode getDirectlyReachableSCNodeFromEndNode(HierarchyGraph scGraph, HNode startNode,
+ Set<HNode> endNodeSet) {
+
+ System.out.println("getDirectlyReachableSCNodeFromEndNode start=" + startNode + " endNodeSet="
+ + endNodeSet);
+ Set<HNode> newStartNodeSet = new HashSet<HNode>();
+
+ for (Iterator iterator = endNodeSet.iterator(); iterator.hasNext();) {
+ HNode endNode = (HNode) iterator.next();
+ Set<HNode> connectedToEndNodeSet = scGraph.getIncomingNodeSet(endNode);
+
+ for (Iterator iterator2 = connectedToEndNodeSet.iterator(); iterator2.hasNext();) {
+ HNode curNode = (HNode) iterator2.next();
+ if (recurConnectedFromStartNode(scGraph, startNode, curNode, new HashSet<HNode>())) {
+ newStartNodeSet.add(curNode);
+ }
+ }
+ }
+
+ System.out.println("newStartNodeSet=" + newStartNodeSet);
+
+ if (newStartNodeSet.size() == 0) {
+ newStartNodeSet.add(startNode);
+ }
+
+ return newStartNodeSet.iterator().next();
+ }
+
+ private boolean recurConnectedFromStartNode(HierarchyGraph scGraph, HNode startNode,
+ HNode curNode, Set<HNode> visited) {
+ // return true if curNode is transitively connected from the startNode
+
+ boolean isConnected = false;
+ Set<HNode> inNodeSet = scGraph.getIncomingNodeSet(curNode);
+ for (Iterator iterator = inNodeSet.iterator(); iterator.hasNext();) {
+ HNode in = (HNode) iterator.next();
+ if (in.equals(startNode)) {
+ return true;
+ } else {
+ visited.add(in);
+ isConnected |= recurConnectedFromStartNode(scGraph, startNode, in, visited);
+ }
+ }
+
+ return isConnected;
+ }
+
private HNode getDirectlyReachableNodeFromStartNodeReachToEndNode(HierarchyGraph scGraph,
HNode startNode, HNode endNode) {
+ System.out.println("getDirectlyReachableNodeFromStartNodeReachToEndNode start=" + startNode
+ + " end=" + endNode);
Set<HNode> connected = new HashSet<HNode>();
recurDirectlyReachableNodeFromStartNodeReachToEndNode(scGraph, startNode, endNode, connected);
+ if (connected.size() == 0) {
+ connected.add(endNode);
+ }
+ System.out.println("connected=" + connected);
+
return connected.iterator().next();
}
if (inNode.equals(startNode)) {
connected.add(curNode);
} else {
- // System.out.println("inNode=" + inNode);
recurDirectlyReachableNodeFromStartNodeReachToEndNode(scGraph, startNode, inNode, connected);
}
}
// System.out.println("item=" + item);
if (!mapIntermediateLoc.containsKey(item)) {
// need to create a new intermediate location in the lattice
- String newLocName = "ILOC" + (seed++);
+ String newLocName = "ILOC" + (LocationInference.locSeed++);
String above;
if (idx == 1) {
above = startNode.getName();
Set<String> belowSet = new HashSet<String>();
for (Iterator iterator = endNodeSet.iterator(); iterator.hasNext();) {
HNode endNode = (HNode) iterator.next();
- belowSet.add(endNode.getName());
+ String locName;
+ if (locSummary.getMapHNodeNameToLocationName().containsKey(endNode.getName())) {
+ locName = locSummary.getLocationName(endNode.getName());
+ } else {
+ locName = endNode.getName();
+ }
+ belowSet.add(locName);
}
-
lattice.insertNewLocationBetween(above, belowSet, newLocName);
mapIntermediateLoc.put(item, newLocName);
}
String locName = mapIntermediateLoc.get(item);
+
HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc);
Set<Descriptor> descSet = graph.getDescSetOfNode(curNode);
Descriptor d = (Descriptor) iterator.next();
locSummary.addMapHNodeNameToLocationName(d.getSymbol(), locName);
}
- // locSummary.addMapHNodeNameToLocationName(curNode.getName(), locName);
+ locSummary.addMapHNodeNameToLocationName(curNode.getName(), locName);
+
+ if (curNode.isSharedNode()) {
+ lattice.addSharedLoc(locName);
+ }
+
+ System.out.println("-TripleItem=" + item);
+ System.out.println("-curNode=" + curNode.getName() + " locName=" + locName);
Set<HNode> outSet = graph.getOutgoingNodeSet(curNode);
for (Iterator iterator2 = outSet.iterator(); iterator2.hasNext();) {
visited.add(outNode);
recurDFSNormalNode(desc, lattice, startNode, endNodeSet, visited, mapIntermediateLoc,
idx + 1, locSummary, outNode);
+ } else if (!outNode.isSkeleton() && outNode.isCombinationNode() && !visited.contains(outNode)) {
+ expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode);
}
}
String newLocName = combinationNodeInSCGraph.getName();
mapIntermediateLoc.put(item, newLocName);
} else {
- String newLocName = "ILOC" + (seed++);
+ String newLocName = "ILOC" + (LocationInference.locSeed++);
int prevIdx = idx - 1;
TripleItem prevItem = new TripleItem(combinationNodeInSCGraph, endNodeSet, prevIdx);
above = mapIntermediateLoc.get(prevItem);
Descriptor d = (Descriptor) iterator.next();
locSummary.addMapHNodeNameToLocationName(d.getSymbol(), locName);
}
+ locSummary.addMapHNodeNameToLocationName(curNode.getName(), locName);
- // System.out.println("-TripleItem=" + item);
- // System.out.println("-curNode=" + curNode.getName() + " locName=" + locName);
+ if (curNode.isSharedNode()) {
+ lattice.addSharedLoc(locName);
+ }
+ System.out.println("-TripleItem=" + item);
+ System.out.println("-curNode=" + curNode.getName() + " S=" + curNode.isSharedNode()
+ + " locName=" + locName);
Set<HNode> outSet = graph.getOutgoingNodeSet(curNode);
for (Iterator iterator2 = outSet.iterator(); iterator2.hasNext();) {
HNode outNode = (HNode) iterator2.next();
+ // System.out.println("recurDFS outNode=" + outNode);
+ // System.out.println("---cur combinationNodeInSCGraph=" + combinationNodeInSCGraph);
+ // System.out.println("---outNode combinationNodeInSCGraph="
+ // + getCombinationNodeInSCGraph(desc, outNode));
if (!outNode.isSkeleton() && !visited.contains(outNode)) {
- if (combinationNodeInSCGraph.equals(getCombinationNodeInSCGraph(desc, outNode))) {
- visited.add(outNode);
- recurDFS(desc, lattice, combinationNodeInSCGraph, endNodeSet, visited,
- mapIntermediateLoc, idx + 1, locSummary, outNode);
+ if (outNode.isCombinationNode()) {
+ // check whether the next combination node is different from the current node
+ if (combinationNodeInSCGraph.equals(getCombinationNodeInSCGraph(desc, outNode))) {
+ visited.add(outNode);
+ recurDFS(desc, lattice, combinationNodeInSCGraph, endNodeSet, visited,
+ mapIntermediateLoc, idx + 1, locSummary, outNode);
+ } else {
+ expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode);
+ }
}
+
}
}
if (inputGraph.BASISTOPELEMENT.equals(F)) {
return SSJavaAnalysis.BOTTOM;
} else {
- String str = "LOC" + (seed++);
+ String str = "LOC" + (LocationInference.locSeed++);
mapF2LocName.put(F, str);
return str;
}
projects / IRC.git / blobdiff