import java.util.Set;
import IR.Descriptor;
+import IR.MethodDescriptor;
import Util.Pair;
public class BuildLattice {
- public static int seed = 0;
private LocationInference infer;
private final HNode topNode;
HierarchyGraph inputGraph = infer.getSkeletonCombinationHierarchyGraph(desc);
LocationSummary locSummary = infer.getLocationSummary(desc);
- BasisSet basisSet = inputGraph.computeBasisSet();
+ Set<HNode> nodeSetWithCompositeLocation = new HashSet<HNode>();
+ if (desc instanceof MethodDescriptor) {
+ FlowGraph flowGraph = infer.getFlowGraph((MethodDescriptor) desc);
+
+ for (Iterator iterator = inputGraph.getNodeSet().iterator(); iterator.hasNext();) {
+ HNode hnode = (HNode) iterator.next();
+ Descriptor hnodeDesc = hnode.getDescriptor();
+ if (hnodeDesc != null) {
+ NTuple<Descriptor> descTuple = new NTuple<Descriptor>();
+ descTuple.add(hnodeDesc);
+
+ if (flowGraph.contains(descTuple)) {
+ FlowNode flowNode = flowGraph.getFlowNode(descTuple);
+ if (flowNode.getCompositeLocation() != null) {
+ nodeSetWithCompositeLocation.add(hnode);
+ }
+ }
+
+ }
+ }
+
+ }
+
+ BasisSet basisSet = inputGraph.computeBasisSet(nodeSetWithCompositeLocation);
debug_print(inputGraph);
Family family = generateFamily(basisSet);
lattice.addSharedLoc(higherName);
}
Set<Descriptor> descSet = inputGraph.getDescSetOfNode(higherNode);
+ // System.out.println("higherName=" + higherName + " higherNode=" + higherNode + " descSet="
+ // + descSet);
for (Iterator iterator2 = descSet.iterator(); iterator2.hasNext();) {
Descriptor d = (Descriptor) iterator2.next();
locSummary.addMapHNodeNameToLocationName(d.getSymbol(), higherName);
Set<Integer> lower = (Set<Integer>) iterator2.next();
String lowerName = generateElementName(basisSet, inputGraph, mapFToLocName, lower);
- locSummary.addMapHNodeNameToLocationName(lowerName, lowerName);
-
- HNode lowerNode = inputGraph.getHNode(higherName);
+ HNode lowerNode = inputGraph.getHNode(lowerName);
if (lowerNode != null && lowerNode.isSharedNode()) {
lattice.addSharedLoc(lowerName);
}
+ Set<Descriptor> lowerDescSet = inputGraph.getDescSetOfNode(lowerNode);
+ // System.out.println("lowerName=" + lowerName + " lowerNode=" + lowerNode + " descSet="
+ // + lowerDescSet);
+ for (Iterator iterator3 = lowerDescSet.iterator(); iterator3.hasNext();) {
+ Descriptor d = (Descriptor) iterator3.next();
+ locSummary.addMapHNodeNameToLocationName(d.getSymbol(), lowerName);
+ }
+ // locSummary.addMapHNodeNameToLocationName(lowerName, lowerName);
+
if (higher.size() == 0) {
// empty case
lattice.put(lowerName);
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);
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);
+ // System.out.println("%%%skeleton node=" + node + " outNode=" + outNode);
HNode startNode = scGraph.getCurrentHNode(node);
// if (node.getDescriptor() != null) {
Set<HNode> endNodeSetFromSimpleGraph =
simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(outNode, null);
- System.out.println("endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph
- + " from=" + outNode);
+ // System.out.println("endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph
+ // + " from=" + outNode);
Set<HNode> endCombNodeSet = new HashSet<HNode>();
for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) {
HNode endNode = (HNode) iterator3.next();
endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode));
}
- System.out.println("endCombNodeSet=" + endCombNodeSet);
+ // System.out.println("endCombNodeSet=" + endCombNodeSet);
visited.add(outNode);
if (endCombNodeSet.size() > 0) {
// follows the straight line up to another skeleton/combination node
}
}
+ } else if (!node.isSkeleton() && node.isCombinationNode()) {
+
+ expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, node);
+
} 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();
}
+ private void expandCombinationNode(Descriptor desc, SSJavaLattice<String> lattice,
+ Set<HNode> visited, Map<TripleItem, String> mapIntermediateLoc, LocationSummary locSummary,
+ HNode 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) {
+ endCombNodeSet =
+ removeTransitivelyReachToNode(desc, combinationNodeInSCGraph, endCombNodeSet);
+ recurDFS(desc, lattice, combinationNodeInSCGraph, endCombNodeSet, visited,
+ mapIntermediateLoc, 1, locSummary, cnode);
+ }
+
+ }
+
private Set<HNode> removeTransitivelyReachToNode(Descriptor desc, HNode startNode,
Set<HNode> endNodeSet) {
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();
}
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);
+
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 (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