import IR.State;
import IR.SymbolTable;
import IR.TypeDescriptor;
+import IR.TypeUtil;
import IR.VarDescriptor;
import IR.Tree.ArrayAccessNode;
import IR.Tree.AssignmentNode;
public class LocationInference {
+ static int COUNT = 0;
+
State state;
SSJavaAnalysis ssjava;
+ TypeUtil tu;
List<ClassDescriptor> temp_toanalyzeList;
List<MethodDescriptor> temp_toanalyzeMethodList;
Map<MethodDescriptor, FlowGraph> mapMethodDescriptorToFlowGraph;
LinkedList<MethodDescriptor> toanalyze_methodDescList;
+ Set<ClassDescriptor> toanalyze_classDescSet;
+
+ // InheritanceTree<ClassDescriptor> inheritanceTree;
// map a method descriptor to its set of parameter descriptors
Map<MethodDescriptor, Set<Descriptor>> mapMethodDescriptorToParamDescSet;
// keep current descriptors to visit in fixed-point interprocedural analysis,
private Stack<MethodDescriptor> methodDescriptorsToVisitStack;
+ // map a descriptor to a naive lattice
+ private Map<Descriptor, SSJavaLattice<String>> desc2naiveLattice;
+
// map a class descriptor to a field lattice
private Map<ClassDescriptor, SSJavaLattice<String>> cd2lattice;
private Map<MethodDescriptor, Boolean> mapMethodDescriptorToCompositeReturnCase;
+ private Map<MethodDescriptor, MethodDescriptor> mapMethodDescToHighestOverriddenMethodDesc;
+
+ private Map<MethodDescriptor, Set<MethodDescriptor>> mapHighestOverriddenMethodDescToMethodDescSet;
+
+ private Map<MethodDescriptor, NTuple<Descriptor>> mapHighestOverriddenMethodDescToReturnLocTuple;
+
+ private Map<MethodDescriptor, NTuple<Descriptor>> mapHighestOverriddenMethodDescToPCLocTuple;
+
+ private Map<MethodDescriptor, Set<NTuple<Descriptor>>> mapHighestOverriddenMethodDescToSetLowerThanPCLoc;
+
+ private Map<MethodDescriptor, Set<NTuple<Descriptor>>> mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc;
+
public static final String GLOBALLOC = "GLOBALLOC";
public static final String INTERLOC = "INTERLOC";
private Stack<String> arrayAccessNodeStack;
- public LocationInference(SSJavaAnalysis ssjava, State state) {
+ private ClassDescriptor rootClassDescriptor;
+
+ private BuildLattice buildLattice;
+
+ public static int numLocationsSInfer = 0;
+ public static int numLocationsNaive = 0;
+
+ public LocationInference(SSJavaAnalysis ssjava, State state, TypeUtil tu) {
this.ssjava = ssjava;
this.state = state;
+ this.tu = tu;
+ this.toanalyze_classDescSet = new HashSet<ClassDescriptor>();
this.temp_toanalyzeList = new ArrayList<ClassDescriptor>();
this.temp_toanalyzeMethodList = new ArrayList<MethodDescriptor>();
this.mapMethodDescriptorToFlowGraph = new HashMap<MethodDescriptor, FlowGraph>();
this.cd2lattice = new HashMap<ClassDescriptor, SSJavaLattice<String>>();
this.md2lattice = new HashMap<MethodDescriptor, SSJavaLattice<String>>();
+ this.desc2naiveLattice = new HashMap<Descriptor, SSJavaLattice<String>>();
+
this.methodDescriptorsToVisitStack = new Stack<MethodDescriptor>();
this.mapMethodDescriptorToMethodInvokeNodeSet =
new HashMap<MethodDescriptor, Set<MethodInvokeNode>>();
this.mapMethodDescriptorToCompositeReturnCase = new HashMap<MethodDescriptor, Boolean>();
+ mapMethodDescToHighestOverriddenMethodDesc = new HashMap<MethodDescriptor, MethodDescriptor>();
+
+ mapHighestOverriddenMethodDescToSetLowerThanPCLoc =
+ new HashMap<MethodDescriptor, Set<NTuple<Descriptor>>>();
+
+ mapHighestOverriddenMethodDescToMethodDescSet =
+ new HashMap<MethodDescriptor, Set<MethodDescriptor>>();
+
+ mapHighestOverriddenMethodDescToReturnLocTuple =
+ new HashMap<MethodDescriptor, NTuple<Descriptor>>();
+
+ mapHighestOverriddenMethodDescToPCLocTuple =
+ new HashMap<MethodDescriptor, NTuple<Descriptor>>();
+
+ mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc =
+ new HashMap<MethodDescriptor, Set<NTuple<Descriptor>>>();
+
+ this.buildLattice = new BuildLattice(this);
+
}
public void setupToAnalyze() {
_debug_writeFlowGraph();
- // System.exit(0);
+ buildInheritanceTree();
+ calculateReturnPCLocInheritance();
constructHierarchyGraph();
- debug_writeHierarchyDotFiles();
+ addInheritanceConstraintsToHierarchyGraph();
- // System.exit(0);
+ debug_writeHierarchyDotFiles();
simplifyHierarchyGraph();
debug_writeSkeletonCombinationHierarchyDotFiles();
- buildLattice();
+ buildLatticeInheritanceTree();
+ // buildLattice();
debug_writeLattices();
generateAnnoatedCode();
+ for (Iterator iterator = cd2lattice.keySet().iterator(); iterator.hasNext();) {
+ ClassDescriptor cd = (ClassDescriptor) iterator.next();
+ SSJavaLattice<String> lattice = getLattice(cd);
+ HierarchyGraph hg = mapDescriptorToHierarchyGraph.get(cd);
+ // System.out.println("~~~\t" + cd + "\t" + lattice.getKeySet().size() + "\t"
+ // + hg.getNodeSet().size());
+ }
+
+ for (Iterator iterator = md2lattice.keySet().iterator(); iterator.hasNext();) {
+ MethodDescriptor md = (MethodDescriptor) iterator.next();
+ SSJavaLattice<String> locOrder = getLattice(md);
+ // writeLatticeDotFile(md.getClassDesc(), md, getMethodLattice(md));
+ HierarchyGraph hg = mapDescriptorToHierarchyGraph.get(md);
+ // System.out.println("~~~\t" + md.getClassDesc() + "_" + md + "\t"
+ // + locOrder.getKeySet().size() + "\t" + hg.getNodeSet().size());
+ }
+
+ if (state.SSJAVA_INFER_NAIVE_WRITEDOTS) {
+ System.out.println("The number of elements: Naive=" + numLocationsNaive);
+ }
+ System.out.println("The number of elements: SInfer=" + numLocationsSInfer);
+
System.exit(0);
}
+ private void calculateReturnPCLocInheritance() {
+ calculateHighestPCLocInheritance();
+ calculateLowestReturnLocInheritance();
+ updateFlowGraphPCReturnLocInheritance();
+ }
+
+ private void updateFlowGraphPCReturnLocInheritance() {
+
+ Set<MethodDescriptor> keySet = mapHighestOverriddenMethodDescToMethodDescSet.keySet();
+ for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+ MethodDescriptor highestMethodDesc = (MethodDescriptor) iterator.next();
+
+ if (mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc).size() == 1) {
+ continue;
+ }
+
+ Set<MethodDescriptor> methodDescSet =
+ mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc);
+
+ NTuple<Descriptor> highestPCLocDescTuple =
+ mapHighestOverriddenMethodDescToPCLocTuple.get(highestMethodDesc);
+
+ NTuple<Descriptor> highestRETURNLocDescTuple =
+ mapHighestOverriddenMethodDescToReturnLocTuple.get(highestMethodDesc);
+
+ // System.out.println("\n$$$$$$$$$$$$$$$$updateFlowGraphPCReturnLocInheritance="
+ // + highestMethodDesc);
+ // System.out.println("-----highestPCLoc=" + highestPCLocDescTuple);
+ // System.out.println("-----highestRETURNLoc=" + highestRETURNLocDescTuple);
+
+ for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) {
+ MethodDescriptor md = (MethodDescriptor) iterator2.next();
+ // System.out.println("\n --------MD=" + md);
+ FlowGraph flowGraph = getFlowGraph(md);
+
+ MethodSummary summary = getMethodSummary(md);
+ CompositeLocation curPCLoc = summary.getPCLoc();
+ NTuple<Descriptor> curPCDescTuple = translateToDescTuple(curPCLoc.getTuple());
+ // System.out.println("md=" + md + " curPCLoc=" + curPCLoc);
+ // System.out.println("highestPCLoc=" + highestPCLocDescTuple);
+
+ if (highestPCLocDescTuple == null) {
+ // this case: PCLOC is top
+ // System.out.println("###SET PCLOC AS TOP");
+ if (curPCDescTuple != null && !curPCLoc.get(0).isTop()) {
+ FlowNode pcFlowNode = flowGraph.getFlowNode(curPCDescTuple);
+ flowGraph.removeNode(pcFlowNode);
+ }
+ summary.setPCLoc(new CompositeLocation(new Location(md, Location.TOP)));
+ } else {
+ NTuple<Descriptor> newPCDescTuple = new NTuple<Descriptor>();
+ if (highestPCLocDescTuple.size() == 1) {
+ newPCDescTuple.add(highestPCLocDescTuple.get(0));
+ } else {
+ newPCDescTuple.add(md.getThis());
+ newPCDescTuple.add(highestPCLocDescTuple.get(1));
+ }
+ if (!curPCDescTuple.equals(newPCDescTuple)) {
+ FlowNode pcFlowNode = flowGraph.getFlowNode(curPCDescTuple);
+ flowGraph.updateTuple(pcFlowNode, newPCDescTuple);
+ // flowGraph.removeNode(pcFlowNode);
+ Set<NTuple<Descriptor>> descSetLowerThanPCLoc =
+ mapHighestOverriddenMethodDescToSetLowerThanPCLoc.get(highestMethodDesc);
+ for (Iterator iterator3 = descSetLowerThanPCLoc.iterator(); iterator3.hasNext();) {
+ NTuple<Descriptor> lowerNTuple = (NTuple<Descriptor>) iterator3.next();
+ flowGraph.addValueFlowEdge(newPCDescTuple, lowerNTuple);
+ }
+ CompositeLocation newPCCompLoc =
+ new CompositeLocation(translateToLocTuple(md, newPCDescTuple));
+ summary.setPCLoc(newPCCompLoc);
+ }
+
+ }
+
+ // update return loc
+ if (highestRETURNLocDescTuple != null) {
+ CompositeLocation curRETURNLoc = summary.getRETURNLoc();
+ NTuple<Descriptor> curReturnDescTuple = translateToDescTuple(curRETURNLoc.getTuple());
+
+ if (!curReturnDescTuple.equals(highestRETURNLocDescTuple)) {
+ // handle the case that RETURNLOC is started with 'this'...
+ NTuple<Descriptor> newRETURNLocDescTuple = new NTuple<Descriptor>();
+ if (highestRETURNLocDescTuple.size() == 1) {
+ newRETURNLocDescTuple.add(highestRETURNLocDescTuple.get(0));
+ } else {
+ newRETURNLocDescTuple.add(md.getThis());
+ newRETURNLocDescTuple.add(highestRETURNLocDescTuple.get(1));
+ }
+
+ FlowNode returnFlowNode = flowGraph.getFlowNode(curReturnDescTuple);
+ flowGraph.updateTuple(returnFlowNode, newRETURNLocDescTuple);
+
+ Set<NTuple<Descriptor>> descSetHigherThanRETURNLoc =
+ mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc.get(highestMethodDesc);
+ for (Iterator iterator3 = descSetHigherThanRETURNLoc.iterator(); iterator3.hasNext();) {
+ NTuple<Descriptor> higherNTuple = (NTuple<Descriptor>) iterator3.next();
+ flowGraph.addValueFlowEdge(higherNTuple, newRETURNLocDescTuple);
+ }
+
+ CompositeLocation newRETURNLocCompLoc =
+ new CompositeLocation(translateToLocTuple(md, newRETURNLocDescTuple));
+ summary.setRETURNLoc(newRETURNLocCompLoc);
+ }
+ }
+ }
+ }
+ }
+
+ private void calculateHighestPCLocInheritance() {
+
+ Set<MethodDescriptor> keySet = mapHighestOverriddenMethodDescToMethodDescSet.keySet();
+
+ Map<MethodDescriptor, Integer> mapMethodDescToParamCount =
+ new HashMap<MethodDescriptor, Integer>();
+
+ next: for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+ MethodDescriptor highestMethodDesc = (MethodDescriptor) iterator.next();
+
+ NTuple<Descriptor> tempTuple = null;
+
+ if (getMethodSummary(highestMethodDesc).getPCLoc() != null) {
+
+ Set<MethodDescriptor> methodDescSet =
+ mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc);
+
+ if (methodDescSet.size() > 1) {
+ // System.out.println("---method desc set=" + methodDescSet + " from=" +
+ // highestMethodDesc);
+ } else {
+ continue next;
+ }
+
+ for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) {
+ MethodDescriptor md = (MethodDescriptor) iterator2.next();
+
+ FlowGraph flowGraph = getFlowGraph(md);
+ if (flowGraph == null) {
+ continue;
+ }
+ Set<FlowNode> paramNodeSet = flowGraph.getParamFlowNodeSet();
+ // System.out.println("###md=" + md + " paramNodeSet=" + paramNodeSet);
+
+ CompositeLocation pcLOC = getMethodSummary(md).getPCLoc();
+ // System.out.println("---pcLOC=" + pcLOC);
+
+ if (md.equals(highestMethodDesc)) {
+ mapHighestOverriddenMethodDescToPCLocTuple.put(highestMethodDesc,
+ translateToDescTuple(pcLOC.getTuple()));
+ }
+
+ if (!pcLOC.get(0).isTop()) {
+
+ FlowNode pcFlowNode = flowGraph.getFlowNode(translateToDescTuple(pcLOC.getTuple()));
+
+ int count = 0;
+ for (Iterator iterator3 = paramNodeSet.iterator(); iterator3.hasNext();) {
+ FlowNode paramNode = (FlowNode) iterator3.next();
+ if (flowGraph.getReachableSetFrom(pcFlowNode.getCurrentDescTuple().subList(0, 1))
+ .contains(paramNode)) {
+ count++;
+ }
+ }
+ mapMethodDescToParamCount.put(md, count);
+
+ } else {
+
+ // the PC location is top
+ // if one of pcloc among the method inheritance chain has the TOP,
+ // all methods in the same chain should have the TOP.
+ mapHighestOverriddenMethodDescToPCLocTuple.remove(highestMethodDesc);
+ // System.out.println("highest=" + highestMethodDesc + " HIGHEST PCLOC="
+ // + mapHighestOverriddenMethodDescToPCLocTuple.get(highestMethodDesc));
+
+ Set<NTuple<Descriptor>> descTupleSetLowerThanPC = new HashSet<NTuple<Descriptor>>();
+ for (Iterator iterator3 = paramNodeSet.iterator(); iterator3.hasNext();) {
+ FlowNode flowNode = (FlowNode) iterator3.next();
+ descTupleSetLowerThanPC.add(flowNode.getCurrentDescTuple());
+ }
+ mapHighestOverriddenMethodDescToSetLowerThanPCLoc.put(highestMethodDesc,
+ descTupleSetLowerThanPC);
+
+ continue next;
+ }
+ }
+
+ // identify which method in the inheritance chain has the highest PCLOC
+ // basically, finds a method that has the highest count or TOP location
+ int highestCount = -1;
+ MethodDescriptor methodDescHighestCount = null;
+ for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) {
+ MethodDescriptor methodDesc = (MethodDescriptor) iterator2.next();
+ if (mapMethodDescToParamCount.containsKey(methodDesc)) {
+ int curCount = mapMethodDescToParamCount.get(methodDesc).intValue();
+ if (highestCount < curCount) {
+ highestCount = curCount;
+ methodDescHighestCount = methodDesc;
+ }
+ }
+ }
+
+ if (methodDescHighestCount != null) {
+ FlowGraph flowGraph = getFlowGraph(methodDescHighestCount);
+ CompositeLocation pcLOC = getMethodSummary(methodDescHighestCount).getPCLoc();
+ FlowNode pcFlowNode = flowGraph.getFlowNode(translateToDescTuple(pcLOC.getTuple()));
+ Set<FlowNode> reachableSet =
+ flowGraph.getReachableSetFrom(pcFlowNode.getCurrentDescTuple().subList(0, 1));
+
+ Set<FlowNode> reachableParamNodeSet = new HashSet<FlowNode>();
+ for (Iterator iterator3 = reachableSet.iterator(); iterator3.hasNext();) {
+ FlowNode flowNode = (FlowNode) iterator3.next();
+ if (flowGraph.isParameter(flowNode.getCurrentDescTuple())) {
+ reachableParamNodeSet.add(flowNode);
+ }
+
+ }
+
+ Set<NTuple<Descriptor>> descTupleSetLowerThanPC = new HashSet<NTuple<Descriptor>>();
+ for (Iterator iterator2 = reachableParamNodeSet.iterator(); iterator2.hasNext();) {
+ FlowNode flowNode = (FlowNode) iterator2.next();
+ descTupleSetLowerThanPC.add(flowNode.getCurrentDescTuple());
+ }
+
+ // mapHighestOverriddenMethodDescToPCLocTuple.remove(highestMethodDesc);
+ mapHighestOverriddenMethodDescToSetLowerThanPCLoc.put(highestMethodDesc,
+ descTupleSetLowerThanPC);
+ }
+
+ }
+
+ // System.out.println("####################################");
+ // System.out.println(" highest=" + highestMethodDesc + " HIGHEST PCLOC="
+ // + mapHighestOverriddenMethodDescToPCLocTuple.get(highestMethodDesc));
+ // System.out.println(" setLowerThanPCLoc="
+ // + mapHighestOverriddenMethodDescToSetLowerThanPCLoc.get(highestMethodDesc));
+ }
+
+ }
+
+ private void calculateLowestReturnLocInheritance() {
+
+ Set<MethodDescriptor> keySet = mapHighestOverriddenMethodDescToMethodDescSet.keySet();
+
+ Map<MethodDescriptor, Integer> mapMethodDescToParamCount =
+ new HashMap<MethodDescriptor, Integer>();
+
+ next: for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+ MethodDescriptor highestMethodDesc = (MethodDescriptor) iterator.next();
+
+ Set<MethodDescriptor> methodDescSet =
+ mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc);
+
+ if (methodDescSet.size() > 1 && getMethodSummary(highestMethodDesc).getRETURNLoc() != null) {
+ } else {
+ continue next;
+ }
+
+ for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) {
+ MethodDescriptor md = (MethodDescriptor) iterator2.next();
+
+ FlowGraph flowGraph = getFlowGraph(md);
+ Set<FlowNode> paramNodeSet = flowGraph.getParamFlowNodeSet();
+
+ CompositeLocation returnLoc = getMethodSummary(md).getRETURNLoc();
+
+ FlowNode returnFlowNode = flowGraph.getFlowNode(translateToDescTuple(returnLoc.getTuple()));
+
+ int count = 0;
+ for (Iterator iterator3 = paramNodeSet.iterator(); iterator3.hasNext();) {
+ FlowNode paramNode = (FlowNode) iterator3.next();
+ if (flowGraph.getReachableSetFrom(paramNode.getCurrentDescTuple().subList(0, 1))
+ .contains(returnFlowNode)) {
+ count++;
+ }
+ }
+ mapMethodDescToParamCount.put(md, count);
+ // System.out.println("###returnLoc=" + returnLoc + " count higher=" + count);
+ }
+
+ // identify which method in the inheritance chain has the highest PCLOC
+ // basically, finds a method that has the highest count or TOP location
+ int highestCount = -1;
+ MethodDescriptor methodDescHighestCount = null;
+ for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) {
+ MethodDescriptor methodDesc = (MethodDescriptor) iterator2.next();
+ int curCount = mapMethodDescToParamCount.get(methodDesc).intValue();
+ if (highestCount < curCount) {
+ highestCount = curCount;
+ methodDescHighestCount = methodDesc;
+ }
+ }
+
+ if (methodDescHighestCount != null) {
+ FlowGraph flowGraph = getFlowGraph(methodDescHighestCount);
+ CompositeLocation returnLOC = getMethodSummary(methodDescHighestCount).getRETURNLoc();
+ NTuple<Descriptor> returnLocTuple = translateToDescTuple(returnLOC.getTuple());
+ FlowNode returnFlowNode = flowGraph.getFlowNode(returnLocTuple);
+
+ Set<FlowNode> curMethodParamNodeSet = flowGraph.getParamFlowNodeSet();
+ Set<NTuple<Descriptor>> descTupleSetHigherThanPC = new HashSet<NTuple<Descriptor>>();
+ for (Iterator iterator3 = curMethodParamNodeSet.iterator(); iterator3.hasNext();) {
+ FlowNode paramNode = (FlowNode) iterator3.next();
+ if (flowGraph.getReachableSetFrom(paramNode.getCurrentDescTuple().subList(0, 1))
+ .contains(returnFlowNode)) {
+ descTupleSetHigherThanPC.add(paramNode.getCurrentDescTuple());
+ }
+ }
+
+ mapHighestOverriddenMethodDescToReturnLocTuple.put(highestMethodDesc, returnLocTuple);
+ mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc.put(highestMethodDesc,
+ descTupleSetHigherThanPC);
+
+ }
+
+ // System.out.println("####################################");
+ // System.out.println(" highest=" + highestMethodDesc + " LOWEST RETURNLOC="
+ // + mapHighestOverriddenMethodDescToReturnLocTuple.get(highestMethodDesc));
+ // System.out.println(" setHigherThanReturnLoc="
+ // + mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc.get(highestMethodDesc));
+
+ }
+
+ }
+
+ private void addMapHighestMethodDescToMethodDesc(MethodDescriptor highest, MethodDescriptor md) {
+ if (!mapHighestOverriddenMethodDescToMethodDescSet.containsKey(highest)) {
+ mapHighestOverriddenMethodDescToMethodDescSet.put(highest, new HashSet<MethodDescriptor>());
+ }
+ mapHighestOverriddenMethodDescToMethodDescSet.get(highest).add(md);
+ }
+
+ private void DFSInheritanceTreeCalculatingHighestOverriddenMethod(ClassDescriptor cd) {
+
+ // ClassDescriptor cd = node.getData();
+
+ for (Iterator iterator = cd.getMethods(); iterator.hasNext();) {
+ MethodDescriptor md = (MethodDescriptor) iterator.next();
+ MethodDescriptor highestMethodDesc = getHighestOverriddenMethod(md.getClassDesc(), md);
+ mapMethodDescToHighestOverriddenMethodDesc.put(md, highestMethodDesc);
+ addMapHighestMethodDescToMethodDesc(highestMethodDesc, md);
+
+ }
+
+ // traverse children
+ Set<ClassDescriptor> children = getDirectSubClasses(cd);
+ for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ ClassDescriptor child = (ClassDescriptor) iterator.next();
+ DFSInheritanceTreeCalculatingHighestOverriddenMethod(child);
+ }
+
+ }
+
+ private MethodDescriptor getHighestOverriddenMethod(ClassDescriptor curClassDesc,
+ MethodDescriptor curMethodDesc) {
+
+ // Node<ClassDescriptor> curNode = inheritanceTree.getTreeNode(curClassDesc);
+ // Node<ClassDescriptor> parentNode = curNode.getParent();
+ ClassDescriptor parentClassDesc = curClassDesc.getSuperDesc();
+
+ if (parentClassDesc != null) {
+ if (parentClassDesc.getMethodTable().contains(curMethodDesc.getSymbol())) {
+ Set<MethodDescriptor> methodDescSet =
+ parentClassDesc.getMethodTable().getSet(curMethodDesc.getSymbol());
+ for (Iterator iterator = methodDescSet.iterator(); iterator.hasNext();) {
+ MethodDescriptor md = (MethodDescriptor) iterator.next();
+ if (md.matches(curMethodDesc)) {
+ return getHighestOverriddenMethod(parentClassDesc, md);
+ }
+ }
+ }
+ // traverse to the parent!
+ return getHighestOverriddenMethod(parentClassDesc, curMethodDesc);
+ }
+ return curMethodDesc;
+ }
+
+ private void buildInheritanceTree() {
+
+ DFSInheritanceTreeCalculatingHighestOverriddenMethod(rootClassDescriptor);
+
+ }
+
+ private void addInheritanceConstraintsToHierarchyGraph() {
+
+ // DFS the inheritance tree and propagates nodes/edges of parent to child
+
+ // Node<ClassDescriptor> rootNode = inheritanceTree.getRootNode();
+ DFSInheritanceTree(rootClassDescriptor);
+
+ }
+
+ private void DFSInheritanceTree(ClassDescriptor parentClassDescriptor) {
+
+ // ClassDescriptor parentClassDescriptor = parentNode.getData();
+
+ Set<ClassDescriptor> children = getDirectSubClasses(parentClassDescriptor);
+ for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ ClassDescriptor childClassDescriptor = (ClassDescriptor) iterator.next();
+
+ HierarchyGraph parentGraph = getHierarchyGraph(parentClassDescriptor);
+ HierarchyGraph childGraph = getHierarchyGraph(childClassDescriptor);
+
+ Set<HNode> parentNodeSet = parentGraph.getNodeSet();
+ for (Iterator iterator2 = parentNodeSet.iterator(); iterator2.hasNext();) {
+ HNode hNode = (HNode) iterator2.next();
+ childGraph.addNode(hNode);
+ }
+
+ // copies extra information from the parent hierarchy graph
+ Map<HNode, Set<HNode>> parentMergeNodeMap = parentGraph.getMapHNodetoMergeSet();
+ Map<HNode, Set<HNode>> childMergeNodeMap = childGraph.getMapHNodetoMergeSet();
+
+ Set<HNode> keySet = parentMergeNodeMap.keySet();
+ for (Iterator iterator2 = keySet.iterator(); iterator2.hasNext();) {
+ HNode parentKey = (HNode) iterator2.next();
+ if (!childMergeNodeMap.containsKey(parentKey)) {
+ childMergeNodeMap.put(parentKey, new HashSet<HNode>());
+ }
+ childMergeNodeMap.get(parentKey).addAll(parentMergeNodeMap.get(parentKey));
+ }
+
+ // copies nodes/edges from the parent class...
+ for (Iterator iterator2 = parentNodeSet.iterator(); iterator2.hasNext();) {
+ HNode parentHNode = (HNode) iterator2.next();
+
+ Set<HNode> parentIncomingHNode = parentGraph.getIncomingNodeSet(parentHNode);
+ Set<HNode> parentOutgoingHNode = parentGraph.getOutgoingNodeSet(parentHNode);
+
+ for (Iterator iterator3 = parentIncomingHNode.iterator(); iterator3.hasNext();) {
+ HNode inHNode = (HNode) iterator3.next();
+ childGraph.addEdge(inHNode.getDescriptor(), parentHNode.getDescriptor());
+ }
+
+ for (Iterator iterator3 = parentOutgoingHNode.iterator(); iterator3.hasNext();) {
+ HNode outHNode = (HNode) iterator3.next();
+ childGraph.addEdge(parentHNode.getDescriptor(), outHNode.getDescriptor());
+ }
+
+ }
+
+ // copies nodes/edges from parent methods to overridden methods
+
+ for (Iterator iterator3 = childClassDescriptor.getMethods(); iterator3.hasNext();) {
+ MethodDescriptor childMethodDescriptor = (MethodDescriptor) iterator3.next();
+
+ MethodDescriptor parentMethodDesc =
+ getParentMethodDesc(childMethodDescriptor.getClassDesc(), childMethodDescriptor);
+
+ if (parentMethodDesc != null) {
+
+ HierarchyGraph parentMethodGraph = getHierarchyGraph(parentMethodDesc);
+ HierarchyGraph childMethodGraph = getHierarchyGraph(childMethodDescriptor);
+
+ Set<HNode> parentMethodNodeSet = parentMethodGraph.getNodeSet();
+ for (Iterator iterator2 = parentMethodNodeSet.iterator(); iterator2.hasNext();) {
+ HNode hNode = (HNode) iterator2.next();
+ childMethodGraph.addNode(hNode);
+ }
+
+ // copies extra information from the parent hierarchy graph
+ Map<HNode, Set<HNode>> parentMethodMergeNodeMap =
+ parentMethodGraph.getMapHNodetoMergeSet();
+ Map<HNode, Set<HNode>> childMethodMergeNodeMap = childMethodGraph.getMapHNodetoMergeSet();
+
+ Set<HNode> methodKeySet = parentMethodMergeNodeMap.keySet();
+ for (Iterator iterator2 = methodKeySet.iterator(); iterator2.hasNext();) {
+ HNode parentKey = (HNode) iterator2.next();
+ if (!childMethodMergeNodeMap.containsKey(parentKey)) {
+ childMethodMergeNodeMap.put(parentKey, new HashSet<HNode>());
+ }
+ childMethodMergeNodeMap.get(parentKey).addAll(parentMethodMergeNodeMap.get(parentKey));
+ }
+
+ // copies nodes/edges from the parent method...
+ for (Iterator iterator2 = parentMethodGraph.getNodeSet().iterator(); iterator2.hasNext();) {
+ HNode parentHNode = (HNode) iterator2.next();
+
+ Set<HNode> parentIncomingHNode = parentMethodGraph.getIncomingNodeSet(parentHNode);
+ Set<HNode> parentOutgoingHNode = parentMethodGraph.getOutgoingNodeSet(parentHNode);
+
+ for (Iterator iterator4 = parentIncomingHNode.iterator(); iterator4.hasNext();) {
+ HNode inHNode = (HNode) iterator4.next();
+ childMethodGraph.addEdge(inHNode, parentHNode);
+ }
+
+ for (Iterator iterator4 = parentOutgoingHNode.iterator(); iterator4.hasNext();) {
+ HNode outHNode = (HNode) iterator4.next();
+ childMethodGraph.addEdge(parentHNode, outHNode);
+ }
+
+ }
+
+ }
+
+ }
+
+ DFSInheritanceTree(childClassDescriptor);
+ }
+
+ }
+
+ public MethodDescriptor getParentMethodDesc(ClassDescriptor classDesc, MethodDescriptor methodDesc) {
+
+ // Node<ClassDescriptor> childNode = inheritanceTree.getTreeNode(classDesc);
+ ClassDescriptor parentClassDesc = classDesc.getSuperDesc();
+ // Node<ClassDescriptor> parentNode = childNode.getParent();
+
+ if (parentClassDesc != null) {
+ // ClassDescriptor parentClassDesc = parentNode.getData();
+ if (parentClassDesc.getMethodTable().contains(methodDesc.getSymbol())) {
+ Set<MethodDescriptor> methodDescSet =
+ parentClassDesc.getMethodTable().getSet(methodDesc.getSymbol());
+ for (Iterator iterator = methodDescSet.iterator(); iterator.hasNext();) {
+ MethodDescriptor md = (MethodDescriptor) iterator.next();
+ if (md.matches(methodDesc)) {
+ return md;
+ }
+ }
+ }
+
+ // traverse to the parent!
+ getParentMethodDesc(parentClassDesc, methodDesc);
+
+ }
+
+ return null;
+ }
+
private void checkReturnNodes() {
LinkedList<MethodDescriptor> methodDescList =
(LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
}
+ private void addSuperClasses(ClassDescriptor cd) {
+ ClassDescriptor parentClassDesc = cd.getSuperDesc();
+ if (parentClassDesc != null) {
+ toanalyze_classDescSet.add(parentClassDesc);
+ addSuperClasses(parentClassDesc);
+ }
+ }
+
private void updateFlowGraph() {
LinkedList<MethodDescriptor> methodDescList =
System.out.println("SSJAVA: Updating a flow graph: " + md);
propagateFlowsFromCalleesWithNoCompositeLocation(md);
}
+
+ Set<FlowNode> nodeSet = getFlowGraph(md).getNodeSet();
+ for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
+ FlowNode flowNode = (FlowNode) iterator.next();
+ NTuple<Descriptor> descTuple = flowNode.getCurrentDescTuple();
+ NTuple<Location> locTuple = translateToLocTuple(md, descTuple);
+ for (int i = 0; i < locTuple.size(); i++) {
+ Location loc = locTuple.get(i);
+ if (loc.getDescriptor() instanceof ClassDescriptor) {
+ ClassDescriptor classDesc = (ClassDescriptor) loc.getDescriptor();
+ toanalyze_classDescSet.add(classDesc);
+ addSuperClasses(classDesc);
+ } else if (loc.getDescriptor() instanceof MethodDescriptor) {
+ toanalyze_classDescSet.add(((MethodDescriptor) loc.getDescriptor()).getClassDesc());
+ }
+ }
+
+ }
+
}
}
while (!methodDescList.isEmpty()) {
MethodDescriptor md = methodDescList.removeLast();
- System.out.println("\n#updateCompositeLocationAssignments=" + md);
+ // System.out.println("\n#updateCompositeLocationAssignments=" + md);
FlowGraph flowGraph = getFlowGraph(md);
Set<FlowNode> nodeSet = flowGraph.getNodeSet();
for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
FlowNode node = (FlowNode) iterator.next();
- System.out.println("-node=" + node + " node.getDescTuple=" + node.getDescTuple());
+ // System.out.println("-node=" + node + " node.getDescTuple=" + node.getDescTuple());
if (node.getCompositeLocation() != null) {
CompositeLocation compLoc = node.getCompositeLocation();
CompositeLocation updatedCompLoc = updateCompositeLocation(compLoc);
node.setCompositeLocation(updatedCompLoc);
- System.out.println("---updatedCompLoc1=" + updatedCompLoc);
+ // System.out.println("---updatedCompLoc1=" + updatedCompLoc);
} else {
NTuple<Descriptor> descTuple = node.getDescTuple();
- System.out.println("update desc=" + descTuple);
+ // System.out.println("update desc=" + descTuple);
CompositeLocation compLoc = convertToCompositeLocation(md, descTuple);
compLoc = updateCompositeLocation(compLoc);
node.setCompositeLocation(compLoc);
- System.out.println("---updatedCompLoc2=" + compLoc);
+ // System.out.println("---updatedCompLoc2=" + compLoc);
}
if (node.isDeclaratonNode()) {
String locName;
if (!enclosingDesc.equals(GLOBALDESC)) {
LocationSummary locSummary = getLocationSummary(enclosingDesc);
- HierarchyGraph scGraph = getSkeletonCombinationHierarchyGraph(enclosingDesc);
+ // HierarchyGraph scGraph = getSkeletonCombinationHierarchyGraph(enclosingDesc);
+ HierarchyGraph scGraph = getSimpleHierarchyGraph(enclosingDesc);
if (scGraph != null) {
HNode curNode = scGraph.getCurrentHNode(nodeIdentifier);
+ // System.out.println("nodeID=" + nodeIdentifier + " curNode=" + curNode
+ // + " enclosingDesc=" + enclosingDesc);
if (curNode != null) {
nodeIdentifier = curNode.getName();
}
private void translateCompositeLocationAssignmentToFlowGraph(MethodDescriptor mdCaller) {
- System.out.println("\n\n###translateCompositeLocationAssignmentToFlowGraph mdCaller="
- + mdCaller);
+ // System.out.println("\n\n###translateCompositeLocationAssignmentToFlowGraph mdCaller="
+ // + mdCaller);
// First, assign a composite location to a node in the flow graph
GlobalFlowGraph callerGlobalFlowGraph = getSubGlobalFlowGraph(mdCaller);
}
- private CompositeLocation translateArgCompLocToParamCompLoc(MethodInvokeNode min,
- CompositeLocation argCompLoc) {
-
- System.out.println("--------translateArgCompLocToParamCompLoc argCompLoc=" + argCompLoc);
- MethodDescriptor mdCallee = min.getMethod();
- FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
-
- NTuple<Location> argLocTuple = argCompLoc.getTuple();
- Location argLocalLoc = argLocTuple.get(0);
-
- Map<Integer, NTuple<Descriptor>> mapIdxToArgTuple = mapMethodInvokeNodeToArgIdxMap.get(min);
- Set<Integer> idxSet = mapIdxToArgTuple.keySet();
- for (Iterator iterator2 = idxSet.iterator(); iterator2.hasNext();) {
- Integer idx = (Integer) iterator2.next();
-
- if (idx == 0 && !min.getMethod().isStatic()) {
- continue;
- }
-
- NTuple<Descriptor> argTuple = mapIdxToArgTuple.get(idx);
- if (argTuple.size() > 0 && argTuple.get(0).equals(argLocalLoc.getLocDescriptor())) {
- // it matches with the current argument composite location
- // so what is the corresponding parameter local descriptor?
- FlowNode paramNode = calleeFlowGraph.getParamFlowNode(idx);
- System.out.println("----------found paramNode=" + paramNode);
- NTuple<Descriptor> paramDescTuple = paramNode.getCurrentDescTuple();
-
- NTuple<Location> newParamTupleFromArgTuple = translateToLocTuple(mdCallee, paramDescTuple);
- for (int i = 1; i < argLocTuple.size(); i++) {
- newParamTupleFromArgTuple.add(argLocTuple.get(i));
- }
-
- System.out.println("-----------newParamTuple=" + newParamTupleFromArgTuple);
- return new CompositeLocation(newParamTupleFromArgTuple);
-
- }
- }
- return null;
- }
-
private void addAddtionalOrderingConstraints(MethodDescriptor mdCaller) {
// First, assign a composite location to a node in the flow graph
//
// update return flow nodes in the caller
CompositeLocation returnLoc = getMethodSummary(mdCallee).getRETURNLoc();
- System.out.println("### min=" + min.printNode(0) + " returnLoc=" + returnLoc);
+ // System.out.println("### min=" + min.printNode(0) + " returnLoc=" + returnLoc);
if (returnLoc != null && returnLoc.get(0).getLocDescriptor().equals(mdCallee.getThis())
&& returnLoc.getSize() > 1) {
- System.out.println("###RETURN COMP LOC=" + returnLoc);
+ // System.out.println("###RETURN COMP LOC=" + returnLoc);
NTuple<Location> returnLocTuple = returnLoc.getTuple();
NTuple<Descriptor> baseTuple = mapMethodInvokeNodeToBaseTuple.get(min);
+ // System.out.println("###basetuple=" + baseTuple);
NTuple<Descriptor> newReturnTuple = baseTuple.clone();
for (int i = 1; i < returnLocTuple.size(); i++) {
newReturnTuple.add(returnLocTuple.get(i).getLocDescriptor());
}
- System.out.println("###NEW RETURN TUPLE FOR CALLER=" + newReturnTuple);
+ // System.out.println("###NEW RETURN TUPLE FOR CALLER=" + newReturnTuple);
+
+ FlowReturnNode holderNode = callerFlowGraph.getFlowReturnNode(min);
+ NodeTupleSet holderTupleSet =
+ getNodeTupleSetFromReturnNode(getFlowGraph(mdCaller), holderNode);
+
callerFlowGraph.getFlowReturnNode(min).setNewTuple(newReturnTuple);
+
+ // then need to remove old constraints
+ // TODO SAT
+ // System.out.println("###REMOVE OLD CONSTRAINTS=" + holderNode);
+ for (Iterator<NTuple<Descriptor>> iter = holderTupleSet.iterator(); iter.hasNext();) {
+ NTuple<Descriptor> tupleFromHolder = iter.next();
+ Set<FlowEdge> holderOutEdge = callerFlowGraph.getOutEdgeSet(holderNode);
+ for (Iterator iterator2 = holderOutEdge.iterator(); iterator2.hasNext();) {
+ FlowEdge outEdge = (FlowEdge) iterator2.next();
+ NTuple<Descriptor> toberemovedTuple = outEdge.getEndTuple();
+ // System.out.println("---remove " + tupleFromHolder + " -> " + toberemovedTuple);
+ callerFlowGraph.removeEdge(tupleFromHolder, toberemovedTuple);
+ }
+ }
+
} else {
// if the return loc set was empty and later pcloc was connected to the return loc
// need to make sure that return loc reflects to this changes.
return mapMethodDescToMethodInvokeNodeSet.get(md);
}
- private void addOrderingConstraintFromCompLocParamToArg(MethodDescriptor mdCaller,
- MethodInvokeNode min) {
- System.out.println("-addOrderingConstraintFromCompLocParamToArg=" + min.printNode(0));
-
- GlobalFlowGraph globalGraph = getSubGlobalFlowGraph(ssjava.getMethodContainingSSJavaLoop());
-
- Set<NTuple<Location>> pcLocTupleSet = getPCLocTupleSet(min);
-
- MethodDescriptor mdCallee = min.getMethod();
-
- FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
- for (int idx = 0; idx < calleeFlowGraph.getNumParameters(); idx++) {
- FlowNode paramNode = calleeFlowGraph.getParamFlowNode(idx);
- NTuple<Location> globalParamLocTuple =
- translateToLocTuple(mdCallee, paramNode.getDescTuple());
- translateToLocTuple(mdCallee, paramNode.getDescTuple());
- CompositeLocation compLoc = paramNode.getCompositeLocation();
- System.out.println("---paramNode=" + paramNode + " compLoc=" + compLoc);
- if (compLoc != null) {
- NTuple<Descriptor> argTuple = getNodeTupleByArgIdx(min, idx);
- NTuple<Location> globalArgLocTuple = translateToLocTuple(mdCaller, argTuple);
-
- if (!isLiteralValueLocTuple(globalArgLocTuple)
- && !isLiteralValueLocTuple(globalParamLocTuple)) {
- if (!globalGraph.hasValueFlowEdge(globalArgLocTuple, globalParamLocTuple)) {
- System.out.println("----- add global flow globalArgLocTuple=" + globalArgLocTuple
- + "-> globalParamLocTuple=" + globalParamLocTuple);
- hasChanges = true;
- globalGraph.addValueFlowEdge(globalArgLocTuple, globalParamLocTuple);
- }
- }
-
- for (Iterator iterator = pcLocTupleSet.iterator(); iterator.hasNext();) {
- NTuple<Location> pcLocTuple = (NTuple<Location>) iterator.next();
-
- if (!isLiteralValueLocTuple(pcLocTuple) && !isLiteralValueLocTuple(globalParamLocTuple)) {
- if (!globalGraph.hasValueFlowEdge(pcLocTuple, globalParamLocTuple)) {
- System.out
- .println("----- add global flow PCLOC="
- + pcLocTuple
- + "-> globalParamLocTu!globalArgLocTuple.get(0).getLocDescriptor().equals(LITERALDESC)ple="
- + globalParamLocTuple);
- hasChanges = true;
- globalGraph.addValueFlowEdge(pcLocTuple, globalParamLocTuple);
- }
- }
-
- }
- }
- }
- }
-
- private boolean isLiteralValueLocTuple(NTuple<Location> locTuple) {
- return locTuple.get(0).getLocDescriptor().equals(LITERALDESC);
- }
-
public void assignCompositeLocationToFlowGraph(FlowGraph flowGraph, Location loc,
CompositeLocation inferCompLoc) {
Descriptor localDesc = loc.getLocDescriptor();
// need to assign the inferred composite location to this node
CompositeLocation newCompLoc = generateCompositeLocation(node.getDescTuple(), inferCompLoc);
node.setCompositeLocation(newCompLoc);
- System.out.println("SET Node=" + node + " inferCompLoc=" + newCompLoc);
+ // System.out.println("SET Node=" + node + " inferCompLoc=" + newCompLoc);
}
}
}
private CompositeLocation generateCompositeLocation(NTuple<Descriptor> nodeDescTuple,
CompositeLocation inferCompLoc) {
- System.out.println("generateCompositeLocation=" + nodeDescTuple + " with inferCompLoc="
- + inferCompLoc);
+ // System.out.println("generateCompositeLocation=" + nodeDescTuple + " with inferCompLoc="
+ // + inferCompLoc);
MethodDescriptor md = (MethodDescriptor) inferCompLoc.get(0).getDescriptor();
baseLocTuple = translateToLocTuple(mdCaller, mapMethodInvokeNodeToBaseTuple.get(min));
}
- System.out.println("\n-#translate caller=" + mdCaller + " infer composite loc to callee="
- + mdCallee + " baseLocTuple=" + baseLocTuple);
- // System.out.println("-mapIdxToArgTuple=" + mapIdxToArgTuple);
- // System.out.println("-callerMapLocToCompLoc=" + callerMapLocToCompLoc);
+ // System.out.println("\n-#translate caller=" + mdCaller + " infer composite loc to callee="
+ // + mdCallee + " baseLocTuple=" + baseLocTuple);
Set<Location> keySet = callerMapLocToCompLoc.keySet();
for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
translateCompositeLocationToCallee(callerCompLoc, baseLocTuple, mdCallee);
calleeGlobalGraph.addMapLocationToInferCompositeLocation(key, newCalleeCompLoc);
- System.out.println("1---key=" + key + " callerCompLoc=" + callerCompLoc
- + " newCalleeCompLoc=" + newCalleeCompLoc);
- System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
+ // System.out.println("1---key=" + key + " callerCompLoc=" + callerCompLoc
+ // + " newCalleeCompLoc=" + newCalleeCompLoc);
+ // System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
if (!newCalleeCompLoc.get(0).getDescriptor().equals(mdCallee)) {
System.exit(0);
}
newCalleeCompLoc.addLocation(callerCompLoc.get(i));
}
calleeGlobalGraph.addMapLocationToInferCompositeLocation(key, newCalleeCompLoc);
- System.out.println("2---key=" + key + " callerCompLoc=" + callerCompLoc
- + " newCalleeCompLoc=" + newCalleeCompLoc);
- System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
+ // System.out.println("2---key=" + key + " callerCompLoc=" + callerCompLoc
+ // + " newCalleeCompLoc=" + newCalleeCompLoc);
+ // System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
} else {
int paramIdx = getParamIdx(callerCompLoc, mapIdxToArgTuple);
// so transfer the same composite location to the callee
if (!calleeGlobalGraph.contrainsInferCompositeLocationMapKey(key)) {
if (callerCompLoc.get(0).getDescriptor().equals(mdCallee)) {
- System.out.println("3---key=" + key + " callerCompLoc=" + callerCompLoc
- + " newCalleeCompLoc=" + callerCompLoc);
- System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
+ // System.out.println("3---key=" + key + " callerCompLoc=" + callerCompLoc
+ // + " newCalleeCompLoc=" + callerCompLoc);
+ // System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
calleeGlobalGraph.addMapLocationToInferCompositeLocation(key, callerCompLoc);
} else {
- System.out.println("3---SKIP key=" + key + " callerCompLoc=" + callerCompLoc);
+ // System.out.println("3---SKIP key=" + key + " callerCompLoc=" + callerCompLoc);
}
}
continue;
newCalleeCompLoc.addLocation(callerCompLoc.get(i));
}
calleeGlobalGraph.addMapLocationToInferCompositeLocation(key, newCalleeCompLoc);
- System.out.println("4---key=" + key + " callerCompLoc=" + callerCompLoc
- + " newCalleeCompLoc=" + newCalleeCompLoc);
- System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
-
- // System.out.println("-----argTuple=" + argTuple + " caller=" + mdCaller +
- // " callee="
- // + mdCallee);
- // System.out.println("-----paramIdx=" + paramIdx + " paramFlowNode=" + paramFlowNode);
+ // System.out.println("4---key=" + key + " callerCompLoc=" + callerCompLoc
+ // + " newCalleeCompLoc=" + newCalleeCompLoc);
+ // System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
}
}
}
- // System.out.println("-----*AFTER TRANSLATING COMP LOC MAPPING, CALLEE MAPPING="
- // + calleeGlobalGraph.getMapLocationToInferCompositeLocation());
-
- System.out.println("#ASSIGN COMP LOC TO CALLEE PARAMS: callee=" + mdCallee + " caller="
- + mdCaller);
+ // System.out.println("#ASSIGN COMP LOC TO CALLEE PARAMS: callee=" + mdCallee + " caller="
+ // + mdCaller);
// If the location of an argument has a composite location
// need to assign a proper composite location to the corresponding callee parameter
Set<Integer> idxSet = mapIdxToArgTuple.keySet();
}
NTuple<Descriptor> argTuple = mapIdxToArgTuple.get(idx);
- System.out.println("-argTuple=" + argTuple + " idx=" + idx);
+ // System.out.println("-argTuple=" + argTuple + " idx=" + idx);
if (argTuple.size() > 0) {
// check if an arg tuple has been already assigned to a composite location
NTuple<Location> argLocTuple = translateToLocTuple(mdCaller, argTuple);
callerCompLoc.addLocation(argLocTuple.get(i));
}
- System.out.println("---callerCompLoc=" + callerCompLoc);
+ // System.out.println("---callerCompLoc=" + callerCompLoc);
// if (baseLocTuple != null && callerCompLoc.getTuple().startsWith(baseLocTuple)) {
translateToLocTuple(mdCallee, calleeParamDescTuple);
int refParamIdx = getParamIdx(callerCompLoc, mapIdxToArgTuple);
- System.out.println("-----paramIdx=" + refParamIdx);
+ // System.out.println("-----paramIdx=" + refParamIdx);
if (refParamIdx == 0 && !mdCallee.isStatic()) {
- System.out.println("-------need to translate callerCompLoc=" + callerCompLoc
- + " with baseTuple=" + baseLocTuple + " calleeParamLocTuple="
- + calleeParamLocTuple);
+ // System.out.println("-------need to translate callerCompLoc=" + callerCompLoc
+ // + " with baseTuple=" + baseLocTuple + " calleeParamLocTuple="
+ // + calleeParamLocTuple);
CompositeLocation newCalleeCompLoc =
translateCompositeLocationToCallee(callerCompLoc, baseLocTuple, mdCallee);
calleeGlobalGraph.addMapLocationToInferCompositeLocation(calleeParamLocTuple.get(0),
newCalleeCompLoc);
- System.out.println("---------key=" + calleeParamLocTuple.get(0) + " callerCompLoc="
- + callerCompLoc + " newCalleeCompLoc=" + newCalleeCompLoc);
+ // System.out.println("---------key=" + calleeParamLocTuple.get(0) + " callerCompLoc="
+ // + callerCompLoc + " newCalleeCompLoc=" + newCalleeCompLoc);
} else if (refParamIdx != -1) {
// the first element of an argument composite location matches with one of paramtere
// composite locations
- System.out.println("-------param match case=");
+ // System.out.println("-------param match case=");
NTuple<Descriptor> argTupleRef = mapIdxToArgTuple.get(refParamIdx);
FlowNode refParamFlowNode = calleeFlowGraph.getParamFlowNode(refParamIdx);
NTuple<Location> refParamLocTuple =
translateToLocTuple(mdCallee, refParamFlowNode.getDescTuple());
- System.out.println("---------refParamLocTuple=" + refParamLocTuple
- + " from argTupleRef=" + argTupleRef);
+ // System.out.println("---------refParamLocTuple=" + refParamLocTuple
+ // + " from argTupleRef=" + argTupleRef);
CompositeLocation newCalleeCompLoc = new CompositeLocation();
for (int i = 0; i < refParamLocTuple.size(); i++) {
newCalleeCompLoc);
calleeParamFlowNode.setCompositeLocation(newCalleeCompLoc);
- System.out.println("-----------key=" + calleeParamLocTuple.get(0) + " callerCompLoc="
- + callerCompLoc + " newCalleeCompLoc=" + newCalleeCompLoc);
+ // System.out.println("-----------key=" + calleeParamLocTuple.get(0) +
+ // " callerCompLoc="
+ // + callerCompLoc + " newCalleeCompLoc=" + newCalleeCompLoc);
} else {
CompositeLocation newCalleeCompLoc =
}
}
- System.out.println("-----------------calleeParamFlowNode="
- + calleeParamFlowNode.getCompositeLocation());
+ // System.out.println("-----------------calleeParamFlowNode="
+ // + calleeParamFlowNode.getCompositeLocation());
// }
private CompositeLocation calculateCompositeLocationFromSubGlobalGraph(MethodDescriptor md,
FlowNode paramNode) {
- System.out.println("#############################################################");
- System.out.println("calculateCompositeLocationFromSubGlobalGraph=" + paramNode);
+ // System.out.println("#############################################################");
+ // System.out.println("calculateCompositeLocationFromSubGlobalGraph=" + paramNode);
GlobalFlowGraph subGlobalFlowGraph = getSubGlobalFlowGraph(md);
NTuple<Location> paramLocTuple = translateToLocTuple(md, paramNode.getDescTuple());
}
if (!needToGenerateCompositeLocation(paramGlobalNode, curPrefix)) {
- System.out.println("NO NEED TO GENERATE COMP LOC to " + paramGlobalNode
- + " with prefix=" + curPrefix);
- // System.out.println("prefixList=" + prefixList);
- // System.out.println("reachableNodeSet=" + reachableNodeSet);
+ // System.out.println("NO NEED TO GENERATE COMP LOC to " + paramGlobalNode
+ // + " with prefix=" + curPrefix);
return null;
}
Location targetLocalLoc = paramGlobalNode.getLocTuple().get(0);
CompositeLocation newCompLoc = generateCompositeLocation(curPrefix);
- System.out.println("NEED TO ASSIGN COMP LOC TO " + paramGlobalNode + " with prefix="
- + curPrefix);
- System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc=" + newCompLoc);
+ // System.out.println("NEED TO ASSIGN COMP LOC TO " + paramGlobalNode + " with prefix="
+ // + curPrefix);
+ // System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc=" +
+ // newCompLoc);
// makes sure that a newly generated location appears in the hierarchy graph
for (int compIdx = 0; compIdx < newCompLoc.getSize(); compIdx++) {
Integer key = (Integer) iterator.next();
NTuple<Descriptor> argTuple = mapIdxToArgTuple.get(key);
if (argTuple.size() > 0 && translateToDescTuple(compLoc.getTuple()).startsWith(argTuple)) {
- System.out.println("compLoc.getTuple=" + compLoc + " is started with " + argTuple);
+ // System.out.println("compLoc.getTuple=" + compLoc + " is started with " + argTuple);
return key.intValue();
}
}
// Set<GlobalFlowNode> reachNodeSet = globalFlowGraph.getReachableNodeSetFrom(node);
// System.out.println("node=" + node + " prefixList=" + prefixList);
- System.out.println("---prefixList=" + prefixList);
+ // System.out.println("---prefixList=" + prefixList);
nextprefix: for (int i = 0; i < prefixList.size(); i++) {
NTuple<Location> curPrefix = prefixList.get(i);
- System.out.println("---curPrefix=" + curPrefix);
+ // System.out.println("---curPrefix=" + curPrefix);
Set<NTuple<Location>> reachableCommonPrefixSet = new HashSet<NTuple<Location>>();
for (Iterator iterator2 = reachableNodeSet.iterator(); iterator2.hasNext();) {
}
if (!needToGenerateCompositeLocation(node, curPrefix)) {
- System.out.println("NO NEED TO GENERATE COMP LOC to " + node + " with prefix="
- + curPrefix);
+ // System.out.println("NO NEED TO GENERATE COMP LOC to " + node + " with prefix="
+ // + curPrefix);
// System.out.println("prefixList=" + prefixList);
// System.out.println("reachableNodeSet=" + reachableNodeSet);
continue nextprefix;
Location targetLocalLoc = node.getLocTuple().get(0);
CompositeLocation newCompLoc = generateCompositeLocation(curPrefix);
- System.out.println("NEED TO ASSIGN COMP LOC TO " + node + " with prefix=" + curPrefix);
- System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc="
- + newCompLoc);
+ // System.out.println("NEED TO ASSIGN COMP LOC TO " + node + " with prefix=" +
+ // curPrefix);
+ // System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc="
+ // + newCompLoc);
globalFlowGraph.addMapLocationToInferCompositeLocation(targetLocalLoc, newCompLoc);
// }
// in this case, all return nodes in the method returns values coming from a location that
// starts with "this"
- System.out.println("$$$SET RETURN LOC TRUE=" + md);
+ // System.out.println("$$$SET RETURN LOC TRUE=" + md);
mapMethodDescriptorToCompositeReturnCase.put(md, Boolean.TRUE);
// NameDescriptor returnLocDesc = new NameDescriptor("RLOC" + (locSeed++));
// return true if there is a path between a node to which we want to give a composite location
// and nodes which start with curPrefix
- System.out.println("---needToGenerateCompositeLocation curPrefix=" + curPrefix);
+ // System.out.println("---needToGenerateCompositeLocation curPrefix=" + curPrefix);
Location targetLocalLoc = node.getLocTuple().get(0);
MethodDescriptor md = (MethodDescriptor) targetLocalLoc.getDescriptor();
FlowGraph flowGraph = getFlowGraph(md);
+
FlowNode flowNode = flowGraph.getFlowNode(node.getDescTuple());
Set<FlowNode> reachableSet = flowGraph.getReachFlowNodeSetFrom(flowNode);
for (Iterator iterator = paramNodeSet.iterator(); iterator.hasNext();) {
FlowNode paramFlowNode = (FlowNode) iterator.next();
if (curPrefix.startsWith(translateToLocTuple(md, paramFlowNode.getDescTuple()))) {
- System.out.println("here1?!");
return true;
}
}
((InterDescriptor) targetLocalLoc.getLocDescriptor()).getMethodArgIdxPair();
if (pair != null) {
- System.out.println("$$$TARGETLOCALLOC HOLDER=" + targetLocalLoc);
+ // System.out.println("$$$TARGETLOCALLOC HOLDER=" + targetLocalLoc);
MethodInvokeNode min = pair.getFirst();
Integer paramIdx = pair.getSecond();
FlowNode paramNode = getFlowGraph(mdCallee).getParamFlowNode(paramIdx);
if (checkNodeReachToReturnNode(mdCallee, paramNode)) {
- System.out.println("here2?!");
return true;
}
for (int i = 0; i < curPrefix.size(); i++) {
ClassDescriptor prefixType = getClassTypeDescriptor(curPrefix.get(i).getLocDescriptor());
if (prefixType != null && prefixType.equals(currentMethodThisType)) {
- System.out.println("PREFIX TYPE MATCHES WITH=" + currentMethodThisType);
+ // System.out.println("PREFIX TYPE MATCHES WITH=" + currentMethodThisType);
if (mapMethodDescriptorToCompositeReturnCase.containsKey(md)) {
boolean hasCompReturnLocWithThis =
mapMethodDescriptorToCompositeReturnCase.get(md).booleanValue();
if (hasCompReturnLocWithThis) {
if (checkNodeReachToReturnNode(md, flowNode)) {
- System.out.println("here3?!");
return true;
}
}
for (Iterator iterator3 = subGlobalReachableSet.iterator(); iterator3.hasNext();) {
GlobalFlowNode subGlobalReachalbeNode = (GlobalFlowNode) iterator3.next();
if (subGlobalReachalbeNode.getLocTuple().get(0).getLocDescriptor().equals(md.getThis())) {
- System.out.println("PREFIX FOUND=" + subGlobalReachalbeNode);
- System.out.println("here4?!");
+ // System.out.println("PREFIX FOUND=" + subGlobalReachalbeNode);
return true;
}
}
}
}
- // System.out.println("flowGraph.getReturnNodeSet()=" + flowGraph.getReturnNodeSet());
- // System.out.println("flowGraph.contains(node.getDescTuple())="
- // + flowGraph.contains(node.getDescTuple()) + " flowGraph.getFlowNode(node.getDescTuple())="
- // + flowGraph.getFlowNode(node.getDescTuple()));reachableSet
-
- // if (flowGraph.contains(node.getDescTuple())
- // && flowGraph.getReturnNodeSet().contains(flowGraph.getFlowNode(node.getDescTuple()))) {
- // // return checkFlowNodeReturnThisField(flowGraph);
- // }
-
Location lastLocationOfPrefix = curPrefix.get(curPrefix.size() - 1);
// check whether prefix appears in the list of parameters
Set<MethodInvokeNode> minSet = mapMethodDescToMethodInvokeNodeSet.get(md);
+ // System.out.println("$$$md=" + md + " minSet=" + minSet);
+ if (minSet == null) {
+ return false;
+ }
found: for (Iterator iterator = minSet.iterator(); iterator.hasNext();) {
MethodInvokeNode min = (MethodInvokeNode) iterator.next();
Map<Integer, NTuple<Descriptor>> map = mapMethodInvokeNodeToArgIdxMap.get(min);
NTuple<Location> locTuple =
translateToLocTuple(md, flowGraph.getParamFlowNode(argIdx).getDescTuple());
lastLocationOfPrefix = locTuple.get(0);
- System.out.println("ARG CASE=" + locTuple);
+ // System.out.println("ARG CASE=" + locTuple);
for (Iterator iterator3 = subGlobalReachableSet.iterator(); iterator3.hasNext();) {
GlobalFlowNode subGlobalReachalbeNode = (GlobalFlowNode) iterator3.next();
// NTuple<Location> locTuple = translateToLocTuple(md, reachalbeNode.getDescTuple());
NTuple<Location> globalReachlocTuple = subGlobalReachalbeNode.getLocTuple();
for (int i = 0; i < globalReachlocTuple.size(); i++) {
if (globalReachlocTuple.get(i).equals(lastLocationOfPrefix)) {
- System.out.println("ARG " + argTuple + " IS MATCHED WITH="
- + lastLocationOfPrefix);
- System.out.println("here5?!");
-
+ // System.out.println("ARG " + argTuple + " IS MATCHED WITH="
+ // + lastLocationOfPrefix);
return true;
}
}
}
}
- // ClassDescriptor cd;
- // if (lastLocationOfPrefix.getLocDescriptor() instanceof VarDescriptor) {
- // cd = ((VarDescriptor) lastLocationOfPrefix.getLocDescriptor()).getType().getClassDesc();
- // } else {
- // // it is a field descriptor
- // cd = ((FieldDescriptor) lastLocationOfPrefix.getLocDescriptor()).getType().getClassDesc();
- // }
- //
- // GlobalFlowGraph subGlobalFlowGraph = getSubGlobalFlowGraph(md);
- // Set<GlobalFlowNode> subGlobalReachableSet = subGlobalFlowGraph.getReachableNodeSetFrom(node);
- //
- // System.out.println("TRY TO FIND lastLocationOfPrefix=" + lastLocationOfPrefix);
- // for (Iterator iterator2 = subGlobalReachableSet.iterator(); iterator2.hasNext();) {
- // GlobalFlowNode subGlobalReachalbeNode = (GlobalFlowNode) iterator2.next();
- // // NTuple<Location> locTuple = translateToLocTuple(md, reachalbeNode.getDescTuple());
- // NTuple<Location> locTuple = subGlobalReachalbeNode.getLocTuple();
- //
- // for (int i = 0; i < locTuple.size(); i++) {
- // if (locTuple.get(i).equals(lastLocationOfPrefix)) {
- // return true;
- // }
- // }
- //
- // Location lastLoc = locTuple.get(locTuple.size() - 1);
- // Descriptor enclosingDescriptor = lastLoc.getDescriptor();
- //
- // if (enclosingDescriptor != null && enclosingDescriptor.equals(cd)) {
- // System.out.println("# WHY HERE?");
- // System.out.println("subGlobalReachalbeNode=" + subGlobalReachalbeNode);
- // return true;
- // }
- // }
-
return false;
}
private List<NTuple<Location>> calculatePrefixList(GlobalFlowGraph graph, GlobalFlowNode node) {
- System.out.println("\n##### calculatePrefixList node=" + node);
+ // System.out.println("\n##### calculatePrefixList node=" + node);
Set<GlobalFlowNode> incomingNodeSetPrefix =
graph.getIncomingNodeSetByPrefix(node.getLocTuple().get(0));
}
});
- // remove a prefix which is not suitable for generating composite location
- Location localVarLoc = node.getLocTuple().get(0);
- MethodDescriptor md = (MethodDescriptor) localVarLoc.getDescriptor();
- ClassDescriptor cd = md.getClassDesc();
-
- int idx = 0;
- Set<NTuple<Location>> toberemoved = new HashSet<NTuple<Location>>();
- // for (int i = 0; i < prefixList.size(); i++) {
- // NTuple<Location> prefixLocTuple = prefixList.get(i);
- // if (!containsClassDesc(cd, prefixLocTuple)) {
- // toberemoved.add(prefixLocTuple);
- // }
- // }
-
- // System.out.println("method class=" + cd + " toberemoved=" + toberemoved);
-
- prefixList.removeAll(toberemoved);
-
return prefixList;
}
private CompositeLocation calculateCompositeLocationFromFlowGraph(MethodDescriptor md,
FlowNode node) {
- System.out.println("#############################################################");
- System.out.println("calculateCompositeLocationFromFlowGraph=" + node);
+ // System.out.println("#############################################################");
+ // System.out.println("calculateCompositeLocationFromFlowGraph=" + node);
FlowGraph flowGraph = getFlowGraph(md);
// NTuple<Location> paramLocTuple = translateToLocTuple(md, paramNode.getDescTuple());
MethodDescriptor curPrefixFirstElementMethodDesc =
(MethodDescriptor) curPrefix.get(0).getDescriptor();
- // MethodDescriptor nodePrefixLocFirstElementMethodDesc =
- // (MethodDescriptor) prefixLoc.getDescriptor();
-
- // System.out.println("curPrefixFirstElementMethodDesc=" +
- // curPrefixFirstElementMethodDesc);
- // System.out.println("nodePrefixLocFirstElementMethodDesc="
- // + nodePrefixLocFirstElementMethodDesc);
-
- // TODO
- // if (!node.getLocTuple().startsWith(curPrefix.get(0))) {
-
Location curPrefixLocalLoc = curPrefix.get(0);
Location targetLocalLoc = new Location(md, node.getDescTuple().get(0));
// Location targetLocalLoc = paramGlobalNode.getLocTuple().get(0);
CompositeLocation newCompLoc = generateCompositeLocation(curPrefix);
- System.out.println("NEED2ASSIGN COMP LOC TO " + node + " with prefix=" + curPrefix);
- System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc=" + newCompLoc);
+ // System.out.println("NEED2ASSIGN COMP LOC TO " + node + " with prefix=" + curPrefix);
+ // System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc=" +
+ // newCompLoc);
- // // makes sure that a newly generated location appears in the hierarchy graph
- // for (int compIdx = 0; compIdx < newCompLoc.getSize(); compIdx++) {
- // Location curLoc = newCompLoc.get(compIdx);
- // getHierarchyGraph(curLoc.getDescriptor()).getHNode(curLoc.getLocDescriptor());
- // }
- // subGlobalFlowGraph.addMapLocationToInferCompositeLocation(targetLocalLoc, newCompLoc);
node.setCompositeLocation(newCompLoc);
return newCompLoc;
private List<NTuple<Location>> calculatePrefixListFlowGraph(FlowGraph graph, FlowNode node) {
- System.out.println("\n##### calculatePrefixList node=" + node);
+ // System.out.println("\n##### calculatePrefixList node=" + node);
MethodDescriptor md = graph.getMethodDescriptor();
Set<FlowNode> incomingNodeSetPrefix =
}
- private boolean containsClassDesc(ClassDescriptor cd, NTuple<Location> prefixLocTuple) {
- for (int i = 0; i < prefixLocTuple.size(); i++) {
- Location loc = prefixLocTuple.get(i);
- Descriptor locDesc = loc.getLocDescriptor();
- if (locDesc != null) {
- ClassDescriptor type = getClassTypeDescriptor(locDesc);
- if (type != null && type.equals(cd)) {
- return true;
- }
- }
- }
- return false;
- }
-
private GlobalFlowGraph constructSubGlobalFlowGraph(FlowGraph flowGraph) {
MethodDescriptor md = flowGraph.getMethodDescriptor();
// here only keep the first element(method location) of the descriptor
// tuple
NTuple<Location> srcLocTuple = translateToLocTuple(md, srcDescTuple);
- // Location srcMethodLoc = srcLocTuple.get(0);
- // Descriptor srcVarDesc = srcMethodLoc.getLocDescriptor();
- // // if (flowGraph.isParamDesc(srcVarDesc) &&
- // (!srcVarDesc.equals(md.getThis()))) {
- // if (!srcVarDesc.equals(md.getThis())) {
- // srcLocTuple = new NTuple<Location>();
- // Location loc = new Location(md, srcVarDesc);
- // srcLocTuple.add(loc);
- // }
- //
NTuple<Location> dstLocTuple = translateToLocTuple(md, dstDescTuple);
- // Location dstMethodLoc = dstLocTuple.get(0);
- // Descriptor dstVarDesc = dstMethodLoc.getLocDescriptor();
- // if (!dstVarDesc.equals(md.getThis())) {
- // dstLocTuple = new NTuple<Location>();
- // Location loc = new Location(md, dstVarDesc);
- // dstLocTuple.add(loc);
- // }
globalGraph.addValueFlowEdge(srcLocTuple, dstLocTuple);
} else if (desc instanceof FieldDescriptor) {
enclosingDesc = ((FieldDescriptor) desc).getType().getClassDesc();
} else {
- // TODO: inter descriptor case
enclosingDesc = desc;
}
private void propagateValueFlowsToCallerFromSubGlobalFlowGraph(MethodInvokeNode min,
MethodDescriptor mdCaller, MethodDescriptor possibleMdCallee) {
- System.out.println("---propagate from " + min.printNode(0) + " to caller=" + mdCaller);
+ // System.out.println("---propagate from " + min.printNode(0) + " to caller=" + mdCaller);
FlowGraph calleeFlowGraph = getFlowGraph(possibleMdCallee);
Map<Integer, NTuple<Descriptor>> mapIdxToArg = mapMethodInvokeNodeToArgIdxMap.get(min);
- System.out.println("-----mapMethodInvokeNodeToArgIdxMap.get(min)="
- + mapMethodInvokeNodeToArgIdxMap.get(min));
+ // System.out.println("-----mapMethodInvokeNodeToArgIdxMap.get(min)="
+ // + mapMethodInvokeNodeToArgIdxMap.get(min));
Set<Integer> keySet = mapIdxToArg.keySet();
for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
NTuple<Location> argLocTuple = translateToLocTuple(mdCaller, argDescTuple);
NTuple<Descriptor> paramDescTuple = calleeFlowGraph.getParamFlowNode(idx).getDescTuple();
NTuple<Location> paramLocTuple = translateToLocTuple(possibleMdCallee, paramDescTuple);
- System.out.println("-------paramDescTuple=" + paramDescTuple + "->argDescTuple="
- + argDescTuple);
+ // System.out.println("-------paramDescTuple=" + paramDescTuple + "->argDescTuple="
+ // + argDescTuple);
addMapCallerArgToCalleeParam(min, argDescTuple, paramDescTuple);
}
}
addValueFlowFromCalleeNode(min, mdCaller, possibleMdCallee, calleeNode);
}
- System.out.println("$$$GLOBAL PC LOC ADD=" + mdCaller);
+ // System.out.println("$$$GLOBAL PC LOC ADD=" + mdCaller);
Set<NTuple<Location>> pcLocTupleSet = mapMethodInvokeNodeToPCLocTupleSet.get(min);
- System.out.println("---pcLocTupleSet=" + pcLocTupleSet);
+ // System.out.println("---pcLocTupleSet=" + pcLocTupleSet);
GlobalFlowGraph callerSubGlobalGraph = getSubGlobalFlowGraph(mdCaller);
for (Iterator iterator = calleeNodeSet.iterator(); iterator.hasNext();) {
GlobalFlowNode calleeNode = (GlobalFlowNode) iterator.next();
if (calleeNode.isParamNodeWithIncomingFlows()) {
- System.out.println("calleeNode.getLocTuple()" + calleeNode.getLocTuple());
+ // System.out.println("calleeNode.getLocTuple()" + calleeNode.getLocTuple());
NTuple<Location> callerSrcNodeLocTuple =
translateToCallerLocTuple(min, possibleMdCallee, mdCaller, calleeNode.getLocTuple());
- System.out.println("---callerSrcNodeLocTuple=" + callerSrcNodeLocTuple);
+ // System.out.println("---callerSrcNodeLocTuple=" + callerSrcNodeLocTuple);
if (callerSrcNodeLocTuple != null && callerSrcNodeLocTuple.size() > 0) {
for (Iterator iterator2 = pcLocTupleSet.iterator(); iterator2.hasNext();) {
NTuple<Location> pcLocTuple = (NTuple<Location>) iterator2.next();
+
callerSubGlobalGraph.addValueFlowEdge(pcLocTuple, callerSrcNodeLocTuple);
}
}
translateToCallerLocTuple(min, mdCallee, mdCaller, outNode.getLocTuple());
// System.out.println("outNode=" + outNode + " callerDstNodeLocTuple="
// + callerDstNodeLocTuple);
- if (callerDstNodeLocTuple != null) {
+ if (callerSrcNodeLocTuple != null && callerDstNodeLocTuple != null
+ && callerSrcNodeLocTuple.size() > 0 && callerDstNodeLocTuple.size() > 0) {
callerSubGlobalGraph.addValueFlowEdge(callerSrcNodeLocTuple, callerDstNodeLocTuple);
}
}
TypeDescriptor type = ((FieldDescriptor) desc).getType();
if (type.isArray()) {
- return false;
+ return !type.isPrimitive();
} else {
return type.isPtr();
}
} else if (desc instanceof VarDescriptor) {
TypeDescriptor type = ((VarDescriptor) desc).getType();
if (type.isArray()) {
- return false;
+ return !type.isPrimitive();
} else {
return type.isPtr();
}
System.out.println("\nSSJAVA: generate method summary: " + md);
FlowGraph flowGraph = getFlowGraph(md);
+ if (flowGraph == null) {
+ continue;
+ }
MethodSummary methodSummary = getMethodSummary(md);
HierarchyGraph scGraph = getSkeletonCombinationHierarchyGraph(md);
// set the 'this' reference location
if (!md.isStatic()) {
- System.out.println("setThisLocName=" + scGraph.getHNode(md.getThis()).getName());
+ // System.out.println("setThisLocName=" + scGraph.getHNode(md.getThis()).getName());
methodSummary.setThisLocName(scGraph.getHNode(md.getThis()).getName());
}
FlowNode flowNode = flowGraph.getParamFlowNode(paramIdx);
CompositeLocation inferredCompLoc =
updateCompositeLocation(flowNode.getCompositeLocation());
- // NTuple<Descriptor> descTuple = flowNode.getDescTuple();
- //
- // CompositeLocation assignedCompLoc = flowNode.getCompositeLocation();
- // CompositeLocation inferredCompLoc;
- // if (assignedCompLoc != null) {
- // inferredCompLoc = translateCompositeLocation(assignedCompLoc);
- // } else {
- // Descriptor locDesc = descTuple.get(0);
- // Location loc = new Location(md, locDesc.getSymbol());
- // loc.setLocDescriptor(locDesc);
- // inferredCompLoc = new CompositeLocation(loc);
- // }
- System.out.println("-paramIdx=" + paramIdx + " infer=" + inferredCompLoc + " original="
- + flowNode.getCompositeLocation());
+ // System.out.println("-paramIdx=" + paramIdx + " infer=" + inferredCompLoc + " original="
+ // + flowNode.getCompositeLocation());
Descriptor localVarDesc = flowNode.getDescTuple().get(0);
methodSummary.addMapVarNameToInferCompLoc(localVarDesc, inferredCompLoc);
HNode node1 = hierarchyGraph.getHNode(locDesc1);
HNode node2 = hierarchyGraph.getHNode(locDesc2);
- System.out.println("---node1=" + node1 + " node2=" + node2);
- System.out.println("---hierarchyGraph.getIncomingNodeSet(node2)="
- + hierarchyGraph.getIncomingNodeSet(node2));
+ // System.out.println("---node1=" + node1 + " node2=" + node2);
+ // System.out.println("---hierarchyGraph.getIncomingNodeSet(node2)="
+ // + hierarchyGraph.getIncomingNodeSet(node2));
if (locDesc1.equals(locDesc2)) {
continue;
HNode node1 = hierarchyGraph.getHNode(locDesc1);
HNode node2 = hierarchyGraph.getHNode(locDesc2);
- System.out.println("---node1=" + node1 + " node2=" + node2);
- System.out.println("---hierarchyGraph.getIncomingNodeSet(node2)="
- + hierarchyGraph.getIncomingNodeSet(node2));
+ // System.out.println("---node1=" + node1 + " node2=" + node2);
+ // System.out.println("---hierarchyGraph.getIncomingNodeSet(node2)="
+ // + hierarchyGraph.getIncomingNodeSet(node2));
if (locDesc1.equals(locDesc2)) {
continue;
} else if (hierarchyGraph.getIncomingNodeSet(node2).contains(node1)) {
return true;
} else {
- return false;
- }
-
- }
-
- return false;
- }
-
- private CompositeLocation translateCompositeLocation(CompositeLocation compLoc) {
- CompositeLocation newCompLoc = new CompositeLocation();
+ return false;
+ }
- // System.out.println("compLoc=" + compLoc);
- for (int i = 0; i < compLoc.getSize(); i++) {
- Location loc = compLoc.get(i);
- Descriptor enclosingDescriptor = loc.getDescriptor();
- Descriptor locDescriptor = loc.getLocDescriptor();
-
- HNode hnode = getHierarchyGraph(enclosingDescriptor).getHNode(locDescriptor);
- // System.out.println("-hnode=" + hnode + " from=" + locDescriptor +
- // " enclosingDescriptor="
- // + enclosingDescriptor);
- // System.out.println("-getLocationSummary(enclosingDescriptor)="
- // + getLocationSummary(enclosingDescriptor));
- String locName = getLocationSummary(enclosingDescriptor).getLocationName(hnode.getName());
- // System.out.println("-locName=" + locName);
- Location newLoc = new Location(enclosingDescriptor, locName);
- newLoc.setLocDescriptor(locDescriptor);
- newCompLoc.addLocation(newLoc);
}
- return newCompLoc;
+ return false;
}
private void debug_writeLattices() {
// HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(key);
HierarchyGraph scHierarchyGraph = getSkeletonCombinationHierarchyGraph(key);
if (key instanceof ClassDescriptor) {
- writeInferredLatticeDotFile((ClassDescriptor) key, scHierarchyGraph, simpleLattice,
- "_SIMPLE");
+ writeInferredLatticeDotFile((ClassDescriptor) key, simpleLattice, "_SIMPLE");
} else if (key instanceof MethodDescriptor) {
MethodDescriptor md = (MethodDescriptor) key;
- writeInferredLatticeDotFile(md.getClassDesc(), md, scHierarchyGraph, simpleLattice,
- "_SIMPLE");
+ writeInferredLatticeDotFile(md.getClassDesc(), md, simpleLattice, "_SIMPLE");
}
LocationSummary ls = getLocationSummary(key);
- System.out.println("####LOC SUMMARY=" + key + "\n" + ls.getMapHNodeNameToLocationName());
+ // System.out.println("####LOC SUMMARY=" + key + "\n" + ls.getMapHNodeNameToLocationName());
}
Set<ClassDescriptor> cdKeySet = cd2lattice.keySet();
for (Iterator iterator = cdKeySet.iterator(); iterator.hasNext();) {
ClassDescriptor cd = (ClassDescriptor) iterator.next();
- writeInferredLatticeDotFile((ClassDescriptor) cd, getSkeletonCombinationHierarchyGraph(cd),
- cd2lattice.get(cd), "");
+ // System.out.println("########cd=" + cd);
+ writeInferredLatticeDotFile((ClassDescriptor) cd, cd2lattice.get(cd), "");
+ COUNT += cd2lattice.get(cd).getKeySet().size();
}
Set<MethodDescriptor> mdKeySet = md2lattice.keySet();
for (Iterator iterator = mdKeySet.iterator(); iterator.hasNext();) {
MethodDescriptor md = (MethodDescriptor) iterator.next();
- writeInferredLatticeDotFile(md.getClassDesc(), md, getSkeletonCombinationHierarchyGraph(md),
- md2lattice.get(md), "");
+ writeInferredLatticeDotFile(md.getClassDesc(), md, md2lattice.get(md), "");
+ COUNT += md2lattice.get(md).getKeySet().size();
}
+ System.out.println("###COUNT=" + COUNT);
+
+ Set<Descriptor> descKeySet = desc2naiveLattice.keySet();
+ for (Iterator iterator = descKeySet.iterator(); iterator.hasNext();) {
+ Descriptor desc = (Descriptor) iterator.next();
+ // System.out.println("########cd=" + cd);
+ ClassDescriptor cd_naive;
+ MethodDescriptor md_naive;
+ if (desc instanceof ClassDescriptor) {
+ cd_naive = (ClassDescriptor) desc;
+ md_naive = null;
+ } else {
+ md_naive = (MethodDescriptor) desc;
+ cd_naive = md_naive.getClassDesc();
+ }
+
+ writeInferredLatticeDotFile(cd_naive, md_naive, desc2naiveLattice.get(desc), "_naive");
+ }
}
- private void buildLattice() {
+ private void buildLattice(Descriptor desc) {
+ // System.out.println("buildLattice=" + desc);
+ SSJavaLattice<String> simpleLattice = buildLattice.buildLattice(desc);
+
+ addMapDescToSimpleLattice(desc, simpleLattice);
+
+ HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(desc);
+ // System.out.println("\n## insertIntermediateNodesToStraightLine:"
+ // + simpleHierarchyGraph.getName());
+ SSJavaLattice<String> lattice =
+ buildLattice.insertIntermediateNodesToStraightLine(desc, simpleLattice);
- BuildLattice buildLattice = new BuildLattice(this);
+ if (lattice == null) {
+ return;
+ }
+ lattice.removeRedundantEdges();
+
+ LocationInference.numLocationsSInfer += lattice.getKeySet().size();
+
+ if (desc instanceof ClassDescriptor) {
+ // field lattice
+ cd2lattice.put((ClassDescriptor) desc, lattice);
+ // ssjava.writeLatticeDotFile((ClassDescriptor) desc, null, lattice);
+ } else if (desc instanceof MethodDescriptor) {
+ // method lattice
+ md2lattice.put((MethodDescriptor) desc, lattice);
+ MethodDescriptor md = (MethodDescriptor) desc;
+ ClassDescriptor cd = md.getClassDesc();
+ // ssjava.writeLatticeDotFile(cd, md, lattice);
+ }
+
+ }
+
+ // deprecated: it builds method/class lattices without considering class inheritance
+ private void buildLattice() {
Set<Descriptor> keySet = mapDescriptorToCombineSkeletonHierarchyGraph.keySet();
for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
buildLattice.insertIntermediateNodesToStraightLine(desc, simpleLattice);
lattice.removeRedundantEdges();
+ LocationInference.numLocationsSInfer += lattice.getKeySet().size();
+
if (desc instanceof ClassDescriptor) {
// field lattice
cd2lattice.put((ClassDescriptor) desc, lattice);
// ssjava.writeLatticeDotFile(cd, md, lattice);
}
- // System.out.println("\nSSJAVA: Insering Combination Nodes:" + desc);
- // HierarchyGraph skeletonGraph = getSkeletonHierarchyGraph(desc);
- // HierarchyGraph skeletonGraphWithCombinationNode =
- // skeletonGraph.clone();
- // skeletonGraphWithCombinationNode.setName(desc + "_SC");
- //
- // HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(desc);
- // System.out.println("Identifying Combination Nodes:");
- // skeletonGraphWithCombinationNode.insertCombinationNodesToGraph(simpleHierarchyGraph);
- // skeletonGraphWithCombinationNode.simplifySkeletonCombinationHierarchyGraph();
- // mapDescriptorToCombineSkeletonHierarchyGraph.put(desc,
- // skeletonGraphWithCombinationNode);
+ }
+
+ }
+
+ private void buildLatticeInheritanceTree() {
+ // DFS the inheritance tree and propagates lattice nodes/edges from the parent to children
+ // Node<ClassDescriptor> rootNode = inheritanceTree.getRootNode();
+ DFSBuildLatticeInheritanceTree(rootClassDescriptor);
+ }
+
+ public Set<ClassDescriptor> getDirectSubClasses(ClassDescriptor parent) {
+
+ Set<ClassDescriptor> result = new HashSet<ClassDescriptor>();
+
+ Set<ClassDescriptor> children = tu.getDirectSubClasses(parent);
+ if (children == null) {
+ children = new HashSet<ClassDescriptor>();
+ }
+
+ for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ ClassDescriptor child = (ClassDescriptor) iterator.next();
+ if (toanalyze_classDescSet.contains(child)) {
+ result.add(child);
+ }
+ }
+
+ return result;
+ }
+
+ private void DFSBuildLatticeInheritanceTree(ClassDescriptor cd) {
+ // ClassDescriptor cd = node.getData();
+
+ ClassDescriptor parentClassDesc = cd.getSuperDesc();
+ if (parentClassDesc != null) {
+ Map<TripleItem, String> parentMap = buildLattice.getIntermediateLocMap(parentClassDesc);
+ buildLattice.setIntermediateLocMap(cd, parentMap);
+ }
+
+ buildLattice(cd);
+
+ for (Iterator iterator = cd.getMethods(); iterator.hasNext();) {
+ MethodDescriptor md = (MethodDescriptor) iterator.next();
+ if (toanalyze_methodDescList.contains(md)) {
+ MethodDescriptor parentMethodDesc = getParentMethodDesc(md.getClassDesc(), md);
+ if (parentMethodDesc != null) {
+ Map<TripleItem, String> parentMap = buildLattice.getIntermediateLocMap(parentMethodDesc);
+ Map<TripleItem, String> childMap = new HashMap<TripleItem, String>();
+ Set<TripleItem> keySet = parentMap.keySet();
+ for (Iterator iterator2 = keySet.iterator(); iterator2.hasNext();) {
+ TripleItem key = (TripleItem) iterator2.next();
+ childMap.put(key, parentMap.get(key));
+ }
+ buildLattice.setIntermediateLocMap(md, childMap);
+ }
+ buildLattice(md);
+ }
+ }
+
+ // traverse children
+ Set<ClassDescriptor> children = tu.getDirectSubClasses(cd);
+ if (children != null) {
+ for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ ClassDescriptor classDescriptor = (ClassDescriptor) iterator.next();
+ if (toanalyze_classDescSet.contains(classDescriptor)) {
+ DFSBuildLatticeInheritanceTree(classDescriptor);
+ } else {
+ if (classDescriptor.isAbstract()) {
+ DFSBuildLatticeInheritanceTree(classDescriptor);
+ }
+ }
+ }
}
}
Set<Descriptor> keySet = mapDescriptorToSkeletonHierarchyGraph.keySet();
for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
Descriptor desc = (Descriptor) iterator.next();
- System.out.println("\nSSJAVA: Insering Combination Nodes:" + desc);
+ System.out.println("\nSSJAVA: Inserting Combination Nodes:" + desc);
HierarchyGraph skeletonGraph = getSkeletonHierarchyGraph(desc);
HierarchyGraph skeletonGraphWithCombinationNode = skeletonGraph.clone();
skeletonGraphWithCombinationNode.setName(desc + "_SC");
HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(desc);
- System.out.println("Identifying Combination Nodes:");
skeletonGraphWithCombinationNode.insertCombinationNodesToGraph(simpleHierarchyGraph);
- skeletonGraphWithCombinationNode.simplifySkeletonCombinationHierarchyGraph();
+ // skeletonGraphWithCombinationNode.insertCombinationNodesToGraph(simpleHierarchyGraph,
+ // skeletonGraph);
+ // skeletonGraphWithCombinationNode.simplifySkeletonCombinationHierarchyGraph();
+ skeletonGraphWithCombinationNode.removeRedundantEdges();
mapDescriptorToCombineSkeletonHierarchyGraph.put(desc, skeletonGraphWithCombinationNode);
}
}
HierarchyGraph skeletonGraph = simpleGraph.generateSkeletonGraph();
skeletonGraph.setMapDescToHNode(simpleGraph.getMapDescToHNode());
skeletonGraph.setMapHNodeToDescSet(simpleGraph.getMapHNodeToDescSet());
- skeletonGraph.simplifyHierarchyGraph();
- // skeletonGraph.combineRedundantNodes(false);
- // skeletonGraph.removeRedundantEdges();
+ skeletonGraph.simplifyHierarchyGraph(this);
mapDescriptorToSkeletonHierarchyGraph.put(desc, skeletonGraph);
}
}
+ private void recurUpAccumulateInheritanceDesc(Descriptor curDesc, Set<Descriptor> set) {
+
+ if (curDesc instanceof ClassDescriptor) {
+ ClassDescriptor cd = (ClassDescriptor) curDesc;
+ ClassDescriptor parentClassDesc = cd.getSuperDesc();
+ if (parentClassDesc != null && !parentClassDesc.equals(rootClassDescriptor)) {
+ set.add(parentClassDesc);
+ recurUpAccumulateInheritanceDesc(parentClassDesc, set);
+ }
+ } else {
+ MethodDescriptor md = (MethodDescriptor) curDesc;
+ ClassDescriptor cd = md.getClassDesc();
+
+ // traverse up
+ ClassDescriptor parentClassDesc = cd.getSuperDesc();
+ if (parentClassDesc != null && !parentClassDesc.equals(rootClassDescriptor)) {
+
+ Set<MethodDescriptor> methodDescSet =
+ parentClassDesc.getMethodTable().getSet(md.getSymbol());
+ for (Iterator iterator = methodDescSet.iterator(); iterator.hasNext();) {
+ MethodDescriptor parentMethodDesc = (MethodDescriptor) iterator.next();
+ if (parentMethodDesc.matches(md)) {
+ set.add(parentMethodDesc);
+ recurUpAccumulateInheritanceDesc(parentMethodDesc, set);
+ }
+ }
+ }
+
+ }
+
+ }
+
+ private void recurDownAccumulateInheritanceDesc(Descriptor curDesc, Set<Descriptor> set) {
+
+ if (curDesc instanceof ClassDescriptor) {
+ ClassDescriptor cd = (ClassDescriptor) curDesc;
+ ClassDescriptor parentClassDesc = cd.getSuperDesc();
+ Set<ClassDescriptor> directSubClasses = tu.getDirectSubClasses(cd);
+ for (Iterator iterator = directSubClasses.iterator(); iterator.hasNext();) {
+ ClassDescriptor child = (ClassDescriptor) iterator.next();
+ recurDownAccumulateInheritanceDesc(child, set);
+ }
+ } else {
+ MethodDescriptor md = (MethodDescriptor) curDesc;
+ ClassDescriptor cd = md.getClassDesc();
+
+ // traverse down
+ Set<ClassDescriptor> directSubClasses = tu.getDirectSubClasses(cd);
+ for (Iterator iterator = directSubClasses.iterator(); iterator.hasNext();) {
+ ClassDescriptor child = (ClassDescriptor) iterator.next();
+
+ Set<MethodDescriptor> methodDescSet = child.getMethodTable().getSet(md.getSymbol());
+ for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) {
+ MethodDescriptor childMethodDesc = (MethodDescriptor) iterator2.next();
+ if (childMethodDesc.matches(md)) {
+ set.add(childMethodDesc);
+ recurDownAccumulateInheritanceDesc(childMethodDesc, set);
+ }
+ }
+ }
+
+ }
+
+ }
+
+ private void accumulateInheritanceDesc(Descriptor curDesc, Set<Descriptor> set) {
+
+ recurUpAccumulateInheritanceDesc(curDesc, set);
+ recurDownAccumulateInheritanceDesc(curDesc, set);
+
+ }
+
+ public boolean isValidMergeInheritanceCheck(Descriptor desc, Set<HNode> mergeSet) {
+
+ // set up inheritance chain set...
+ Set<Descriptor> inheritanceDescSet = new HashSet<Descriptor>();
+ recurUpAccumulateInheritanceDesc(desc, inheritanceDescSet);
+
+ nextgraph: for (Iterator iterator = inheritanceDescSet.iterator(); iterator.hasNext();) {
+ Descriptor inheritDesc = (Descriptor) iterator.next();
+
+ if (!desc.equals(inheritDesc)) {
+ HierarchyGraph graph = getSkeletonCombinationHierarchyGraph(inheritDesc);
+
+ // first check whether this graph includes all elements of the merge set
+ for (Iterator iterator2 = mergeSet.iterator(); iterator2.hasNext();) {
+ HNode node = (HNode) iterator2.next();
+ if (!graph.contains(node)) {
+ continue nextgraph;
+ }
+ }
+
+ HNode firstNode = mergeSet.iterator().next();
+
+ Set<HNode> incomingNode = graph.getIncomingNodeSet(firstNode);
+ Set<HNode> outgoingNode = graph.getOutgoingNodeSet(firstNode);
+
+ for (Iterator iterator2 = mergeSet.iterator(); iterator2.hasNext();) {
+ HNode node = (HNode) iterator2.next();
+
+ if (!graph.getIncomingNodeSet(node).equals(incomingNode)
+ || !graph.getOutgoingNodeSet(node).equals(outgoingNode)) {
+ return false;
+ }
+
+ }
+ }
+
+ }
+
+ return true;
+ }
+
private void debug_writeHierarchyDotFiles() {
Set<Descriptor> keySet = mapDescriptorToHierarchyGraph.keySet();
Descriptor desc = (Descriptor) iterator.next();
getHierarchyGraph(desc).writeGraph();
getSimpleHierarchyGraph(desc).writeGraph();
+ getSimpleHierarchyGraph(desc).writeGraph(true);
}
}
private void constructHierarchyGraph() {
+ LinkedList<MethodDescriptor> methodDescList =
+ (LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
+
+ while (!methodDescList.isEmpty()) {
+ MethodDescriptor md = methodDescList.removeLast();
+ if (state.SSJAVADEBUG) {
+ HierarchyGraph hierarchyGraph = new HierarchyGraph(md);
+ System.out.println();
+ System.out.println("SSJAVA: Construcing the hierarchy graph from " + md);
+ constructHierarchyGraph(md, hierarchyGraph);
+ mapDescriptorToHierarchyGraph.put(md, hierarchyGraph);
+
+ }
+ }
+
+ setupToAnalyze();
+ while (!toAnalyzeIsEmpty()) {
+ ClassDescriptor cd = toAnalyzeNext();
+ HierarchyGraph graph = getHierarchyGraph(cd);
+ for (Iterator iter = cd.getFields(); iter.hasNext();) {
+ FieldDescriptor fieldDesc = (FieldDescriptor) iter.next();
+ if (!(fieldDesc.isStatic() && fieldDesc.isFinal())) {
+ graph.getHNode(fieldDesc);
+ }
+ }
+ }
+
+ Set<Descriptor> keySet = mapDescriptorToHierarchyGraph.keySet();
+ for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+ Descriptor key = (Descriptor) iterator.next();
+ HierarchyGraph graph = getHierarchyGraph(key);
+
+ Set<HNode> nodeToBeConnected = new HashSet<HNode>();
+ for (Iterator iterator2 = graph.getNodeSet().iterator(); iterator2.hasNext();) {
+ HNode node = (HNode) iterator2.next();
+ if (!node.isSkeleton() && !node.isCombinationNode()) {
+ if (graph.getIncomingNodeSet(node).size() == 0) {
+ nodeToBeConnected.add(node);
+ }
+ }
+ }
+
+ for (Iterator iterator2 = nodeToBeConnected.iterator(); iterator2.hasNext();) {
+ HNode node = (HNode) iterator2.next();
+ // System.out.println("NEED TO BE CONNECTED TO TOP=" + node);
+ graph.addEdge(graph.getHNode(TOPDESC), node);
+ }
+
+ }
+
+ }
+
+ private void constructHierarchyGraph2() {
+
// do fixed-point analysis
LinkedList<MethodDescriptor> descriptorListToAnalyze = ssjava.getSortedDescriptors();
for (Iterator iterator2 = nodeToBeConnected.iterator(); iterator2.hasNext();) {
HNode node = (HNode) iterator2.next();
- System.out.println("NEED TO BE CONNECTED TO TOP=" + node);
+ // System.out.println("NEED TO BE CONNECTED TO TOP=" + node);
graph.addEdge(graph.getHNode(TOPDESC), node);
}
Set<FlowNode> sourceNodeSet = new HashSet<FlowNode>();
if (originalSrcNode instanceof FlowReturnNode) {
FlowReturnNode rnode = (FlowReturnNode) originalSrcNode;
- System.out.println("rnode=" + rnode);
+ // System.out.println("rnode=" + rnode);
Set<NTuple<Descriptor>> tupleSet = rnode.getReturnTupleSet();
for (Iterator iterator2 = tupleSet.iterator(); iterator2.hasNext();) {
NTuple<Descriptor> nTuple = (NTuple<Descriptor>) iterator2.next();
sourceNodeSet.add(fg.getFlowNode(nTuple));
- System.out.println("&&&SOURCE fg.getFlowNode(nTuple)=" + fg.getFlowNode(nTuple));
+ // System.out.println("&&&SOURCE fg.getFlowNode(nTuple)=" + fg.getFlowNode(nTuple));
}
} else {
sourceNodeSet.add(originalSrcNode);
for (Iterator iterator4 = tupleSet.iterator(); iterator4.hasNext();) {
NTuple<Descriptor> nTuple = (NTuple<Descriptor>) iterator4.next();
dstNodeSet.add(fg.getFlowNode(nTuple));
- System.out.println("&&&DST fg.getFlowNode(nTuple)=" + fg.getFlowNode(nTuple));
+ // System.out.println("&&&DST fg.getFlowNode(nTuple)=" + fg.getFlowNode(nTuple));
}
} else {
dstNodeSet.add(originalDstNode);
if (dstLocalDesc instanceof InterDescriptor
&& ((InterDescriptor) dstLocalDesc).getMethodArgIdxPair() != null) {
if (dstNode.getCompositeLocation() == null) {
- System.out.println("%%%%%%%%%%%%%SKIP=" + dstNode);
+ // System.out.println("%%%%%%%%%%%%%SKIP=" + dstNode);
continue;
}
}
NTuple<Descriptor> srcCurTuple = srcNode.getCurrentDescTuple();
NTuple<Descriptor> dstCurTuple = dstNode.getCurrentDescTuple();
- System.out.println("-srcCurTuple=" + srcCurTuple + " dstCurTuple=" + dstCurTuple
- + " srcNode=" + srcNode + " dstNode=" + dstNode);
+ // //////////////////////////
+ // inheritance check
+ if (mapMethodDescToHighestOverriddenMethodDesc.containsKey(md)) {
+
+ MethodDescriptor highestOverriddenMethodDesc =
+ mapMethodDescToHighestOverriddenMethodDesc.get(md);
+
+ if (srcCurTuple.get(srcCurTuple.size() - 1).getSymbol().startsWith(PCLOC)) {
+ }
+
+ }
+ // //////////////////////////
+
+ // System.out.println("-srcCurTuple=" + srcCurTuple + " dstCurTuple=" + dstCurTuple
+ // + " srcNode=" + srcNode + " dstNode=" + dstNode);
+
+ // srcCurTuple = translateBaseTuple(srcNode, srcCurTuple);
+ // dstCurTuple = translateBaseTuple(dstNode, dstCurTuple);
if ((srcCurTuple.size() > 1 && dstCurTuple.size() > 1)
&& srcCurTuple.get(0).equals(dstCurTuple.get(0))) {
}
+ private NTuple<Descriptor> translateBaseTuple(FlowNode flowNode, NTuple<Descriptor> inTuple) {
+
+ if (flowNode.getBaseTuple() != null) {
+
+ NTuple<Descriptor> translatedTuple = new NTuple<Descriptor>();
+
+ NTuple<Descriptor> baseTuple = flowNode.getBaseTuple();
+
+ for (int i = 0; i < baseTuple.size(); i++) {
+ translatedTuple.add(baseTuple.get(i));
+ }
+
+ for (int i = 1; i < inTuple.size(); i++) {
+ translatedTuple.add(inTuple.get(i));
+ }
+
+ // System.out.println("------TRANSLATED " + inTuple + " -> " + translatedTuple);
+ return translatedTuple;
+
+ } else {
+ return inTuple;
+ }
+
+ }
+
private MethodSummary getMethodSummary(MethodDescriptor md) {
if (!mapDescToLocationSummary.containsKey(md)) {
mapDescToLocationSummary.put(md, new MethodSummary(md));
Map<String, Set<String>> map = lattice.getTable();
Set<String> keySet = map.keySet();
+
+ // System.out.println("@generateLatticeDefinition=" + desc + " map=" + map);
+
boolean first = true;
for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
String key = (String) iterator.next();
}
if (desc instanceof MethodDescriptor) {
- System.out.println("#EXTRA LOC DECLARATION GEN=" + desc);
+ // System.out.println("#EXTRA LOC DECLARATION GEN=" + desc);
MethodDescriptor md = (MethodDescriptor) desc;
MethodSummary methodSummary = getMethodSummary(md);
}
SSJavaLattice<String> methodLattice = md2lattice.get(md);
+ // System.out.println("md=" + md + " methodLattice=" + methodLattice);
if (methodLattice != null) {
int methodDefLine = md.getLineNum();
Map<Descriptor, CompositeLocation> mapVarDescToInferLoc =
methodSummary.getMapVarDescToInferCompositeLocation();
- System.out.println("-----md=" + md);
- System.out.println("-----mapVarDescToInferLoc=" + mapVarDescToInferLoc);
+ // System.out.println("-----md=" + md + " methodDefLine=" + methodDefLine);
+ // System.out.println("-----mapVarDescToInferLoc=" + mapVarDescToInferLoc);
Set<Descriptor> localVarDescSet = mapVarDescToInferLoc.keySet();
for (Iterator iterator = localVarDescSet.iterator(); iterator.hasNext();) {
Descriptor localVarDesc = (Descriptor) iterator.next();
- System.out.println("-------localVarDesc=" + localVarDesc);
+ // System.out.println("-------localVarDesc=" + localVarDesc);
CompositeLocation inferLoc = mapVarDescToInferLoc.get(localVarDesc);
String localLocIdentifier = inferLoc.get(0).getLocIdentifier();
if (mapDescToDefinitionLine.containsKey(localVarDesc)) {
int varLineNum = mapDescToDefinitionLine.get(localVarDesc);
String orgSourceLine = sourceVec.get(varLineNum);
- System.out.println("varLineNum=" + varLineNum + " org src=" + orgSourceLine);
+ // System.out.println("varLineNum=" + varLineNum + " org src=" + orgSourceLine);
int idx =
orgSourceLine.indexOf(generateVarDeclaration((VarDescriptor) localVarDesc));
- System.out.println("idx=" + idx
- + " generateVarDeclaration((VarDescriptor) localVarDesc)="
- + generateVarDeclaration((VarDescriptor) localVarDesc));
+ // System.out.println("idx=" + idx
+ // + " generateVarDeclaration((VarDescriptor) localVarDesc)="
+ // + generateVarDeclaration((VarDescriptor) localVarDesc));
assert (idx != -1);
String annoatedStr =
orgSourceLine.substring(0, idx) + locAnnotationStr + " "
int idx =
getParamLocation(methodDefStr,
generateVarDeclaration((VarDescriptor) localVarDesc));
- System.out.println("methodDefStr=" + methodDefStr + " localVarDesc=" + localVarDesc
- + " idx=" + idx);
+ // System.out.println("methodDefStr=" + methodDefStr + " localVarDesc=" + localVarDesc
+ // + " idx=" + idx);
assert (idx != -1);
String annoatedStr =
SSJavaLattice<String> classLattice = cd2lattice.get(cd);
if (classLattice != null) {
ssjava.writeLatticeDotFile(cd, null, classLattice);
- debug_printDescriptorToLocNameMapping(cd);
+ // debug_printDescriptorToLocNameMapping(cd);
}
while (!toAnalyzeMethodIsEmpty()) {
SSJavaLattice<String> methodLattice = md2lattice.get(md);
if (methodLattice != null) {
ssjava.writeLatticeDotFile(cd, md, methodLattice);
- debug_printDescriptorToLocNameMapping(md);
+ // debug_printDescriptorToLocNameMapping(md);
}
}
}
private void calculateExtraLocations() {
- LinkedList<MethodDescriptor> methodDescList = ssjava.getSortedDescriptors();
+ // LinkedList<MethodDescriptor> methodDescList = ssjava.getSortedDescriptors();
+ LinkedList<MethodDescriptor> methodDescList =
+ (LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
for (Iterator iterator = methodDescList.iterator(); iterator.hasNext();) {
MethodDescriptor md = (MethodDescriptor) iterator.next();
if (!ssjava.getMethodContainingSSJavaLoop().equals(md)) {
private void calculatePCLOC(MethodDescriptor md) {
- System.out.println("#CalculatePCLOC");
+ // System.out.println("#CalculatePCLOC");
MethodSummary methodSummary = getMethodSummary(md);
FlowGraph fg = getFlowGraph(md);
Map<Integer, CompositeLocation> mapParamToLoc = methodSummary.getMapParamIdxToInferLoc();
}
}
- System.out.println("paramLocTupleHavingInFlowSet=" + paramLocTupleHavingInFlowSet);
+ // System.out.println("paramLocTupleHavingInFlowSet=" + paramLocTupleHavingInFlowSet);
if (paramLocTupleHavingInFlowSet.size() > 0
&& !coversAllParamters(md, fg, paramLocTupleHavingInFlowSet)) {
if (!paramDescNOTHavingInFlowSet.contains(node.getCurrentDescTuple().get(0))) {
flowNodeLowerthanPCLocSet.add(node);
fg.addValueFlowEdge(pcDescTuple, node.getDescTuple());
+
subGlobalFlowGraph.addValueFlowEdge(pcLocTuple,
translateToLocTuple(md, node.getDescTuple()));
}
} else {
- System.out.println("***SKIP PCLOC -> RETURNLOC=" + node);
+ // System.out.println("***SKIP PCLOC -> RETURNLOC=" + node);
}
}
fg.getFlowNode(translateToDescTuple(pcLocTuple)).setSkeleton(true);
if (pcLocTuple.get(0).getLocDescriptor().equals(md.getThis())) {
- System.out.println("#########################################");
for (Iterator iterator = flowNodeLowerthanPCLocSet.iterator(); iterator.hasNext();) {
FlowNode lowerNode = (FlowNode) iterator.next();
- if (lowerNode.getCompositeLocation() == null) {
+ if (lowerNode.getDescTuple().size() == 1 && lowerNode.getCompositeLocation() == null) {
NTuple<Location> lowerLocTuple = translateToLocTuple(md, lowerNode.getDescTuple());
CompositeLocation newComp =
calculateCompositeLocationFromSubGlobalGraph(md, lowerNode);
subGlobalFlowGraph.addMapLocationToInferCompositeLocation(lowerLocTuple.get(0),
newComp);
lowerNode.setCompositeLocation(newComp);
- System.out.println("NEW COMP LOC=" + newComp + " to lowerNode=" + lowerNode);
+ // System.out.println("NEW COMP LOC=" + newComp + " to lowerNode=" + lowerNode);
}
}
}
}
- private boolean coversAllParamters(MethodDescriptor md, FlowGraph fg,
- Set<NTuple<Location>> paramLocTupleHavingInFlowSet) {
+ private int countFirstDescriptorSetSize(Set<NTuple<Location>> set) {
- int numParam = fg.getNumParameters();
- int size = paramLocTupleHavingInFlowSet.size();
+ Set<Descriptor> descSet = new HashSet<Descriptor>();
- if (!md.isStatic()) {
+ for (Iterator iterator = set.iterator(); iterator.hasNext();) {
+ NTuple<Location> locTuple = (NTuple<Location>) iterator.next();
+ descSet.add(locTuple.get(0).getLocDescriptor());
+ }
- // if the method is not static && there is a parameter composite location &&
- // it is started with 'this',
- // paramLocTupleHavingInFlowSet need to have 'this' parameter.
+ return descSet.size();
+ }
- FlowNode thisParamNode = fg.getParamFlowNode(0);
- NTuple<Location> thisParamLocTuple =
- translateToLocTuple(md, thisParamNode.getCurrentDescTuple());
+ private boolean coversAllParamters(MethodDescriptor md, FlowGraph fg,
+ Set<NTuple<Location>> paramLocTupleHavingInFlowSet) {
- if (!paramLocTupleHavingInFlowSet.contains(thisParamLocTuple)) {
+ int numParam = fg.getNumParameters();
+ // int size = paramLocTupleHavingInFlowSet.size();
+ int size = countFirstDescriptorSetSize(paramLocTupleHavingInFlowSet);
- for (Iterator iterator = paramLocTupleHavingInFlowSet.iterator(); iterator.hasNext();) {
- NTuple<Location> paramTuple = (NTuple<Location>) iterator.next();
- if (paramTuple.size() > 1 && paramTuple.get(0).getLocDescriptor().equals(md.getThis())) {
- // paramLocTupleHavingInFlowSet.add(thisParamLocTuple);
- // break;
- size++;
- }
- }
+ // System.out.println("numParam=" + numParam + " size=" + size);
- }
- }
+ // if (!md.isStatic()) {
+ //
+ // // if the method is not static && there is a parameter composite location &&
+ // // it is started with 'this',
+ // // paramLocTupleHavingInFlowSet need to have 'this' parameter.
+ //
+ // FlowNode thisParamNode = fg.getParamFlowNode(0);
+ // NTuple<Location> thisParamLocTuple =
+ // translateToLocTuple(md, thisParamNode.getCurrentDescTuple());
+ //
+ // if (!paramLocTupleHavingInFlowSet.contains(thisParamLocTuple)) {
+ //
+ // for (Iterator iterator = paramLocTupleHavingInFlowSet.iterator(); iterator.hasNext();) {
+ // NTuple<Location> paramTuple = (NTuple<Location>) iterator.next();
+ // if (paramTuple.size() > 1 && paramTuple.get(0).getLocDescriptor().equals(md.getThis())) {
+ // // paramLocTupleHavingInFlowSet.add(thisParamLocTuple);
+ // // break;
+ // size++;
+ // }
+ // }
+ //
+ // }
+ // }
if (size == numParam) {
return true;
private void calculateRETURNLOC(MethodDescriptor md) {
- System.out.println("#calculateRETURNLOC= " + md);
+ // System.out.println("#calculateRETURNLOC= " + md);
// calculate a return location:
// the return location type is lower than all parameters and the location of return values
NTuple<Descriptor> returnDescTuple = returnNode.getCurrentDescTuple();
tupleToBeHigherThanReturnLocSet.add(translateToLocTuple(md, returnDescTuple));
}
- System.out.println("-flow graph's returnNodeSet=" + returnNodeSet);
- System.out.println("tupleSetToBeHigherThanReturnLoc=" + tupleToBeHigherThanReturnLocSet);
+ // System.out.println("-flow graph's returnNodeSet=" + returnNodeSet);
+ // System.out.println("tupleSetToBeHigherThanReturnLoc=" + tupleToBeHigherThanReturnLocSet);
// Here, generates a return location in the method lattice that is lower than the
// locFlowingToReturnValueSet
break;
}
Location newLocElement = new Location(curLoc.getDescriptor(), curLoc.getLocDescriptor());
- System.out.println("newLocElement" + newLocElement);
+ // System.out.println("newLocElement" + newLocElement);
higherLocTuple.add(newLocElement);
enclosingDesc = getClassTypeDescriptor(curLoc.getLocDescriptor());
}
NameDescriptor locDesc = new NameDescriptor(locIdentifier);
Location newLoc = new Location(enclosingDesc, locDesc);
higherLocTuple.add(newLoc);
- System.out.println("---new loc tuple=" + higherLocTuple);
+ // System.out.println("---new loc tuple=" + higherLocTuple);
return higherLocTuple;
private void propagateFlowsToCallerWithNoCompositeLocation(MethodInvokeNode min,
MethodDescriptor mdCaller, MethodDescriptor mdCallee) {
- System.out.println("-propagateFlowsToCallerWithNoCompositeLocation=" + min.printNode(0));
+ // System.out.println("-propagateFlowsToCallerWithNoCompositeLocation=" + min.printNode(0));
// if the parameter A reaches to the parameter B
// then, add an edge the argument A -> the argument B to the caller's flow
// graph
for (int idx = 0; idx < numParam; idx++) {
FlowNode paramNode = calleeFlowGraph.getParamFlowNode(idx);
CompositeLocation compLoc = paramNode.getCompositeLocation();
- System.out.println("paramNode=" + paramNode + " compLoc=" + compLoc);
+ // System.out.println("paramNode=" + paramNode + " compLoc=" + compLoc);
if (compLoc != null && compLoc.get(0).getLocDescriptor().equals(min.getMethod().getThis())) {
- System.out.println("$$$COMPLOC CASE=" + compLoc + " idx=" + idx);
+ // System.out.println("$$$COMPLOC CASE=" + compLoc + " idx=" + idx);
NTuple<Descriptor> argTuple = getNodeTupleByArgIdx(min, idx);
- System.out.println("--- argTuple=" + argTuple + " current compLoc="
- + callerFlowGraph.getFlowNode(argTuple).getCompositeLocation());
+ // System.out.println("--- argTuple=" + argTuple + " current compLoc="
+ // + callerFlowGraph.getFlowNode(argTuple).getCompositeLocation());
NTuple<Descriptor> translatedParamTuple =
translateCompositeLocationToCaller(idx, min, compLoc);
- System.out.println("add a flow edge= " + argTuple + "->" + translatedParamTuple);
+ // System.out.println("add a flow edge= " + argTuple + "->" + translatedParamTuple);
callerFlowGraph.addValueFlowEdge(argTuple, translatedParamTuple);
Set<NTuple<Location>> pcLocTupleSet = getPCLocTupleSet(min);
for (Iterator iterator = set.iterator(); iterator.hasNext();) {
FlowNode flowNode = (FlowNode) iterator.next();
if (flowNode.getDescTuple().startsWith(prefixDesc)) {
- System.out.println("FOUND=" + flowNode);
+ // System.out.println("FOUND=" + flowNode);
return true;
}
}
private CompositeLocation generateCompositeLocation(NTuple<Location> prefixLocTuple) {
- System.out.println("generateCompositeLocation=" + prefixLocTuple);
+ // System.out.println("generateCompositeLocation=" + prefixLocTuple);
CompositeLocation newCompLoc = new CompositeLocation();
for (int i = 0; i < prefixLocTuple.size(); i++) {
private CompositeLocation generateCompositeLocation(MethodDescriptor md,
NTuple<Descriptor> paramPrefix) {
- System.out.println("generateCompositeLocation=" + paramPrefix);
+ // System.out.println("generateCompositeLocation=" + paramPrefix);
CompositeLocation newCompLoc = convertToCompositeLocation(md, paramPrefix);
return false;
}
- private SSJavaLattice<String> getLattice(Descriptor d) {
+ public SSJavaLattice<String> getLattice(Descriptor d) {
if (d instanceof MethodDescriptor) {
return getMethodLattice((MethodDescriptor) d);
} else {
Descriptor srcFieldDesc = srcCurTuple.get(idx);
Descriptor dstFieldDesc = dstCurTuple.get(idx);
- System.out.println("srcFieldDesc=" + srcFieldDesc + " dstFieldDesc=" + dstFieldDesc
- + " idx=" + idx);
+ // System.out.println("srcFieldDesc=" + srcFieldDesc + " dstFieldDesc=" + dstFieldDesc
+ // + " idx=" + idx);
if (!srcFieldDesc.equals(dstFieldDesc)) {
// add a new edge
- System.out.println("-ADD EDGE");
+ // System.out.println("-ADD EDGE");
getHierarchyGraph(cd).addEdge(srcFieldDesc, dstFieldDesc);
} else if (!isReference(srcFieldDesc) && !isReference(dstFieldDesc)) {
- System.out.println("-ADD EDGE");
+ // System.out.println("-ADD EDGE");
getHierarchyGraph(cd).addEdge(srcFieldDesc, dstFieldDesc);
}
while (!toAnalyzeIsEmpty()) {
ClassDescriptor cd = toAnalyzeNext();
+ if (cd.getClassName().equals("Object")) {
+ rootClassDescriptor = cd;
+ // inheritanceTree = new InheritanceTree<ClassDescriptor>(cd);
+ }
+
setupToAnalazeMethod(cd);
temp_toanalyzeMethodList.removeAll(visited);
// hack... it seems that there is a problem with topological sorting.
// so String.toString(Object o) is appeared too higher in the call chain.
- MethodDescriptor mdToString = null;
+ MethodDescriptor mdToString1 = null;
+ MethodDescriptor mdToString2 = null;
for (Iterator iterator = toanalyze_methodDescList.iterator(); iterator.hasNext();) {
MethodDescriptor md = (MethodDescriptor) iterator.next();
if (md.toString().equals("public static String String.valueOf(Object o)")) {
- mdToString = md;
- break;
+ mdToString1 = md;
}
+ if (md.toString().equals("public String Object.toString()")) {
+ mdToString2 = md;
+ }
+ }
+
+ if (mdToString1 != null) {
+ toanalyze_methodDescList.remove(mdToString1);
+ toanalyze_methodDescList.addLast(mdToString1);
}
- if (mdToString != null) {
- toanalyze_methodDescList.remove(mdToString);
- toanalyze_methodDescList.addLast(mdToString);
+ if (mdToString2 != null) {
+ toanalyze_methodDescList.remove(mdToString2);
+ toanalyze_methodDescList.addLast(mdToString2);
}
LinkedList<MethodDescriptor> methodDescList =
(LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
- System.out.println("@@@methodDescList=" + methodDescList);
+ // System.out.println("@@@methodDescList=" + methodDescList);
// System.exit(0);
while (!methodDescList.isEmpty()) {
constructSubGlobalFlowGraph(getFlowGraph(md));
// TODO
- System.out.println("-add Value Flows From CalleeSubGlobalFlowGraph");
+ // System.out.println("-add Value Flows From CalleeSubGlobalFlowGraph");
addValueFlowsFromCalleeSubGlobalFlowGraph(md);
// subGlobalFlowGraph.writeGraph("_SUBGLOBAL");
Set<FlowNode> paramFlowNodeSet = flowGraph.getParamFlowNodeSet();
for (Iterator iterator = paramFlowNodeSet.iterator(); iterator.hasNext();) {
FlowNode paramFlowNode = (FlowNode) iterator.next();
- System.out.println("paramFlowNode=" + paramFlowNode);
+ // System.out.println("paramFlowNode=" + paramFlowNode);
NTuple<Descriptor> paramDescTuple = paramFlowNode.getDescTuple();
NTuple<Location> paramLocTuple = translateToLocTuple(md, paramDescTuple);
GlobalFlowNode paramGlobalNode = globalFlowGraph.getFlowNode(paramLocTuple);
if (needToGenerateInterLoc(newImplicitTupleSet)) {
// need to create an intermediate node for the GLB of conditional
// locations & implicit flows
- System.out.println("10");
NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
for (Iterator<NTuple<Descriptor>> idxIter = newImplicitTupleSet.iterator(); idxIter.hasNext();) {
// System.out.println("---currentFlowTupleSet=" + currentFlowTupleSet);
if (needToGenerateInterLoc(currentFlowTupleSet)) {
- System.out.println("9");
FlowNode meetNode = fg.createIntermediateNode();
for (Iterator iterator = currentFlowTupleSet.iterator(); iterator.hasNext();) {
}
}
if (size > 1) {
- System.out.println("needToGenerateInterLoc=" + tupleSet + " size=" + size);
+ // System.out.println("needToGenerateInterLoc=" + tupleSet + " size=" + size);
return true;
} else {
return false;
newImplicitTupleSet.addTupleSet(implicitFlowTupleSet);
newImplicitTupleSet.addTupleSet(condTupleNode);
- System.out.println("A5");
newImplicitTupleSet.addGlobalFlowTupleSet(implicitFlowTupleSet.getGlobalLocTupleSet());
newImplicitTupleSet.addGlobalFlowTupleSet(condTupleNode.getGlobalLocTupleSet());
if (needToGenerateInterLoc(newImplicitTupleSet)) {
// need to create an intermediate node for the GLB of conditional
// locations & implicit flows
- System.out.println("6");
NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
for (Iterator<NTuple<Descriptor>> idxIter = newImplicitTupleSet.iterator(); idxIter
if (needToGenerateInterLoc(newImplicitTupleSet)) {
// need to create an intermediate node for the GLB of conditional
// locations & implicit flows
- System.out.println("7");
NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
for (Iterator<NTuple<Descriptor>> idxIter = newImplicitTupleSet.iterator(); idxIter
private void analyzeFlowIfStatementNode(MethodDescriptor md, SymbolTable nametable,
IfStatementNode isn, NodeTupleSet implicitFlowTupleSet) {
- System.out.println("analyzeFlowIfStatementNode=" + isn.printNode(0));
+ // System.out.println("analyzeFlowIfStatementNode=" + isn.printNode(0));
NodeTupleSet condTupleNode = new NodeTupleSet();
analyzeFlowExpressionNode(md, nametable, isn.getCondition(), condTupleNode, null,
// System.out.println("-newImplicitTupleSet=" + newImplicitTupleSet);
if (needToGenerateInterLoc(newImplicitTupleSet)) {
- System.out.println("5");
// need to create an intermediate node for the GLB of conditional locations & implicit flows
NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
// translateToLocTuple(md, callerImplicitTuple));
// }
// }
- System.out.println("A4");
newImplicitTupleSet.addGlobalFlowTupleSet(condTupleNode.getGlobalLocTupleSet());
analyzeFlowBlockNode(md, nametable, isn.getTrueBlock(), newImplicitTupleSet);
fn.setDeclarationNode();
if (dn.getExpression() != null) {
+ // System.out.println("-analyzeFlowDeclarationNode=" + dn.printNode(0));
NodeTupleSet nodeSetRHS = new NodeTupleSet();
analyzeFlowExpressionNode(md, nametable, dn.getExpression(), nodeSetRHS, null,
// creates edges from RHS to LHS
NTuple<Descriptor> interTuple = null;
if (needToGenerateInterLoc(nodeSetRHS)) {
- System.out.println("3");
interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
}
for (Iterator<NTuple<Descriptor>> iter = nodeSetRHS.iterator(); iter.hasNext();) {
NTuple<Descriptor> fromTuple = iter.next();
- System.out.println("fromTuple=" + fromTuple + " interTuple=" + interTuple + " tupleLSH="
- + tupleLHS);
+ // System.out.println("fromTuple=" + fromTuple + " interTuple=" + interTuple + " tupleLSH="
+ // + tupleLHS);
addFlowGraphEdge(md, fromTuple, interTuple, tupleLHS);
}
GlobalFlowGraph globalFlowGraph = getSubGlobalFlowGraph(md);
for (Iterator<NTuple<Location>> iterator = nodeSetRHS.globalIterator(); iterator.hasNext();) {
NTuple<Location> calleeReturnLocTuple = iterator.next();
+
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple, translateToLocTuple(md, tupleLHS));
}
+ for (Iterator<NTuple<Location>> iterator = implicitFlowTupleSet.globalIterator(); iterator
+ .hasNext();) {
+ NTuple<Location> implicitGlobalTuple = iterator.next();
+
+ globalFlowGraph.addValueFlowEdge(implicitGlobalTuple, translateToLocTuple(md, tupleLHS));
+ }
+
+ // System.out.println("-nodeSetRHS=" + nodeSetRHS);
+ // System.out.println("-implicitFlowTupleSet=" + implicitFlowTupleSet);
+
}
}
break;
case Kind.CreateObjectNode:
- analyzeCreateObjectNode(md, nametable, (CreateObjectNode) en);
+ analyzeCreateObjectNode(md, nametable, (CreateObjectNode) en, nodeSet, implicitFlowTupleSet);
break;
case Kind.ArrayAccessNode:
private void analyzeFlowTertiaryNode(MethodDescriptor md, SymbolTable nametable, TertiaryNode tn,
NodeTupleSet nodeSet, NodeTupleSet implicitFlowTupleSet) {
- System.out.println("analyzeFlowTertiaryNode=" + tn.printNode(0));
+ // System.out.println("analyzeFlowTertiaryNode=" + tn.printNode(0));
NodeTupleSet tertiaryTupleNode = new NodeTupleSet();
analyzeFlowExpressionNode(md, nametable, tn.getCond(), tertiaryTupleNode, null,
// System.out.println("-newImplicitTupleSet=" + newImplicitTupleSet);
if (needToGenerateInterLoc(newImplicitTupleSet)) {
- System.out.println("15");
// need to create an intermediate node for the GLB of conditional locations & implicit flows
NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
for (Iterator<NTuple<Descriptor>> idxIter = newImplicitTupleSet.iterator(); idxIter.hasNext();) {
newImplicitTupleSet.addTuple(interTuple);
}
- System.out.println("A7");
newImplicitTupleSet.addGlobalFlowTupleSet(tertiaryTupleNode.getGlobalLocTupleSet());
- System.out.println("---------newImplicitTupleSet=" + newImplicitTupleSet);
+ // System.out.println("---------newImplicitTupleSet=" + newImplicitTupleSet);
+
// add edges from tertiaryTupleNode to all nodes of conditional nodes
// tertiaryTupleNode.addTupleSet(implicitFlowTupleSet);
analyzeFlowExpressionNode(md, nametable, tn.getTrueExpr(), tertiaryTupleNode, null,
analyzeFlowExpressionNode(md, nametable, tn.getFalseExpr(), tertiaryTupleNode, null,
newImplicitTupleSet, false);
- System.out.println("A8");
nodeSet.addGlobalFlowTupleSet(tertiaryTupleNode.getGlobalLocTupleSet());
nodeSet.addTupleSet(tertiaryTupleNode);
- System.out.println("#tertiary node set=" + nodeSet);
+ // System.out.println("#tertiary node set=" + nodeSet);
}
private void addMapCallerMethodDescToMethodInvokeNodeSet(MethodDescriptor caller,
private void analyzeFlowMethodInvokeNode(MethodDescriptor mdCaller, SymbolTable nametable,
MethodInvokeNode min, NodeTupleSet nodeSet, NodeTupleSet implicitFlowTupleSet) {
- System.out.println("analyzeFlowMethodInvokeNode=" + min.printNode(0));
+ // System.out.println("analyzeFlowMethodInvokeNode=" + min.printNode(0));
if (!toanalyze_methodDescList.contains(min.getMethod())) {
return;
addMapCallerMethodDescToMethodInvokeNodeSet(mdCaller, min);
FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
- System.out.println("mdCallee=" + mdCallee + " calleeFlowGraph=" + calleeFlowGraph);
+ // System.out.println("mdCallee=" + mdCallee + " calleeFlowGraph=" + calleeFlowGraph);
Set<FlowNode> calleeReturnSet = calleeFlowGraph.getReturnNodeSet();
- System.out.println("---calleeReturnSet=" + calleeReturnSet);
+ // System.out.println("---calleeReturnSet=" + calleeReturnSet);
NodeTupleSet tupleSet = new NodeTupleSet();
NodeTupleSet baseNodeSet = new NodeTupleSet();
analyzeFlowExpressionNode(mdCaller, nametable, min.getExpression(), baseNodeSet, null,
implicitFlowTupleSet, false);
- System.out.println("baseNodeSet=" + baseNodeSet);
+ // System.out.println("baseNodeSet=" + baseNodeSet);
assert (baseNodeSet.size() == 1);
NTuple<Descriptor> baseTuple = baseNodeSet.iterator().next();
+ if (baseTuple.get(0) instanceof InterDescriptor) {
+ if (baseTuple.size() > 1) {
+ throw new Error();
+ }
+ FlowNode interNode = getFlowGraph(mdCaller).getFlowNode(baseTuple);
+ baseTuple = translateBaseTuple(interNode, baseTuple);
+ }
mapMethodInvokeNodeToBaseTuple.put(min, baseTuple);
if (!min.getMethod().isStatic()) {
inFlowTuple.addAll(returnDescTuple.subList(1, returnDescTuple.size()));
// nodeSet.addTuple(inFlowTuple);
- System.out.println("1CREATE A NEW TUPLE=" + inFlowTuple + " from="
- + mdCallee.getThis());
- tupleSet.addTuple(inFlowTuple);
+ // System.out.println("1CREATE A NEW TUPLE=" + inFlowTuple + " from="
+ // + mdCallee.getThis());
+ // tupleSet.addTuple(inFlowTuple);
+ tupleSet.addTuple(baseTuple);
} else {
// TODO
- System.out.println("returnNode=" + returnNode);
+ // System.out.println("returnNode=" + returnNode);
Set<FlowNode> inFlowSet = calleeFlowGraph.getIncomingFlowNodeSet(returnNode);
// System.out.println("inFlowSet=" + inFlowSet + " from retrunNode=" + returnNode);
for (Iterator iterator2 = inFlowSet.iterator(); iterator2.hasNext();) {
FlowNode inFlowNode = (FlowNode) iterator2.next();
if (inFlowNode.getDescTuple().startsWith(mdCallee.getThis())) {
// nodeSet.addTupleSet(baseNodeSet);
- System.out.println("2CREATE A NEW TUPLE=" + baseNodeSet + " from="
- + mdCallee.getThis());
+ // System.out.println("2CREATE A NEW TUPLE=" + baseNodeSet + " from="
+ // + mdCallee.getThis());
tupleSet.addTupleSet(baseNodeSet);
}
}
NodeTupleSet argTupleSet = new NodeTupleSet();
analyzeFlowExpressionNode(mdCaller, nametable, en, argTupleSet, false);
// if argument is liternal node, argTuple is set to NULL
- System.out.println("---arg idx=" + idx + " argTupleSet=" + argTupleSet);
+ // System.out.println("---arg idx=" + idx + " argTupleSet=" + argTupleSet);
NTuple<Descriptor> argTuple = generateArgTuple(mdCaller, argTupleSet);
// if an argument is literal value,
// }
// }
- System.out.println("paramNode=" + paramNode + " calleeReturnSet=" + calleeReturnSet);
+ // System.out.println("paramNode=" + paramNode + " calleeReturnSet=" + calleeReturnSet);
if (hasInFlowTo(calleeFlowGraph, paramNode, calleeReturnSet)
|| mdCallee.getModifiers().isNative()) {
addParamNodeFlowingToReturnValue(mdCallee, paramNode);
// nodeSet.addTupleSet(argTupleSet);
- System.out.println("3CREATE A NEW TUPLE=" + argTupleSet + " from=" + paramNode);
+ // System.out.println("3CREATE A NEW TUPLE=" + argTupleSet + " from=" + paramNode);
tupleSet.addTupleSet(argTupleSet);
}
}
}
if (mdCallee.getReturnType() != null && !mdCallee.getReturnType().isVoid()) {
- FlowReturnNode setNode = getFlowGraph(mdCaller).createReturnNode(min);
+ FlowReturnNode returnHolderNode = getFlowGraph(mdCaller).createReturnNode(min);
if (needToGenerateInterLoc(tupleSet)) {
- System.out.println("20");
FlowGraph fg = getFlowGraph(mdCaller);
FlowNode interNode = fg.createIntermediateNode();
interNode.setFormHolder(true);
}
}
- setNode.addTuple(interTuple);
- System.out.println("ADD TUPLESET=" + interTuple + " to returnnode=" + setNode);
+ returnHolderNode.addTuple(interTuple);
- } else {
- setNode.addTupleSet(tupleSet);
- System.out.println("ADD TUPLESET=" + tupleSet + " to returnnode=" + setNode);
+ nodeSet.addTuple(interTuple);
+ // System.out.println("ADD TUPLESET=" + interTuple + " to returnnode=" +
+ // returnHolderNode);
+ } else {
+ returnHolderNode.addTupleSet(tupleSet);
+ // System.out.println("ADD TUPLESET=" + tupleSet + " to returnnode=" + returnHolderNode);
}
// setNode.addTupleSet(tupleSet);
- nodeSet.addTuple(setNode.getDescTuple());
+ // NodeTupleSet setFromReturnNode=new NodeTupleSet();
+ // setFromReturnNode.addTuple(tuple);
+
+ NodeTupleSet holderTupleSet =
+ getNodeTupleSetFromReturnNode(getFlowGraph(mdCaller), returnHolderNode);
+ // System.out.println("HOLDER TUPLE SET=" + holderTupleSet);
+ nodeSet.addTupleSet(holderTupleSet);
+
+ nodeSet.addTuple(returnHolderNode.getDescTuple());
}
// propagateFlowsFromCallee(min, md, min.getMethod());
FlowNode calleeReturnNode = (FlowNode) iterator.next();
NTuple<Location> calleeReturnLocTuple =
translateToLocTuple(mdCallee, calleeReturnNode.getDescTuple());
- System.out.println("calleeReturnLocTuple=" + calleeReturnLocTuple);
+ // System.out.println("calleeReturnLocTuple=" + calleeReturnLocTuple);
NTuple<Location> transaltedToCaller =
translateToCallerLocTuple(min, mdCallee, mdCaller, calleeReturnLocTuple);
// System.out.println("translateToCallerLocTuple="
}
}
- System.out.println("min nodeSet=" + nodeSet);
+ // System.out.println("min nodeSet=" + nodeSet);
+
+ }
+
+ }
+
+ private NodeTupleSet getNodeTupleSetFromReturnNode(FlowGraph fg, FlowReturnNode node) {
+ NodeTupleSet nts = new NodeTupleSet();
+
+ Set<NTuple<Descriptor>> returnSet = node.getReturnTupleSet();
+
+ for (Iterator iterator = returnSet.iterator(); iterator.hasNext();) {
+ NTuple<Descriptor> tuple = (NTuple<Descriptor>) iterator.next();
+ FlowNode flowNode = fg.getFlowNode(tuple);
+ if (flowNode instanceof FlowReturnNode) {
+ returnSet.addAll(recurGetNode(fg, (FlowReturnNode) flowNode));
+ } else {
+ returnSet.add(tuple);
+ }
+ }
+
+ for (Iterator iterator = returnSet.iterator(); iterator.hasNext();) {
+ NTuple<Descriptor> nTuple = (NTuple<Descriptor>) iterator.next();
+ nts.addTuple(nTuple);
+ }
+
+ return nts;
+
+ }
+
+ private Set<NTuple<Descriptor>> recurGetNode(FlowGraph fg, FlowReturnNode rnode) {
+
+ Set<NTuple<Descriptor>> tupleSet = new HashSet<NTuple<Descriptor>>();
+ Set<NTuple<Descriptor>> returnSet = rnode.getReturnTupleSet();
+ for (Iterator iterator = returnSet.iterator(); iterator.hasNext();) {
+ NTuple<Descriptor> tuple = (NTuple<Descriptor>) iterator.next();
+ FlowNode flowNode = fg.getFlowNode(tuple);
+ if (flowNode instanceof FlowReturnNode) {
+ tupleSet.addAll(recurGetNode(fg, (FlowReturnNode) flowNode));
+ }
+ tupleSet.add(tuple);
}
+ return tupleSet;
}
private NTuple<Descriptor> generateArgTuple(MethodDescriptor mdCaller, NodeTupleSet argTupleSet) {
}
if (argTupleSetNonLiteral.size() > 1) {
- System.out.println("11");
NTuple<Descriptor> interTuple =
getFlowGraph(mdCaller).createIntermediateNode().getDescTuple();
}
// Set<FlowNode> reachableSet = fg.getReachFlowNodeSetFrom(inNode);
Set<FlowNode> reachableSet = fg.getReachableSetFrom(inNode.getDescTuple());
- System.out.println("inNode=" + inNode + " reachalbeSet=" + reachableSet);
+ // System.out.println("inNode=" + inNode + " reachalbeSet=" + reachableSet);
for (Iterator iterator = reachableSet.iterator(); iterator.hasNext();) {
FlowNode fn = (FlowNode) iterator.next();
private void analyzeFlowArrayAccessNode(MethodDescriptor md, SymbolTable nametable,
ArrayAccessNode aan, NodeTupleSet nodeSet, boolean isLHS) {
- System.out.println("analyzeFlowArrayAccessNode aan=" + aan.printNode(0));
+ // System.out.println("analyzeFlowArrayAccessNode aan=" + aan.printNode(0));
String currentArrayAccessNodeExpStr = aan.printNode(0);
arrayAccessNodeStack.push(aan.printNode(0));
NodeTupleSet expNodeTupleSet = new NodeTupleSet();
NTuple<Descriptor> base =
analyzeFlowExpressionNode(md, nametable, aan.getExpression(), expNodeTupleSet, isLHS);
- System.out.println("-base=" + base);
+ // System.out.println("-base=" + base);
nodeSet.setMethodInvokeBaseDescTuple(base);
NodeTupleSet idxNodeTupleSet = new NodeTupleSet();
NTuple<Location> calleeReturnLocTuple = iterator.next();
for (Iterator<NTuple<Descriptor>> arrIter = expNodeTupleSet.iterator(); arrIter.hasNext();) {
NTuple<Descriptor> arrTuple = arrIter.next();
+
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple, translateToLocTuple(md, arrTuple));
}
}
|| !arrayAccessNodeStack.peek().startsWith(currentArrayAccessNodeExpStr)) {
if (needToGenerateInterLoc(nodeSetArrayAccessExp)) {
- System.out.println("1");
- NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+ FlowNode interNode = getFlowGraph(md).createIntermediateNode();
+ NTuple<Descriptor> interTuple = interNode.getDescTuple();
for (Iterator<NTuple<Descriptor>> iter = nodeSetArrayAccessExp.iterator(); iter.hasNext();) {
NTuple<Descriptor> higherTuple = iter.next();
nodeSetArrayAccessExp.addTuple(interTuple);
FlowGraph fg = getFlowGraph(md);
- System.out.println("base=" + base);
+ // System.out.println("base=" + base);
if (base != null) {
fg.addMapInterLocNodeToEnclosingDescriptor(interTuple.get(0),
getClassTypeDescriptor(base.get(base.size() - 1)));
+ interNode.setBaseTuple(base);
}
}
}
- System.out.println("A1");
nodeSet.addGlobalFlowTupleSet(idxNodeTupleSet.getGlobalLocTupleSet());
nodeSet.addTupleSet(nodeSetArrayAccessExp);
}
private void analyzeCreateObjectNode(MethodDescriptor md, SymbolTable nametable,
- CreateObjectNode en) {
- // TODO Auto-generated method stub
+ CreateObjectNode en, NodeTupleSet nodeSet, NodeTupleSet implicitFlowTupleSet) {
+ // System.out.println("#analyzeCreateObjectNode=" + en.printNode(0));
+ int numArgs = en.numArgs();
+ NodeTupleSet argSet = new NodeTupleSet();
+
+ for (int i = 0; i < numArgs; i++) {
+ analyzeFlowExpressionNode(md, nametable, en.getArg(i), argSet, null, implicitFlowTupleSet,
+ false);
+ }
+
+ // System.out.println("###argSet=" + argSet);
+ nodeSet.addTupleSet(argSet);
}
NodeTupleSet leftOpSet = new NodeTupleSet();
NodeTupleSet rightOpSet = new NodeTupleSet();
- System.out.println("analyzeFlowOpNode=" + on.printNode(0));
+ // System.out.println("analyzeFlowOpNode=" + on.printNode(0));
// left operand
analyzeFlowExpressionNode(md, nametable, on.getLeft(), leftOpSet, null, implicitFlowTupleSet,
false);
- System.out.println("--leftOpSet=" + leftOpSet);
if (on.getRight() != null) {
// right operand
analyzeFlowExpressionNode(md, nametable, on.getRight(), rightOpSet, null,
implicitFlowTupleSet, false);
}
- System.out.println("--rightOpSet=" + rightOpSet);
Operation op = on.getOp();
nodeSet.addTupleSet(leftOpSet);
nodeSet.addTupleSet(rightOpSet);
- System.out.println("A6");
nodeSet.addGlobalFlowTupleSet(leftOpSet.getGlobalLocTupleSet());
nodeSet.addGlobalFlowTupleSet(rightOpSet.getGlobalLocTupleSet());
for (Iterator<NTuple<Location>> iterator = idxNodeTupleSet.globalIterator(); iterator
.hasNext();) {
NTuple<Location> calleeReturnLocTuple = iterator.next();
+
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
translateToLocTuple(md, flowFieldTuple));
}
nodeSetArrayAccessExp.addTupleSet(nodeSet);
if (needToGenerateInterLoc(nodeSetArrayAccessExp)) {
- System.out.println("4");
- System.out.println("nodeSetArrayAccessExp=" + nodeSetArrayAccessExp);
+ // System.out.println("nodeSetArrayAccessExp=" + nodeSetArrayAccessExp);
// System.out.println("idxNodeTupleSet.getGlobalLocTupleSet()="
// + idxNodeTupleSet.getGlobalLocTupleSet());
nodeSet.clear();
flowFieldTuple = interTuple;
}
- System.out.println("A3");
nodeSet.addGlobalFlowTupleSet(idxNodeTupleSet.getGlobalLocTupleSet());
}
analyzeFlowExpressionNode(md, nametable, an.getSrc(), nodeSetRHS, null, implicitFlowTupleSet,
false);
- System.out.println("-analyzeFlowAssignmentNode=" + an.printNode(0));
- System.out.println("-nodeSetLHS=" + nodeSetLHS);
- System.out.println("-nodeSetRHS=" + nodeSetRHS);
- System.out.println("-implicitFlowTupleSet=" + implicitFlowTupleSet);
+ // System.out.println("-analyzeFlowAssignmentNode=" + an.printNode(0));
+ // System.out.println("-nodeSetLHS=" + nodeSetLHS);
+ // System.out.println("-nodeSetRHS=" + nodeSetRHS);
+ // System.out.println("-implicitFlowTupleSet=" + implicitFlowTupleSet);
// System.out.println("-");
if (an.getOperation().getOp() >= 2 && an.getOperation().getOp() <= 12) {
// creates edges from RHS to LHS
NTuple<Descriptor> interTuple = null;
if (needToGenerateInterLoc(nodeSetRHS)) {
- System.out.println("2");
interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
}
NTuple<Location> calleeReturnLocTuple = iterator.next();
for (Iterator<NTuple<Descriptor>> iter2 = nodeSetLHS.iterator(); iter2.hasNext();) {
NTuple<Descriptor> callerLHSTuple = iter2.next();
- System.out.println("$$$ GLOBAL FLOW ADD=" + calleeReturnLocTuple + " -> "
- + translateToLocTuple(md, callerLHSTuple));
+ // System.out.println("$$$ GLOBAL FLOW ADD=" + calleeReturnLocTuple + " -> "
+ // + translateToLocTuple(md, callerLHSTuple));
+
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
translateToLocTuple(md, callerLHSTuple));
}
NTuple<Location> calleeReturnLocTuple = iterator.next();
for (Iterator<NTuple<Descriptor>> iter2 = nodeSetLHS.iterator(); iter2.hasNext();) {
NTuple<Descriptor> callerLHSTuple = iter2.next();
+
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
translateToLocTuple(md, callerLHSTuple));
- System.out.println("$$$ GLOBAL FLOW PCLOC ADD=" + calleeReturnLocTuple + " -> "
- + translateToLocTuple(md, callerLHSTuple));
+ // System.out.println("$$$ GLOBAL FLOW PCLOC ADD=" + calleeReturnLocTuple + " -> "
+ // + translateToLocTuple(md, callerLHSTuple));
}
}
NTuple<Descriptor> callerLHSTuple = iter2.next();
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
translateToLocTuple(md, callerLHSTuple));
- System.out.println("$$$ GLOBAL FLOW PC ADD=" + calleeReturnLocTuple + " -> "
- + translateToLocTuple(md, callerLHSTuple));
+ // System.out.println("$$$ GLOBAL FLOW PC ADD=" + calleeReturnLocTuple + " -> "
+ // + translateToLocTuple(md, callerLHSTuple));
}
}
if (nodeSet != null) {
nodeSet.addTupleSet(nodeSetLHS);
- System.out.println("A2");
nodeSet.addGlobalFlowTupleSet(nodeSetLHS.getGlobalLocTupleSet());
}
}
}
- public void writeInferredLatticeDotFile(ClassDescriptor cd, HierarchyGraph simpleHierarchyGraph,
- SSJavaLattice<String> locOrder, String nameSuffix) {
- System.out.println("@cd=" + cd);
- System.out.println("@sharedLoc=" + locOrder.getSharedLocSet());
- writeInferredLatticeDotFile(cd, null, simpleHierarchyGraph, locOrder, nameSuffix);
+ public void writeInferredLatticeDotFile(ClassDescriptor cd, SSJavaLattice<String> locOrder,
+ String nameSuffix) {
+ // System.out.println("@cd=" + cd);
+ // System.out.println("@sharedLoc=" + locOrder.getSharedLocSet());
+ writeInferredLatticeDotFile(cd, null, locOrder, nameSuffix);
}
public void writeInferredLatticeDotFile(ClassDescriptor cd, MethodDescriptor md,
- HierarchyGraph simpleHierarchyGraph, SSJavaLattice<String> locOrder, String nameSuffix) {
+ SSJavaLattice<String> locOrder, String nameSuffix) {
String fileName = "lattice_";
if (md != null) {
fileName +=
- /* cd.getSymbol().replaceAll("[\\W_]", "") + "_" + */md.toString().replaceAll("[\\W_]", "");
+ cd.getSymbol().replaceAll("[\\W_]", "") + "_" + md.toString().replaceAll("[\\W_]", "");
} else {
fileName += cd.getSymbol().replaceAll("[\\W_]", "");
}
fileName += nameSuffix;
+ System.out.println("***lattice=" + fileName + " setsize=" + locOrder.getKeySet().size());
+
Set<Pair<String, String>> pairSet = locOrder.getOrderingPairSet();
Set<String> addedLocSet = new HashSet<String>();
String lowLocId = pair.getSecond();
if (!addedLocSet.contains(highLocId)) {
addedLocSet.add(highLocId);
- drawNode(bw, locOrder, simpleHierarchyGraph, highLocId);
+ drawNode(bw, locOrder, highLocId);
}
if (!addedLocSet.contains(lowLocId)) {
addedLocSet.add(lowLocId);
- drawNode(bw, locOrder, simpleHierarchyGraph, lowLocId);
+ drawNode(bw, locOrder, lowLocId);
}
bw.write(highLocId + " -> " + lowLocId + ";\n");
return str;
}
- private void drawNode(BufferedWriter bw, SSJavaLattice<String> lattice, HierarchyGraph graph,
- String locName) throws IOException {
+ public void addNaiveLattice(Descriptor desc, SSJavaLattice<String> lattice) {
+ desc2naiveLattice.put(desc, lattice);
+ }
+
+ private void drawNode(BufferedWriter bw, SSJavaLattice<String> lattice, String locName)
+ throws IOException {
String prettyStr;
if (lattice.isSharedLoc(locName)) {