X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FAnalysis%2FSSJava%2FBuildLattice.java;h=780819f49aebd564c99948f9d5755507940f6a08;hb=03f449200cf7e78de07f884509619d0e37edfacf;hp=264699c3767c0757e50887ff0b6978b2b6c3db40;hpb=ec795f9b357096a8a74b539b3a3057b325bfa7f3;p=IRC.git diff --git a/Robust/src/Analysis/SSJava/BuildLattice.java b/Robust/src/Analysis/SSJava/BuildLattice.java index 264699c3..780819f4 100644 --- a/Robust/src/Analysis/SSJava/BuildLattice.java +++ b/Robust/src/Analysis/SSJava/BuildLattice.java @@ -7,15 +7,20 @@ import java.util.Map; 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; + 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 buildLattice(Descriptor desc) { @@ -23,7 +28,30 @@ public class BuildLattice { HierarchyGraph inputGraph = infer.getSkeletonCombinationHierarchyGraph(desc); LocationSummary locSummary = infer.getLocationSummary(desc); - BasisSet basisSet = inputGraph.computeBasisSet(); + Set nodeSetWithCompositeLocation = new HashSet(); + 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 descTuple = new NTuple(); + 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); @@ -47,25 +75,39 @@ public class BuildLattice { Set higher = (Set) iterator.next(); String higherName = generateElementName(basisSet, inputGraph, mapFToLocName, higher); - locSummary.addMapHNodeNameToLocationName(higherName, higherName); HNode higherNode = inputGraph.getHNode(higherName); if (higherNode != null && higherNode.isSharedNode()) { lattice.addSharedLoc(higherName); } + Set 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); + } + // locSummary.addMapHNodeNameToLocationName(higherName, higherName); Set> lowerSet = mapImSucc.get(higher); for (Iterator iterator2 = lowerSet.iterator(); iterator2.hasNext();) { Set lower = (Set) 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 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); @@ -118,8 +160,12 @@ public class BuildLattice { Set nodeSet = simpleGraph.getNodeSet(); Map mapIntermediateLoc = new HashMap(); + + 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 (node.isSkeleton() && (!visited.contains(node))) { visited.add(node); @@ -129,46 +175,12 @@ public class BuildLattice { if (!outNode.isSkeleton()) { if (outNode.isCombinationNode()) { - // expand the combination node 'outNode' - System.out.println("-COMBINATION NODE=" + outNode); - // here we need to expand the corresponding combination location in the lattice - HNode combinationNodeInSCGraph = getCombinationNodeInSCGraph(desc, outNode); - - Set combineSkeletonNodeSet = - simpleGraph.getCombineSetByCombinationNode(outNode); - - System.out.println("combineSkeletonNodeSet=" + combineSkeletonNodeSet); - - Set combinationNodeSet = - simpleGraph.getCombinationNodeSetByCombineNodeSet(combineSkeletonNodeSet); - System.out.println("combinationNodeSet=" + combinationNodeSet); - - Set endNodeSetFromSimpleGraph = - simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(outNode, - combinationNodeSet); - System.out.println("-endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph); - Set endCombNodeSet = new HashSet(); - for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) { - HNode endNode = (HNode) iterator3.next(); - endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode)); - } - System.out.println("-endCombNodeSet=" + endCombNodeSet); - 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); - // 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) { @@ -183,41 +195,66 @@ public class BuildLattice { Set endNodeSetFromSimpleGraph = simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(outNode, null); - System.out.println("endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph - + " from=" + outNode); + // System.out.println("endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph + // + " from=" + outNode); Set endCombNodeSet = new HashSet(); for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) { HNode endNode = (HNode) iterator3.next(); endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode)); } - + // System.out.println("endCombNodeSet=" + endCombNodeSet); visited.add(outNode); if (endCombNodeSet.size() > 0) { // follows the straight line up to another skeleton/combination node endCombNodeSet = removeTransitivelyReachToNode(desc, startNode, endCombNodeSet); - recurDFSNormalNode(desc, lattice, startNode, endCombNodeSet, visited, - mapIntermediateLoc, 1, locSummary, 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); } + recurDFSNormalNode(desc, lattice, startNode, endCombNodeSet, visited, + mapIntermediateLoc, 1, locSummary, outNode); } } } + } else if (!node.isSkeleton() && node.isCombinationNode()) { + + expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, node); + } else if (!node.isSkeleton() && !node.isCombinationNode() && !node.isMergeNode() && !visited.contains(node)) { - // an intermediate node 'node' is located between "TOP" location and a skeleton node - Set outNodeSet = simpleGraph.getOutgoingNodeSet(node); - Set belowSkeletonLocNameSet = new HashSet(); - for (Iterator iterator2 = outNodeSet.iterator(); iterator2.hasNext();) { - HNode outNode = (HNode) iterator2.next(); - if (outNode.isSkeleton()) { - belowSkeletonLocNameSet.add(scGraph.getCurrentHNode(outNode).getName()); + 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 (sizeIncomingNode == 0) { + // this node will be directly connected to the TOP location + // start adding the following nodes from this node + + Set endNodeSetFromSimpleGraph = + simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(node, null); + + Set endCombNodeSet = new HashSet(); + for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) { + HNode endNode = (HNode) iterator3.next(); + endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode)); } + + HNode startNode = topNode; + visited.add(startNode); + if (endCombNodeSet.size() > 0) { + // follows the straight line up to another skeleton/combination node + // endCombNodeSet = removeTransitivelyReachToNode(desc, node, endCombNodeSet); + recurDFSNormalNode(desc, lattice, startNode, endCombNodeSet, visited, + mapIntermediateLoc, 1, locSummary, node); + } + } - String newLocName = "ILOC" + (seed++); - lattice.insertNewLocationBetween(lattice.getTopItem(), belowSkeletonLocNameSet, newLocName); - locSummary.addMapHNodeNameToLocationName(node.getName(), newLocName); + } } @@ -225,6 +262,45 @@ public class BuildLattice { } + private void expandCombinationNode(Descriptor desc, SSJavaLattice lattice, + Set visited, Map 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 combineSkeletonNodeSet = simpleGraph.getCombineSetByCombinationNode(cnode); + + // System.out.println("combineSkeletonNodeSet=" + combineSkeletonNodeSet); + + Set combinationNodeSet = + simpleGraph.getCombinationNodeSetByCombineNodeSet(combineSkeletonNodeSet); + + // System.out.println("combinationNodeSet=" + combinationNodeSet); + + Set endNodeSetFromSimpleGraph = + simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(cnode, combinationNodeSet); + // System.out.println("-endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph); + Set endCombNodeSet = new HashSet(); + 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 removeTransitivelyReachToNode(Descriptor desc, HNode startNode, Set endNodeSet) { @@ -241,12 +317,13 @@ public class BuildLattice { } else { HNode newEndNode = getDirectlyReachableNodeFromStartNodeReachToEndNode(scGraph, startNode, endNode); - System.out.println("#### old END NODE=" + endNode + " --->" + newEndNode); + // System.out.println("#### old END NODE=" + endNode + " --->" + newEndNode); newEndNodeSet.add(newEndNode); } } - System.out.println("removeTransitivelyReachToNode=" + endNodeSet + " newSet=" + newEndNodeSet); + // System.out.println("removeTransitivelyReachToNode=" + endNodeSet + " newSet=" + + // newEndNodeSet); return newEndNodeSet; @@ -254,8 +331,15 @@ public class BuildLattice { private HNode getDirectlyReachableNodeFromStartNodeReachToEndNode(HierarchyGraph scGraph, HNode startNode, HNode endNode) { + System.out.println("getDirectlyReachableNodeFromStartNodeReachToEndNode start=" + startNode + + " end=" + endNode); Set connected = new HashSet(); recurDirectlyReachableNodeFromStartNodeReachToEndNode(scGraph, startNode, endNode, connected); + if (connected.size() == 0) { + connected.add(endNode); + } + System.out.println("connected=" + connected); + return connected.iterator().next(); } @@ -268,7 +352,6 @@ public class BuildLattice { if (inNode.equals(startNode)) { connected.add(curNode); } else { - System.out.println("inNode=" + inNode); recurDirectlyReachableNodeFromStartNodeReachToEndNode(scGraph, startNode, inNode, connected); } } @@ -280,10 +363,10 @@ public class BuildLattice { int idx, LocationSummary locSummary, HNode curNode) { TripleItem item = new TripleItem(startNode, endNodeSet, idx); - System.out.println("item=" + item); + // 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(); @@ -305,9 +388,17 @@ public class BuildLattice { } String locName = mapIntermediateLoc.get(item); - locSummary.addMapHNodeNameToLocationName(curNode.getName(), locName); HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc); + + Set descSet = graph.getDescSetOfNode(curNode); + for (Iterator iterator = descSet.iterator(); iterator.hasNext();) { + Descriptor d = (Descriptor) iterator.next(); + locSummary.addMapHNodeNameToLocationName(d.getSymbol(), locName); + } + locSummary.addMapHNodeNameToLocationName(curNode.getName(), locName); + + Set outSet = graph.getOutgoingNodeSet(curNode); for (Iterator iterator2 = outSet.iterator(); iterator2.hasNext();) { HNode outNode = (HNode) iterator2.next(); @@ -315,6 +406,8 @@ public class BuildLattice { 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); } } @@ -333,7 +426,7 @@ public class BuildLattice { 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); @@ -350,13 +443,18 @@ public class BuildLattice { } + HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc); String locName = mapIntermediateLoc.get(item); + Set descSet = graph.getDescSetOfNode(curNode); + for (Iterator iterator = descSet.iterator(); iterator.hasNext();) { + 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); + // System.out.println("-TripleItem=" + item); + // System.out.println("-curNode=" + curNode.getName() + " locName=" + locName); - HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc); Set outSet = graph.getOutgoingNodeSet(curNode); for (Iterator iterator2 = outSet.iterator(); iterator2.hasNext();) { HNode outNode = (HNode) iterator2.next(); @@ -386,7 +484,7 @@ public class BuildLattice { if (inputGraph.BASISTOPELEMENT.equals(F)) { return SSJavaAnalysis.BOTTOM; } else { - String str = "LOC" + (seed++); + String str = "LOC" + (LocationInference.locSeed++); mapF2LocName.put(F, str); return str; } @@ -439,7 +537,7 @@ public class BuildLattice { resetCount(mapFtoCount, family); } - System.out.println("mapImSucc=" + mapImSucc); + // System.out.println("mapImSucc=" + mapImSucc); return mapImSucc; } @@ -504,8 +602,8 @@ public class BuildLattice { private void debug_print(HierarchyGraph inputGraph) { System.out.println("\nBuild Lattice:" + inputGraph.getName()); - System.out.println("Node2Index:\n" + inputGraph.getMapHNodeToUniqueIndex()); - System.out.println("Node2Basis:\n" + inputGraph.getMapHNodeToBasis()); + // System.out.println("Node2Index:\n" + inputGraph.getMapHNodeToUniqueIndex()); + // System.out.println("Node2Basis:\n" + inputGraph.getMapHNodeToBasis()); } } @@ -549,14 +647,21 @@ class TripleItem { } public int hashCode() { - return higherNode.hashCode() + lowerNodeSet.hashCode() + idx; + + int h = 0; + if (higherNode != null) { + h = higherNode.hashCode(); + } + + return h + lowerNodeSet.hashCode() + idx; } public boolean equals(Object obj) { if (obj instanceof TripleItem) { TripleItem in = (TripleItem) obj; - if (higherNode.equals(in.higherNode) && lowerNodeSet.equals(in.lowerNodeSet) && idx == in.idx) { + if ((higherNode == null || (higherNode != null && higherNode.equals(in.higherNode))) + && lowerNodeSet.equals(in.lowerNodeSet) && idx == in.idx) { return true; } }