import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.Map;
import java.util.Set;
+import java.util.Stack;
import IR.ClassDescriptor;
import IR.Descriptor;
private Map<Descriptor, Map<TripleItem, String>> mapDescToIntermediateLocMap;
+ private Map<Descriptor, Map<InterLocItem, String>> mapDescToInterLocMap;
+
private Map<Pair<HNode, HNode>, Integer> mapItemToHighestIndex;
private Map<SSJavaLattice<String>, Set<String>> mapLatticeToLocalLocSet;
+ private Map<Descriptor, Map<LineIdentifier, LinkedList<LocPair>>> mapDescToLineListMap;
+
public BuildLattice(LocationInference infer) {
this.infer = infer;
this.mapSharedNodeToTripleItem = new HashMap<HNode, TripleItem>();
this.mapItemToHighestIndex = new HashMap<Pair<HNode, HNode>, Integer>();
this.mapDescToIntermediateLocMap = new HashMap<Descriptor, Map<TripleItem, String>>();
this.mapLatticeToLocalLocSet = new HashMap<SSJavaLattice<String>, Set<String>>();
+ this.mapDescToInterLocMap = new HashMap<Descriptor, Map<InterLocItem, String>>();
+ this.mapDescToLineListMap = new HashMap<Descriptor, Map<LineIdentifier, LinkedList<LocPair>>>();
}
public SSJavaLattice<String> buildLattice(Descriptor desc) {
HierarchyGraph inputGraph = infer.getSkeletonCombinationHierarchyGraph(desc);
LocationSummary locSummary = infer.getLocationSummary(desc);
- HierarchyGraph naiveGraph = infer.getSimpleHierarchyGraph(desc);
+ HierarchyGraph simpleGraph = infer.getSimpleHierarchyGraph(desc);
+ HierarchyGraph naiveGraph = simpleGraph.clone();
// I don't think we need to keep the below if statement anymore
// because hierarchy graph does not have any composite location
SSJavaLattice<String> naive_lattice =
buildLattice(desc, naiveBasisSet, naiveGraph, null, naive_mapImSucc);
- LocationInference.numLocationsNaive += naive_lattice.getKeySet().size();
+ int numLocs = naive_lattice.getKeySet().size();
+ LocationInference.numLocationsNaive += numLocs;
+ infer.mapNumLocsMapNaive.put(desc, new Integer(numLocs));
+
+ int numPaths = naive_lattice.countPaths();
+ infer.mapNumPathsMapNaive.put(desc, new Integer(numPaths));
+
+ System.out.println(desc + " numPaths=" + numPaths + " numLocs="
+ + naive_lattice.getKeySet().size());
+
infer.addNaiveLattice(desc, naive_lattice);
}
// 1) find the lowest node m in the lattice that is above hnode in the lattice
// 2) count the number of non-shared nodes d between the hnode and the node m
// int numNonSharedNodes;
- int dist;
+ int dist = 0;
HNode SCNode;
+ Set<HNode> combineSkeletonNodeSet = null;
+ Stack<String> trace = new Stack<String>();
if (hNode.isDirectCombinationNode()) {
// this node itself is the lowest node m. it is the first node of the chain
Set<HNode> combineSet = hierarchyGraph.getCombineSetByCombinationNode(hNode);
SCNode = scGraph.getCombinationNode(combineSet);
// numNonSharedNodes = -1;
dist = 0;
+ if (hNode.isSharedNode()) {
+ trace.add("S");
+ } else {
+ trace.add("N");
+ }
} else {
Set<HNode> aboveSet = new HashSet<HNode>();
if (hNode.isCombinationNode()) {
// the current node is a combination node
- Set<HNode> combineSkeletonNodeSet =
- hierarchyGraph.getCombineSetByCombinationNode(hNode);
+ combineSkeletonNodeSet = hierarchyGraph.getCombineSetByCombinationNode(hNode);
System.out.println(" combineSkeletonNodeSet=" + combineSkeletonNodeSet
+ " combinationNode=" + scGraph.getCombinationNode(combineSkeletonNodeSet));
// the current node is not a combination node
// there is only one parent node which should be skeleton node.
- System.out.println(" hierarchyGraph.getSkeleteNodeSetReachTo(" + hNode + ")="
- + hierarchyGraph.getSkeleteNodeSetReachTo(hNode));
- aboveSet.addAll(hierarchyGraph.getSkeleteNodeSetReachTo(hNode));
- System.out.println(" aboveset of " + hNode + "=" + aboveSet);
- // assert aboveSet.size() == 1;
+ // System.out.println(" hierarchyGraph.getSkeleteNodeSetReachTo(" + hNode + ")="
+ // + hierarchyGraph.getSkeleteNodeSetReachTo(hNode));
+
+ Set<HNode> reachToSet = hierarchyGraph.getSkeleteNodeSetReachTo(hNode);
+ for (Iterator iterator2 = reachToSet.iterator(); iterator2.hasNext();) {
+ HNode reachToNode = (HNode) iterator2.next();
+ aboveSet.add(scGraph.getCurrentHNode(reachToNode));
+ }
+
SCNode = aboveSet.iterator().next();
}
// update above set w.r.t the hierarchy graph with SC nodes
- // because the skeleton nodes in the origianl hierarchy graph may merged to a new node
+ // because the skeleton nodes in the original hierarchy graph may be merged to a new node
Set<HNode> endSet = new HashSet<HNode>();
for (Iterator iterator2 = aboveSet.iterator(); iterator2.hasNext();) {
HNode aboveNode = (HNode) iterator2.next();
- endSet.add(scGraph.getCurrentHNode(aboveNode));
+ endSet.add(hierarchyGraph.getCurrentHNode(aboveNode));
}
- dist = hierarchyGraph.computeDistance(hNode, endSet);
- System.out.println("##### " + hNode + "::dist=" + dist);
- // numNonSharedNodes = hierarchyGraph.countNonSharedNode(hNode, endSet);
+ trace = hierarchyGraph.computeDistance(hNode, endSet, combineSkeletonNodeSet);
- System.out.println(" COUNT-RESULT::node=" + hNode + " above=" + endSet + " distance="
- + dist + " SCNode=" + SCNode);
+ System.out.println(" COUNT-RESULT::start=" + hNode + " end=" + endSet + " trace="
+ + trace);
}
- // 3) convert the node m into a chain of nodes with the last node in the chain having m’s
+ // 3) convert the node m into a chain of nodes with the last node in the chain having m's
// outgoing edges.
Set<HNode> outgoingSCNodeSet = scGraph.getOutgoingNodeSet(SCNode);
System.out.println(" outgoing scnode set from " + SCNode + "=" + outgoingSCNodeSet);
outgoingLocNameSet.add(lattice.getBottomItem());
}
+ if (hNode.isCombinationNode()) {
+ System.out.println("make sure that the first node corresponds to the COMB node="
+ + startLocName);
+ LineIdentifier lineId = new LineIdentifier(startLocName, outgoingLocNameSet);
+ LinkedList<LocPair> list = getLineList(desc, lineId);
+ // make sure that the first node corresponds to the COMB node
+ if (list.size() <= 0) {
+ list.add(new LocPair());
+ }
+ LocPair firstPair = list.get(0);
+ firstPair.nonShared = startLocName;
+ }
+
// 4) If hnode is not a shared location, check if there already exists a local variable
// node that has distance d below m along this chain. If such a node
// does not exist, insert it.
String locName =
- getNewLocation(lattice, startLocName, outgoingLocNameSet, dist, hNode.isSharedNode());
+ getNewLocation(desc, startLocName, outgoingLocNameSet, trace, hNode.isSharedNode());
+
System.out.println(" ###hNode=" + hNode + "---->locName=" + locName);
locSummary.addMapHNodeNameToLocationName(hNode.getName(), locName);
}
}
+ insertLocalLocations(desc, lattice);
+
return lattice;
}
- private void addLocalLocation(SSJavaLattice<String> lattice, String localLoc) {
- if (!mapLatticeToLocalLocSet.containsKey(lattice)) {
- mapLatticeToLocalLocSet.put(lattice, new HashSet<String>());
- }
- mapLatticeToLocalLocSet.get(lattice).add(localLoc);
- }
+ private void insertLocalLocations(Descriptor desc, SSJavaLattice<String> lattice) {
- private boolean isLocalLocation(SSJavaLattice<String> lattice, String localLoc) {
- if (mapLatticeToLocalLocSet.containsKey(lattice)) {
- return mapLatticeToLocalLocSet.get(lattice).contains(localLoc);
- }
- return false;
- }
+ Map<LineIdentifier, LinkedList<LocPair>> map = getLineListMap(desc);
+ System.out.println("####MAP=" + map);
- public String getNewLocation(SSJavaLattice<String> lattice, String start, Set<String> endSet,
- int dist, boolean isShared) {
- System.out.println(" #GETNEWLOCATION:: start=" + start + " endSet=" + endSet + " dist="
- + dist + " isShared=" + isShared);
- // if (dist == -1) {
- // if (isShared) {
- // // if the node is a shared one, check if the next node is shared
- // // if not, need to insert a new shared node
- // return recur_getNewLocation(lattice, start, endSet, dist + 1, isShared);
- // } else {
- // return start;
- // }
- //
- // }
- return recur_getNewLocation(lattice, start, start, endSet, dist, isShared);
- }
+ Set<LineIdentifier> lineIdSet = map.keySet();
+ for (Iterator iterator = lineIdSet.iterator(); iterator.hasNext();) {
+ LineIdentifier lineId = (LineIdentifier) iterator.next();
- private String recur_getNewLocation(SSJavaLattice<String> lattice, String start, String cur,
- Set<String> endSet, int dist, boolean isShared) {
+ LinkedList<LocPair> list = map.get(lineId);
- System.out.println(" recur_getNewLocation cur=" + cur + " dist=" + dist);
+ String higherLocName = lineId.startLoc;
+ Set<String> endLocNameSet = lineId.lowerLocSet;
- if (dist == 0) {
- if (isShared) {
- // first check if there already exists a non-shared node at distance d
- if (!isLocalLocation(lattice, cur) && !start.equals(cur)) {
- // if not, need to insert a new local location at this point
- System.out.println("if not, need to insert a new local location at this point");
- String newLocName = "ILOC" + (LocationInference.locSeed++);
- Set<String> lowerSet = new HashSet<String>();
- lowerSet.addAll(lattice.get(cur));
- lattice.insertNewLocationBetween(cur, lowerSet, newLocName);
- addLocalLocation(lattice, newLocName);
-
- // assign the new local location to cur
- cur = newLocName;
- }
+ for (int i = 0; i < list.size(); i++) {
+ LocPair pair = list.get(i);
- Set<String> connectedSet = lattice.get(cur);
- if (connectedSet == null) {
- connectedSet = new HashSet<String>();
- }
- System.out.println("cur=" + cur + " connectedSet=" + connectedSet);
+ if (pair.nonShared != null) {
- // check if there already exists a shared node that has distance d + 1 on the chain
- boolean needToInsertSharedNode = false;
- if (connectedSet.equals(endSet)) {
- needToInsertSharedNode = true;
- } else {
- // in this case, the current node is in the middle of the chain
- assert connectedSet.size() == 1;
- String below = connectedSet.iterator().next();
- if (lattice.isSharedLoc(below)) {
- return below;
- } else {
- needToInsertSharedNode = true;
+ if (!lattice.getKeySet().contains(pair.nonShared)) {
+ lattice.insertNewLocationBetween(higherLocName, endLocNameSet, pair.nonShared);
}
+ higherLocName = pair.nonShared;
}
- if (needToInsertSharedNode) {
- // no shared local location at d+1, need to insert it!
- String newSharedLocName = "ILOC" + (LocationInference.locSeed++);
- Set<String> lowerSet = new HashSet<String>();
- lowerSet.addAll(connectedSet);
- lattice.insertNewLocationBetween(cur, lowerSet, newSharedLocName);
- lattice.addSharedLoc(newSharedLocName);
- addLocalLocation(lattice, newSharedLocName);
- System.out.println(" INSERT NEW SHARED LOC=" + newSharedLocName);
- cur = newSharedLocName;
+ if (pair.shared != null) {
+ if (!lattice.getKeySet().contains(pair.shared)) {
+ lattice.insertNewLocationBetween(higherLocName, endLocNameSet, pair.shared);
+ lattice.addSharedLoc(pair.shared);
+ }
+ higherLocName = pair.shared;
}
- return cur;
-
- } else {
-
- return cur;
- // if the node is not shared, check if a node at distance d is a local or combination node
- // Set<String> connectedSet = lattice.get(cur);
- // if (connectedSet == null) {
- // connectedSet = new HashSet<String>();
- // }
- // System.out
- // .println("if the node is not shared, check if a node at distance d is a local or combination node connectedSet="
- // + connectedSet);
- // // if (!start.equals(cur) && (cur.equals(lattice.getTopItem()) ||
- // connectedSet.equals(endSet))) {
- // // if not, need to insert a new local location at this point
- // System.out.println("NEED TO INSERT A NEW LOCAL LOC connectedSet=" + connectedSet);
- // String newLocName = "ILOC" + (LocationInference.locSeed++);
- // Set<String> lowerSet = new HashSet<String>();
- // lowerSet.addAll(connectedSet);
- // lattice.insertNewLocationBetween(cur, lowerSet, newLocName);
- // addLocalLocation(lattice, newLocName);
- // return newLocName;
- // } else {
- // return cur;
- // }
}
- }
- Set<String> connectedSet = lattice.get(cur);
- if (connectedSet == null) {
- connectedSet = new HashSet<String>();
}
- System.out.println("cur=" + cur + " connected set=" + connectedSet);
- if (cur.equals(lattice.getTopItem()) || connectedSet.equals(endSet)) {
- // if not, need to insert a new local location at this point
- System.out.println("NEED TO INSERT A NEW LOCAL LOC FOR NEXT connectedSet=" + connectedSet);
- String newLocName = "ILOC" + (LocationInference.locSeed++);
- Set<String> lowerSet = new HashSet<String>();
- lowerSet.addAll(connectedSet);
- lattice.insertNewLocationBetween(cur, lowerSet, newLocName);
- addLocalLocation(lattice, newLocName);
- cur = newLocName;
- } else {
- // in this case, the current node is in the middle of the chain
- assert connectedSet.size() == 1;
- cur = connectedSet.iterator().next();
- }
+ }
- if (!lattice.isSharedLoc(cur)) {
- dist--;
+ private void addLocalLocation(SSJavaLattice<String> lattice, String localLoc) {
+ if (!mapLatticeToLocalLocSet.containsKey(lattice)) {
+ mapLatticeToLocalLocSet.put(lattice, new HashSet<String>());
}
- return recur_getNewLocation(lattice, start, cur, endSet, dist, isShared);
-
+ mapLatticeToLocalLocSet.get(lattice).add(localLoc);
}
- public String getNewLocation2(SSJavaLattice<String> lattice, String start, Set<String> endSet,
- int dist, boolean isShared) {
- System.out.println(" #GETNEWLOCATION:: start=" + start + " endSet=" + endSet + " dist="
- + dist + " isShared=" + isShared);
- if (dist == -1) {
- if (isShared) {
- // if the node is a shared one, check if the next node is shared
- // if not, need to insert a new shared node
- return recur_getNewLocation2(lattice, start, endSet, dist + 1, isShared);
- } else {
- return start;
- }
-
+ private boolean isLocalLocation(SSJavaLattice<String> lattice, String localLoc) {
+ if (mapLatticeToLocalLocSet.containsKey(lattice)) {
+ return mapLatticeToLocalLocSet.get(lattice).contains(localLoc);
}
- return recur_getNewLocation2(lattice, start, endSet, dist, isShared);
+ return false;
}
- private String recur_getNewLocation2(SSJavaLattice<String> lattice, String cur,
- Set<String> endSet, int dist, boolean isShared) {
- Set<String> connectedSet = lattice.get(cur);
- if (connectedSet == null) {
- connectedSet = new HashSet<String>();
+ public Map<InterLocItem, String> getInterLocMap(Descriptor desc) {
+ if (!mapDescToInterLocMap.containsKey(desc)) {
+ mapDescToInterLocMap.put(desc, new HashMap<InterLocItem, String>());
}
+ return mapDescToInterLocMap.get(desc);
+ }
- System.out.println(" recur_getNewLocation::cur=" + cur + " dist=" + dist
- + " connectedSet=" + connectedSet + " endSet=" + endSet);
-
- if (dist == 0 && isShared) {
- // if the node is shared,
- // check if there already exists a shared node that has distance d + 1 on the chain
- if ((cur.equals(lattice.getTopItem()) && connectedSet.containsAll(endSet))
- || connectedSet.equals(endSet)) {
- // need to insert a new shared location
- // it is done after this if statement
- } else {
- assert connectedSet.size() == 1;
- String below = connectedSet.iterator().next();
- if (lattice.isSharedLoc(below)) {
- return below;
- }
- }
-
- // need to insert a new shared location
- Set<String> newChildSet = new HashSet<String>();
- newChildSet.addAll(connectedSet);
-
- String newLocName = "ILOC" + (LocationInference.locSeed++);
- for (Iterator iterator = newChildSet.iterator(); iterator.hasNext();) {
- String outNode = (String) iterator.next();
- lattice.put(newLocName, outNode);
- }
- lattice.get(cur).clear();
- lattice.put(cur, newLocName);
-
- System.out.println(" INSERT NEW SHARED NODE=" + newLocName + " above=" + cur
- + " below=" + lattice.get(newLocName));
-
- lattice.addSharedLoc(newLocName);
-
- return newLocName;
-
+ public Map<LineIdentifier, LinkedList<LocPair>> getLineListMap(Descriptor desc) {
+ if (!mapDescToLineListMap.containsKey(desc)) {
+ mapDescToLineListMap.put(desc, new HashMap<LineIdentifier, LinkedList<LocPair>>());
}
+ return mapDescToLineListMap.get(desc);
+ }
- String next;
+ public LinkedList<LocPair> getLineList(Descriptor desc, LineIdentifier lineId) {
+ Map<LineIdentifier, LinkedList<LocPair>> map = getLineListMap(desc);
+ if (!map.containsKey(lineId)) {
+ map.put(lineId, new LinkedList<LocPair>());
+ }
+ return map.get(lineId);
+ }
- if (cur.equals(lattice.getTopItem()) || connectedSet.equals(endSet) /* || endSet.isEmpty() */) {
+ private String generateNewLocName() {
+ String newLocName = "ILOC" + (LocationInference.locSeed++);
+ System.out.println("newLocName=" + newLocName);
+ return newLocName;
+ }
- // if ( (cur.equals(lattice.getTopItem()) && connectedSet.containsAll(endSet))
- // || connectedSet.equals(endSet)) {
+ public String getNewLocation(Descriptor desc, String start, Set<String> endSet,
+ Stack<String> trace, boolean isShared) {
- // need to insert a new location
- String newLocName = "ILOC" + (LocationInference.locSeed++);
- connectedSet.clear();
- lattice.put(cur, newLocName);
+ System.out.println(" #GetNewLocation start=" + start + " endSet=" + endSet + " trace="
+ + trace);
- System.out.println("#INSERT NEW RELATION cur=" + cur + " newLocName=" + newLocName + "::"
- + lattice.get(cur));
+ LineIdentifier lineId = new LineIdentifier(start, endSet);
+ LinkedList<LocPair> list = getLineList(desc, lineId);
- for (Iterator iterator = endSet.iterator(); iterator.hasNext();) {
- String endNode = (String) iterator.next();
- lattice.put(newLocName, endNode);
- }
+ int locPairIdx = trace.size() - 1;
- next = newLocName;
- System.out.println(" INSERT NEW NODE=" + newLocName + " above=" + cur + " below="
- + endSet);
- } else {
- assert connectedSet.size() == 1;
- next = connectedSet.iterator().next();
- if (lattice.isSharedLoc(next)) {
- return recur_getNewLocation2(lattice, next, endSet, dist, isShared);
+ LocPair pair;
+ if (list.size() > locPairIdx) {
+ // there already exsits a list of nodes up to the current one
+ pair = list.get(locPairIdx);
+ // check if we need to add a new shared or non-shred node to the pair
+ if (isShared) {
+ if (pair.shared == null) {
+ pair.shared = generateNewLocName();
+ }
+ return pair.shared;
+ } else {
+ if (pair.nonShared == null) {
+ pair.nonShared = generateNewLocName();
+ }
+ return pair.nonShared;
}
- }
- System.out.println(" next=" + next);
- if (dist == 0) {
- return next;
} else {
- if (!lattice.isSharedLoc(next)) {
- dist--;
- }
- return recur_getNewLocation2(lattice, next, endSet, dist, isShared);
+ // we need to set up a chain of intermediate nodes to the current one.
+ return recur_getNewLocation(0, list, trace);
}
}
- public SSJavaLattice<String> insertIntermediateNodesToStraightLine2(Descriptor desc,
- SSJavaLattice<String> skeletonLattice) {
- // copy nodes/edges from the parent method/class if possible
- SSJavaLattice<String> lattice = skeletonLattice.clone();
-
- Descriptor parentDesc = getParent(desc);
- if (parentDesc != null) {
- SSJavaLattice<String> parentLattice = infer.getLattice(parentDesc);
-
- Map<String, Set<String>> parentMap = parentLattice.getTable();
- Set<String> parentKeySet = parentMap.keySet();
- for (Iterator iterator = parentKeySet.iterator(); iterator.hasNext();) {
- String parentKey = (String) iterator.next();
- Set<String> parentValueSet = parentMap.get(parentKey);
- for (Iterator iterator2 = parentValueSet.iterator(); iterator2.hasNext();) {
- String value = (String) iterator2.next();
- lattice.put(parentKey, value);
- }
- }
+ private String recur_getNewLocation(int idx, LinkedList<LocPair> list, Stack<String> trace) {
- Set<String> parentSharedLocSet = parentLattice.getSharedLocSet();
- for (Iterator iterator = parentSharedLocSet.iterator(); iterator.hasNext();) {
- String parentSharedLoc = (String) iterator.next();
- lattice.addSharedLoc(parentSharedLoc);
- }
+ String curType = trace.pop();
+ boolean isCurShared = false;
+ if (curType.equals("S")) {
+ isCurShared = true;
}
- // ////
-
- // perform DFS that starts from each skeleton/combination node and ends by another
- // skeleton/combination node
-
- mapSharedNodeToTripleItem.clear();
-
- HierarchyGraph simpleGraph = infer.getSimpleHierarchyGraph(desc);
- HierarchyGraph scGraph = infer.getSkeletonCombinationHierarchyGraph(desc);
- LocationSummary locSummary = infer.getLocationSummary(desc);
-
- Set<HNode> visited = new HashSet<HNode>();
-
- Set<HNode> nodeSet = simpleGraph.getNodeSet();
-
- Map<TripleItem, String> mapIntermediateLoc = getIntermediateLocMap(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);
-
- if (node.isSkeleton() && (!visited.contains(node))) {
- visited.add(node);
-
- Set<HNode> outSet = simpleGraph.getOutgoingNodeSet(node);
- for (Iterator iterator2 = outSet.iterator(); iterator2.hasNext();) {
- HNode outNode = (HNode) iterator2.next();
-
- if (!outNode.isSkeleton()) {
- if (outNode.isCombinationNode()) {
- if (visited.containsAll(simpleGraph.getIncomingNodeSet(outNode))) {
- // if (needToExpandCombinationNode(desc, 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);
- HNode startNode = scGraph.getCurrentHNode(node);
-
- // if (node.getDescriptor() != null) {
- // // node is a skeleton node and it might be merged into another node in the SC
- // graph.
- // startNode = scGraph.getHNode(node.getDescriptor());
- // } else {
- // // this node has already been merged before the SC graph.
- // startNode = node;
- // }
-
- // TODO
- // Set<HNode> endNodeSetFromSimpleGraph =
- // simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(outNode, null);
- // Set<HNode> endCombNodeSet = new HashSet<HNode>();
- // for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator();
- // iterator3.hasNext();) {
- // HNode endNode = (HNode) iterator3.next();
- // endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode));
- // }
-
- Set<HNode> endCombNodeSet = scGraph.getOutgoingNodeSet(startNode);
-
- // 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);
- } 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(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
- if (simpleGraph.getIncomingNodeSet(node).size() == 0) {
-
- // this node will be directly connected to the TOP location
- // start adding the following nodes from this node
-
- Set<HNode> endNodeSetFromSimpleGraph =
- simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(node, null);
-
- 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);
- HNode startNode = LocationInference.TOPHNODE;
- 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);
- }
-
- }
-
- }
+ if (list.size() <= idx) {
+ // need to insert a new pair for the idx
+ list.add(new LocPair());
}
- // add shared locations
- Set<HNode> sharedNodeSet = mapSharedNodeToTripleItem.keySet();
- for (Iterator iterator = sharedNodeSet.iterator(); iterator.hasNext();) {
- HNode sharedNode = (HNode) iterator.next();
- TripleItem item = mapSharedNodeToTripleItem.get(sharedNode);
- String nonSharedLocName = mapIntermediateLoc.get(item);
-
- System.out.println("sharedNode=" + sharedNode + " locName=" + nonSharedLocName);
-
- String newLocName;
- if (locSummary.getHNodeNameSetByLatticeLoationName(nonSharedLocName) != null
- && !lattice.isSharedLoc(nonSharedLocName)) {
- // need to generate a new shared location in the lattice, which is one level lower than the
- // 'locName' location
- newLocName = "ILOC" + (LocationInference.locSeed++);
-
- // Set<String> aboveElementSet = getAboveElementSet(lattice, locName);
- Set<String> belowElementSet = new HashSet<String>();
- belowElementSet.addAll(lattice.get(nonSharedLocName));
-
- System.out.println("nonSharedLocName=" + nonSharedLocName + " belowElementSet="
- + belowElementSet + " newLocName=" + newLocName);
+ // here, the list already has a pair for the idx
+ LocPair pair = list.get(idx);
+ if (isCurShared && pair.shared == null) {
+ pair.shared = generateNewLocName();
+ } else if (!isCurShared && pair.nonShared == null) {
+ pair.nonShared = generateNewLocName();
+ }
- lattice.insertNewLocationBetween(nonSharedLocName, belowElementSet, newLocName);
+ if (trace.isEmpty()) {
+ if (isCurShared) {
+ return pair.shared;
} else {
- newLocName = nonSharedLocName;
+ return pair.nonShared;
}
-
- lattice.addSharedLoc(newLocName);
- HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc);
- Set<Descriptor> descSet = graph.getDescSetOfNode(sharedNode);
- for (Iterator iterator2 = descSet.iterator(); iterator2.hasNext();) {
- Descriptor d = (Descriptor) iterator2.next();
- locSummary.addMapHNodeNameToLocationName(d.getSymbol(), newLocName);
- }
- locSummary.addMapHNodeNameToLocationName(sharedNode.getName(), newLocName);
-
}
- return lattice;
-
+ idx++;
+ return recur_getNewLocation(idx, list, trace);
}
private Set<String> getAboveElementSet(SSJavaLattice<String> lattice, String loc) {
}
+class LocPair {
+ public String nonShared;
+ public String shared;
+
+ public int hashCode() {
+ int h = 0;
+ if (nonShared != null) {
+ h = nonShared.hashCode();
+ }
+ if (shared != null) {
+ h = shared.hashCode();
+ }
+ return h;
+ }
+
+ public boolean equals(Object obj) {
+
+ if (obj instanceof LocPair) {
+ LocPair in = (LocPair) obj;
+
+ if ((nonShared == null && in.nonShared == null)
+ || (nonShared != null && nonShared.equals(in.nonShared))) {
+
+ if ((shared == null && in.shared == null) || (shared != null && shared.equals(in.shared))) {
+ return true;
+ }
+
+ }
+
+ }
+
+ return false;
+ }
+
+ public String toString() {
+ String rtr = "<" + nonShared + "," + shared + ">";
+ return rtr;
+ }
+}
+
+class LineIdentifier {
+ public String startLoc;
+ public Set<String> lowerLocSet;
+
+ public LineIdentifier(String s, Set<String> lSet) {
+ startLoc = s;
+ lowerLocSet = lSet;
+ }
+
+ public int hashCode() {
+ int h = 0;
+ h = startLoc.hashCode();
+ return h + lowerLocSet.hashCode();
+ }
+
+ public boolean equals(Object obj) {
+
+ if (obj instanceof LineIdentifier) {
+ LineIdentifier in = (LineIdentifier) obj;
+ if (startLoc.equals(in.startLoc) && lowerLocSet.equals(in.lowerLocSet)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public String toString() {
+ String rtr = startLoc + "->" + lowerLocSet;
+ return rtr;
+ }
+
+}
+
+class InterLocItem {
+ public String startLoc;
+ public Set<String> lowerLocSet;
+ public int idx;
+
+ public InterLocItem(String h, Set<String> l, int i) {
+ startLoc = h;
+ lowerLocSet = l;
+ idx = i;
+ }
+
+ public int hashCode() {
+
+ int h = 0;
+ if (startLoc != null) {
+ h = startLoc.hashCode();
+ }
+
+ return h + lowerLocSet.hashCode() + idx;
+ }
+
+ public boolean equals(Object obj) {
+
+ if (obj instanceof InterLocItem) {
+ InterLocItem in = (InterLocItem) obj;
+ if ((startLoc == null || (startLoc != null && startLoc.equals(in.startLoc)))
+ && lowerLocSet.equals(in.lowerLocSet) && idx == in.idx) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public String toString() {
+ String rtr = startLoc + "-" + idx + "->" + lowerLocSet;
+ if (idx % 2 != 0) {
+ rtr += " S";
+ }
+ return rtr;
+ }
+}
+
class TripleItem {
public HNode higherNode;
public Set<HNode> lowerNodeSet;
}
return rtr;
}
+
}
projects / IRC.git / blobdiff