X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FAnalysis%2FSSJava%2FLocationInference.java;h=caa4504a13c5e29cf88e7ed2c523e1bb5f9f9876;hb=cbc13efe1afc46ef542fde526361b4911d3da0e1;hp=c3440672619a9a869369314d5551ee0622ab58d9;hpb=16c9b68be88b7753b0b2a8b5766983ce06d0c2ad;p=IRC.git diff --git a/Robust/src/Analysis/SSJava/LocationInference.java b/Robust/src/Analysis/SSJava/LocationInference.java index c3440672..caa4504a 100644 --- a/Robust/src/Analysis/SSJava/LocationInference.java +++ b/Robust/src/Analysis/SSJava/LocationInference.java @@ -27,6 +27,7 @@ import IR.Operation; import IR.State; import IR.SymbolTable; import IR.TypeDescriptor; +import IR.TypeUtil; import IR.VarDescriptor; import IR.Tree.ArrayAccessNode; import IR.Tree.AssignmentNode; @@ -55,14 +56,20 @@ import Util.Pair; public class LocationInference { + static int COUNT = 0; + State state; SSJavaAnalysis ssjava; + TypeUtil tu; List temp_toanalyzeList; List temp_toanalyzeMethodList; Map mapMethodDescriptorToFlowGraph; LinkedList toanalyze_methodDescList; + Set toanalyze_classDescSet; + + // InheritanceTree inheritanceTree; // map a method descriptor to its set of parameter descriptors Map> mapMethodDescriptorToParamDescSet; @@ -70,6 +77,9 @@ public class LocationInference { // keep current descriptors to visit in fixed-point interprocedural analysis, private Stack methodDescriptorsToVisitStack; + // map a descriptor to a naive lattice + private Map> desc2naiveLattice; + // map a class descriptor to a field lattice private Map> cd2lattice; @@ -124,6 +134,18 @@ public class LocationInference { private Map mapMethodDescriptorToCompositeReturnCase; + private Map mapMethodDescToHighestOverriddenMethodDesc; + + private Map> mapHighestOverriddenMethodDescToMethodDescSet; + + private Map> mapHighestOverriddenMethodDescToReturnLocTuple; + + private Map> mapHighestOverriddenMethodDescToPCLocTuple; + + private Map>> mapHighestOverriddenMethodDescToSetLowerThanPCLoc; + + private Map>> mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc; + public static final String GLOBALLOC = "GLOBALLOC"; public static final String INTERLOC = "INTERLOC"; @@ -158,14 +180,25 @@ public class LocationInference { private Stack 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(); this.temp_toanalyzeList = new ArrayList(); this.temp_toanalyzeMethodList = new ArrayList(); this.mapMethodDescriptorToFlowGraph = new HashMap(); this.cd2lattice = new HashMap>(); this.md2lattice = new HashMap>(); + this.desc2naiveLattice = new HashMap>(); + this.methodDescriptorsToVisitStack = new Stack(); this.mapMethodDescriptorToMethodInvokeNodeSet = new HashMap>(); @@ -206,6 +239,25 @@ public class LocationInference { this.mapMethodDescriptorToCompositeReturnCase = new HashMap(); + mapMethodDescToHighestOverriddenMethodDesc = new HashMap(); + + mapHighestOverriddenMethodDescToSetLowerThanPCLoc = + new HashMap>>(); + + mapHighestOverriddenMethodDescToMethodDescSet = + new HashMap>(); + + mapHighestOverriddenMethodDescToReturnLocTuple = + new HashMap>(); + + mapHighestOverriddenMethodDescToPCLocTuple = + new HashMap>(); + + mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc = + new HashMap>>(); + + this.buildLattice = new BuildLattice(this); + } public void setupToAnalyze() { @@ -265,13 +317,14 @@ public class LocationInference { _debug_writeFlowGraph(); - // System.exit(0); + buildInheritanceTree(); + calculateReturnPCLocInheritance(); constructHierarchyGraph(); - debug_writeHierarchyDotFiles(); + addInheritanceConstraintsToHierarchyGraph(); - // System.exit(0); + debug_writeHierarchyDotFiles(); simplifyHierarchyGraph(); @@ -285,7 +338,8 @@ public class LocationInference { debug_writeSkeletonCombinationHierarchyDotFiles(); - buildLattice(); + buildLatticeInheritanceTree(); + // buildLattice(); debug_writeLattices(); @@ -295,10 +349,559 @@ public class LocationInference { generateAnnoatedCode(); + for (Iterator iterator = cd2lattice.keySet().iterator(); iterator.hasNext();) { + ClassDescriptor cd = (ClassDescriptor) iterator.next(); + SSJavaLattice 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 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 keySet = mapHighestOverriddenMethodDescToMethodDescSet.keySet(); + for (Iterator iterator = keySet.iterator(); iterator.hasNext();) { + MethodDescriptor highestMethodDesc = (MethodDescriptor) iterator.next(); + + if (mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc).size() == 1) { + continue; + } + + Set methodDescSet = + mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc); + + NTuple highestPCLocDescTuple = + mapHighestOverriddenMethodDescToPCLocTuple.get(highestMethodDesc); + + NTuple 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 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 newPCDescTuple = new NTuple(); + 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> descSetLowerThanPCLoc = + mapHighestOverriddenMethodDescToSetLowerThanPCLoc.get(highestMethodDesc); + for (Iterator iterator3 = descSetLowerThanPCLoc.iterator(); iterator3.hasNext();) { + NTuple lowerNTuple = (NTuple) 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 curReturnDescTuple = translateToDescTuple(curRETURNLoc.getTuple()); + + if (!curReturnDescTuple.equals(highestRETURNLocDescTuple)) { + // handle the case that RETURNLOC is started with 'this'... + NTuple newRETURNLocDescTuple = new NTuple(); + 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> descSetHigherThanRETURNLoc = + mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc.get(highestMethodDesc); + for (Iterator iterator3 = descSetHigherThanRETURNLoc.iterator(); iterator3.hasNext();) { + NTuple higherNTuple = (NTuple) iterator3.next(); + flowGraph.addValueFlowEdge(higherNTuple, newRETURNLocDescTuple); + } + + CompositeLocation newRETURNLocCompLoc = + new CompositeLocation(translateToLocTuple(md, newRETURNLocDescTuple)); + summary.setRETURNLoc(newRETURNLocCompLoc); + } + } + } + } + } + + private void calculateHighestPCLocInheritance() { + + Set keySet = mapHighestOverriddenMethodDescToMethodDescSet.keySet(); + + Map mapMethodDescToParamCount = + new HashMap(); + + next: for (Iterator iterator = keySet.iterator(); iterator.hasNext();) { + MethodDescriptor highestMethodDesc = (MethodDescriptor) iterator.next(); + + NTuple tempTuple = null; + + if (getMethodSummary(highestMethodDesc).getPCLoc() != null) { + + Set 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 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> descTupleSetLowerThanPC = new HashSet>(); + 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 reachableSet = + flowGraph.getReachableSetFrom(pcFlowNode.getCurrentDescTuple().subList(0, 1)); + + Set reachableParamNodeSet = new HashSet(); + for (Iterator iterator3 = reachableSet.iterator(); iterator3.hasNext();) { + FlowNode flowNode = (FlowNode) iterator3.next(); + if (flowGraph.isParameter(flowNode.getCurrentDescTuple())) { + reachableParamNodeSet.add(flowNode); + } + + } + + Set> descTupleSetLowerThanPC = new HashSet>(); + 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 keySet = mapHighestOverriddenMethodDescToMethodDescSet.keySet(); + + Map mapMethodDescToParamCount = + new HashMap(); + + next: for (Iterator iterator = keySet.iterator(); iterator.hasNext();) { + MethodDescriptor highestMethodDesc = (MethodDescriptor) iterator.next(); + + Set 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 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 returnLocTuple = translateToDescTuple(returnLOC.getTuple()); + FlowNode returnFlowNode = flowGraph.getFlowNode(returnLocTuple); + + Set curMethodParamNodeSet = flowGraph.getParamFlowNodeSet(); + Set> descTupleSetHigherThanPC = new HashSet>(); + 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()); + } + 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 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 curNode = inheritanceTree.getTreeNode(curClassDesc); + // Node parentNode = curNode.getParent(); + ClassDescriptor parentClassDesc = curClassDesc.getSuperDesc(); + + if (parentClassDesc != null) { + if (parentClassDesc.getMethodTable().contains(curMethodDesc.getSymbol())) { + Set 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 rootNode = inheritanceTree.getRootNode(); + DFSInheritanceTree(rootClassDescriptor); + + } + + private void DFSInheritanceTree(ClassDescriptor parentClassDescriptor) { + + // ClassDescriptor parentClassDescriptor = parentNode.getData(); + + Set children = getDirectSubClasses(parentClassDescriptor); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + ClassDescriptor childClassDescriptor = (ClassDescriptor) iterator.next(); + + HierarchyGraph parentGraph = getHierarchyGraph(parentClassDescriptor); + HierarchyGraph childGraph = getHierarchyGraph(childClassDescriptor); + + Set 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> parentMergeNodeMap = parentGraph.getMapHNodetoMergeSet(); + Map> childMergeNodeMap = childGraph.getMapHNodetoMergeSet(); + + Set keySet = parentMergeNodeMap.keySet(); + for (Iterator iterator2 = keySet.iterator(); iterator2.hasNext();) { + HNode parentKey = (HNode) iterator2.next(); + if (!childMergeNodeMap.containsKey(parentKey)) { + childMergeNodeMap.put(parentKey, new HashSet()); + } + 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 parentIncomingHNode = parentGraph.getIncomingNodeSet(parentHNode); + Set 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 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> parentMethodMergeNodeMap = + parentMethodGraph.getMapHNodetoMergeSet(); + Map> childMethodMergeNodeMap = childMethodGraph.getMapHNodetoMergeSet(); + + Set methodKeySet = parentMethodMergeNodeMap.keySet(); + for (Iterator iterator2 = methodKeySet.iterator(); iterator2.hasNext();) { + HNode parentKey = (HNode) iterator2.next(); + if (!childMethodMergeNodeMap.containsKey(parentKey)) { + childMethodMergeNodeMap.put(parentKey, new HashSet()); + } + 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 parentIncomingHNode = parentMethodGraph.getIncomingNodeSet(parentHNode); + Set 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 childNode = inheritanceTree.getTreeNode(classDesc); + ClassDescriptor parentClassDesc = classDesc.getSuperDesc(); + // Node parentNode = childNode.getParent(); + + if (parentClassDesc != null) { + // ClassDescriptor parentClassDesc = parentNode.getData(); + if (parentClassDesc.getMethodTable().contains(methodDesc.getSymbol())) { + Set 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 methodDescList = (LinkedList) toanalyze_methodDescList.clone(); @@ -318,6 +921,14 @@ public class LocationInference { } + private void addSuperClasses(ClassDescriptor cd) { + ClassDescriptor parentClassDesc = cd.getSuperDesc(); + if (parentClassDesc != null) { + toanalyze_classDescSet.add(parentClassDesc); + addSuperClasses(parentClassDesc); + } + } + private void updateFlowGraph() { LinkedList methodDescList = @@ -330,6 +941,25 @@ public class LocationInference { System.out.println("SSJAVA: Updating a flow graph: " + md); propagateFlowsFromCalleesWithNoCompositeLocation(md); } + + Set nodeSet = getFlowGraph(md).getNodeSet(); + for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) { + FlowNode flowNode = (FlowNode) iterator.next(); + NTuple descTuple = flowNode.getCurrentDescTuple(); + NTuple 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()); + } + } + + } + } } @@ -370,6 +1000,26 @@ public class LocationInference { System.out.println("\nSSJAVA: Add addtional ordering constriants:"); MethodDescriptor methodEventLoopDesc = ssjava.getMethodContainingSSJavaLoop(); addAddtionalOrderingConstraints(methodEventLoopDesc); + // calculateReturnHolderLocation(); + } + + private void calculateReturnHolderLocation() { + LinkedList methodDescList = + (LinkedList) toanalyze_methodDescList.clone(); + + while (!methodDescList.isEmpty()) { + MethodDescriptor md = methodDescList.removeLast(); + + FlowGraph fg = getFlowGraph(md); + Set nodeSet = fg.getNodeSet(); + for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) { + FlowNode flowNode = (FlowNode) iterator.next(); + if (flowNode.isFromHolder()) { + calculateCompositeLocationFromFlowGraph(md, flowNode); + } + } + + } } private void updateCompositeLocationAssignments() { @@ -380,7 +1030,7 @@ public class LocationInference { while (!methodDescList.isEmpty()) { MethodDescriptor md = methodDescList.removeLast(); - System.out.println("\n#updateCompositeLocationAssignments=" + md); + // System.out.println("\n#updateCompositeLocationAssignments=" + md); FlowGraph flowGraph = getFlowGraph(md); @@ -389,19 +1039,19 @@ public class LocationInference { Set 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 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()) { @@ -432,9 +1082,12 @@ public class LocationInference { 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(); } @@ -452,8 +1105,8 @@ public class LocationInference { 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); @@ -491,46 +1144,6 @@ public class LocationInference { } - private CompositeLocation translateArgCompLocToParamCompLoc(MethodInvokeNode min, - CompositeLocation argCompLoc) { - - System.out.println("--------translateArgCompLocToParamCompLoc argCompLoc=" + argCompLoc); - MethodDescriptor mdCallee = min.getMethod(); - FlowGraph calleeFlowGraph = getFlowGraph(mdCallee); - - NTuple argLocTuple = argCompLoc.getTuple(); - Location argLocalLoc = argLocTuple.get(0); - - Map> mapIdxToArgTuple = mapMethodInvokeNodeToArgIdxMap.get(min); - Set idxSet = mapIdxToArgTuple.keySet(); - for (Iterator iterator2 = idxSet.iterator(); iterator2.hasNext();) { - Integer idx = (Integer) iterator2.next(); - - if (idx == 0 && !min.getMethod().isStatic()) { - continue; - } - - NTuple 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 paramDescTuple = paramNode.getCurrentDescTuple(); - - NTuple 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 @@ -560,19 +1173,53 @@ public class LocationInference { // // 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 returnLocTuple = returnLoc.getTuple(); NTuple baseTuple = mapMethodInvokeNodeToBaseTuple.get(min); + // System.out.println("###basetuple=" + baseTuple); NTuple 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> iter = holderTupleSet.iterator(); iter.hasNext();) { + NTuple tupleFromHolder = iter.next(); + Set holderOutEdge = callerFlowGraph.getOutEdgeSet(holderNode); + for (Iterator iterator2 = holderOutEdge.iterator(); iterator2.hasNext();) { + FlowEdge outEdge = (FlowEdge) iterator2.next(); + NTuple 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. + FlowReturnNode flowReturnNode = callerFlowGraph.getFlowReturnNode(min); + if (flowReturnNode != null && flowReturnNode.getReturnTupleSet().isEmpty()) { + + if (needToUpdateReturnLocHolder(min.getMethod(), flowReturnNode)) { + NTuple baseTuple = mapMethodInvokeNodeToBaseTuple.get(min); + NTuple newReturnTuple = baseTuple.clone(); + flowReturnNode.addTuple(newReturnTuple); + } + + } + } } @@ -584,6 +1231,23 @@ public class LocationInference { } + private boolean needToUpdateReturnLocHolder(MethodDescriptor mdCallee, + FlowReturnNode flowReturnNode) { + FlowGraph fg = getFlowGraph(mdCallee); + MethodSummary summary = getMethodSummary(mdCallee); + CompositeLocation returnCompLoc = summary.getRETURNLoc(); + NTuple returnDescTuple = translateToDescTuple(returnCompLoc.getTuple()); + Set incomingNodeToReturnNode = + fg.getIncomingFlowNodeSet(fg.getFlowNode(returnDescTuple)); + for (Iterator iterator = incomingNodeToReturnNode.iterator(); iterator.hasNext();) { + FlowNode inNode = (FlowNode) iterator.next(); + if (inNode.getDescTuple().get(0).equals(mdCallee.getThis())) { + return true; + } + } + return false; + } + private void addMapMethodDescToMethodInvokeNodeSet(MethodInvokeNode min) { MethodDescriptor md = min.getMethod(); if (!mapMethodDescToMethodInvokeNodeSet.containsKey(md)) { @@ -599,62 +1263,6 @@ public class LocationInference { return mapMethodDescToMethodInvokeNodeSet.get(md); } - private void addOrderingConstraintFromCompLocParamToArg(MethodDescriptor mdCaller, - MethodInvokeNode min) { - System.out.println("-addOrderingConstraintFromCompLocParamToArg=" + min.printNode(0)); - - GlobalFlowGraph globalGraph = getSubGlobalFlowGraph(ssjava.getMethodContainingSSJavaLoop()); - - Set> 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 globalParamLocTuple = - translateToLocTuple(mdCallee, paramNode.getDescTuple()); - translateToLocTuple(mdCallee, paramNode.getDescTuple()); - CompositeLocation compLoc = paramNode.getCompositeLocation(); - System.out.println("---paramNode=" + paramNode + " compLoc=" + compLoc); - if (compLoc != null) { - NTuple argTuple = getNodeTupleByArgIdx(min, idx); - NTuple 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 pcLocTuple = (NTuple) 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 locTuple) { - return locTuple.get(0).getLocDescriptor().equals(LITERALDESC); - } - public void assignCompositeLocationToFlowGraph(FlowGraph flowGraph, Location loc, CompositeLocation inferCompLoc) { Descriptor localDesc = loc.getLocDescriptor(); @@ -667,7 +1275,7 @@ public class LocationInference { // 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); } } } @@ -675,8 +1283,10 @@ public class LocationInference { private CompositeLocation generateCompositeLocation(NTuple 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(); CompositeLocation newCompLoc = new CompositeLocation(); for (int i = 0; i < inferCompLoc.getSize(); i++) { @@ -686,7 +1296,7 @@ public class LocationInference { Descriptor lastDescOfPrefix = nodeDescTuple.get(0); Descriptor enclosingDescriptor; if (lastDescOfPrefix instanceof InterDescriptor) { - enclosingDescriptor = null; + enclosingDescriptor = getFlowGraph(md).getEnclosingDescriptor(lastDescOfPrefix); } else { enclosingDescriptor = ((VarDescriptor) lastDescOfPrefix).getType().getClassDesc(); } @@ -720,10 +1330,8 @@ public class LocationInference { 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 keySet = callerMapLocToCompLoc.keySet(); for (Iterator iterator = keySet.iterator(); iterator.hasNext();) { @@ -740,9 +1348,9 @@ public class LocationInference { 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); } @@ -762,9 +1370,9 @@ public class LocationInference { 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); @@ -774,12 +1382,12 @@ public class LocationInference { // 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; @@ -807,14 +1415,9 @@ public class LocationInference { 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); } @@ -823,11 +1426,8 @@ public class LocationInference { } } - // 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 idxSet = mapIdxToArgTuple.keySet(); @@ -839,7 +1439,7 @@ public class LocationInference { } NTuple 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 argLocTuple = translateToLocTuple(mdCaller, argTuple); @@ -853,7 +1453,7 @@ public class LocationInference { callerCompLoc.addLocation(argLocTuple.get(i)); } - System.out.println("---callerCompLoc=" + callerCompLoc); + // System.out.println("---callerCompLoc=" + callerCompLoc); // if (baseLocTuple != null && callerCompLoc.getTuple().startsWith(baseLocTuple)) { @@ -864,12 +1464,12 @@ public class LocationInference { 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); @@ -877,22 +1477,22 @@ public class LocationInference { 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 argTupleRef = mapIdxToArgTuple.get(refParamIdx); FlowNode refParamFlowNode = calleeFlowGraph.getParamFlowNode(refParamIdx); NTuple 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++) { @@ -906,8 +1506,9 @@ public class LocationInference { 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 = @@ -919,8 +1520,8 @@ public class LocationInference { } } - System.out.println("-----------------calleeParamFlowNode=" - + calleeParamFlowNode.getCompositeLocation()); + // System.out.println("-----------------calleeParamFlowNode=" + // + calleeParamFlowNode.getCompositeLocation()); // } @@ -934,8 +1535,8 @@ public class LocationInference { 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 paramLocTuple = translateToLocTuple(md, paramNode.getDescTuple()); @@ -995,18 +1596,17 @@ public class LocationInference { } 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++) { @@ -1037,7 +1637,7 @@ public class LocationInference { Integer key = (Integer) iterator.next(); NTuple 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(); } } @@ -1109,11 +1709,11 @@ public class LocationInference { // Set 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 curPrefix = prefixList.get(i); - System.out.println("---curPrefix=" + curPrefix); + // System.out.println("---curPrefix=" + curPrefix); Set> reachableCommonPrefixSet = new HashSet>(); for (Iterator iterator2 = reachableNodeSet.iterator(); iterator2.hasNext();) { @@ -1157,8 +1757,8 @@ public class LocationInference { } 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; @@ -1166,9 +1766,10 @@ public class LocationInference { 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); // } @@ -1222,7 +1823,7 @@ public class LocationInference { // 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++)); @@ -1250,12 +1851,13 @@ public class LocationInference { // 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 reachableSet = flowGraph.getReachFlowNodeSetFrom(flowNode); @@ -1263,7 +1865,6 @@ public class LocationInference { 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; } } @@ -1273,7 +1874,7 @@ public class LocationInference { ((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(); @@ -1281,7 +1882,6 @@ public class LocationInference { FlowNode paramNode = getFlowGraph(mdCallee).getParamFlowNode(paramIdx); if (checkNodeReachToReturnNode(mdCallee, paramNode)) { - System.out.println("here2?!"); return true; } @@ -1297,14 +1897,13 @@ public class LocationInference { 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; } } @@ -1313,8 +1912,7 @@ public class LocationInference { 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; } } @@ -1322,19 +1920,13 @@ public class LocationInference { } } - // 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 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> map = mapMethodInvokeNodeToArgIdxMap.get(min); @@ -1352,17 +1944,15 @@ public class LocationInference { NTuple 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 locTuple = translateToLocTuple(md, reachalbeNode.getDescTuple()); NTuple 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; } } @@ -1372,39 +1962,6 @@ public class LocationInference { } } - // 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 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 locTuple = translateToLocTuple(md, reachalbeNode.getDescTuple()); - // NTuple 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; } @@ -1439,7 +1996,7 @@ public class LocationInference { private List> calculatePrefixList(GlobalFlowGraph graph, GlobalFlowNode node) { - System.out.println("\n##### calculatePrefixList node=" + node); + // System.out.println("\n##### calculatePrefixList node=" + node); Set incomingNodeSetPrefix = graph.getIncomingNodeSetByPrefix(node.getLocTuple().get(0)); @@ -1482,40 +2039,118 @@ public class LocationInference { } }); - // 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> toberemoved = new HashSet>(); - // for (int i = 0; i < prefixList.size(); i++) { - // NTuple prefixLocTuple = prefixList.get(i); - // if (!containsClassDesc(cd, prefixLocTuple)) { - // toberemoved.add(prefixLocTuple); - // } - // } + return prefixList; - // System.out.println("method class=" + cd + " toberemoved=" + toberemoved); + } - prefixList.removeAll(toberemoved); + private CompositeLocation calculateCompositeLocationFromFlowGraph(MethodDescriptor md, + FlowNode node) { - return prefixList; + // System.out.println("#############################################################"); + // System.out.println("calculateCompositeLocationFromFlowGraph=" + node); + + FlowGraph flowGraph = getFlowGraph(md); + // NTuple paramLocTuple = translateToLocTuple(md, paramNode.getDescTuple()); + // GlobalFlowNode paramGlobalNode = subGlobalFlowGraph.getFlowNode(paramLocTuple); + + List> prefixList = calculatePrefixListFlowGraph(flowGraph, node); + + // Set reachableNodeSet = + // subGlobalFlowGraph.getReachableNodeSetByPrefix(paramGlobalNode.getLocTuple().get(0)); + // + Set reachableNodeSet = + flowGraph.getReachableSetFrom(node.getDescTuple().subList(0, 1)); + + // Set reachNodeSet = globalFlowGraph.getReachableNodeSetFrom(node); + // System.out.println("node=" + node + " prefixList=" + prefixList); + + for (int i = 0; i < prefixList.size(); i++) { + NTuple curPrefix = prefixList.get(i); + Set> reachableCommonPrefixSet = new HashSet>(); + + for (Iterator iterator2 = reachableNodeSet.iterator(); iterator2.hasNext();) { + FlowNode reachNode = (FlowNode) iterator2.next(); + NTuple reachLocTuple = translateToLocTuple(md, reachNode.getCurrentDescTuple()); + if (reachLocTuple.startsWith(curPrefix)) { + reachableCommonPrefixSet.add(reachLocTuple); + } + } + // System.out.println("reachableCommonPrefixSet=" + reachableCommonPrefixSet); + + if (!reachableCommonPrefixSet.isEmpty()) { + + MethodDescriptor curPrefixFirstElementMethodDesc = + (MethodDescriptor) curPrefix.get(0).getDescriptor(); + + 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); + + node.setCompositeLocation(newCompLoc); + + return newCompLoc; + + } + + } + return null; } - private boolean containsClassDesc(ClassDescriptor cd, NTuple 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; + private List> calculatePrefixListFlowGraph(FlowGraph graph, FlowNode node) { + + // System.out.println("\n##### calculatePrefixList node=" + node); + + MethodDescriptor md = graph.getMethodDescriptor(); + Set incomingNodeSetPrefix = + graph.getIncomingNodeSetByPrefix(node.getDescTuple().get(0)); + // System.out.println("---incomingNodeSetPrefix=" + incomingNodeSetPrefix); + + Set reachableNodeSetPrefix = + graph.getReachableSetFrom(node.getDescTuple().subList(0, 1)); + // System.out.println("---reachableNodeSetPrefix=" + reachableNodeSetPrefix); + + List> prefixList = new ArrayList>(); + + for (Iterator iterator = incomingNodeSetPrefix.iterator(); iterator.hasNext();) { + FlowNode inNode = (FlowNode) iterator.next(); + NTuple inNodeTuple = translateToLocTuple(md, inNode.getCurrentDescTuple()); + + // if (inNodeTuple.get(0).getLocDescriptor() instanceof InterDescriptor + // || inNodeTuple.get(0).getLocDescriptor().equals(GLOBALDESC)) { + // continue; + // } + + for (int i = 1; i < inNodeTuple.size(); i++) { + NTuple prefix = inNodeTuple.subList(0, i); + if (!prefixList.contains(prefix)) { + prefixList.add(prefix); } } } - return false; + + Collections.sort(prefixList, new Comparator>() { + public int compare(NTuple arg0, NTuple arg1) { + int s0 = arg0.size(); + int s1 = arg1.size(); + if (s0 > s1) { + return -1; + } else if (s0 == s1) { + return 0; + } else { + return 1; + } + } + }); + + return prefixList; + } private GlobalFlowGraph constructSubGlobalFlowGraph(FlowGraph flowGraph) { @@ -1541,24 +2176,7 @@ public class LocationInference { // here only keep the first element(method location) of the descriptor // tuple NTuple 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 loc = new Location(md, srcVarDesc); - // srcLocTuple.add(loc); - // } - // NTuple dstLocTuple = translateToLocTuple(md, dstDescTuple); - // Location dstMethodLoc = dstLocTuple.get(0); - // Descriptor dstVarDesc = dstMethodLoc.getLocDescriptor(); - // if (!dstVarDesc.equals(md.getThis())) { - // dstLocTuple = new NTuple(); - // Location loc = new Location(md, dstVarDesc); - // dstLocTuple.add(loc); - // } globalGraph.addValueFlowEdge(srcLocTuple, dstLocTuple); @@ -1572,7 +2190,6 @@ public class LocationInference { NTuple locTuple = new NTuple(); Descriptor enclosingDesc = md; - // System.out.println("md=" + md + " descTuple=" + descTuple); for (int i = 0; i < descTuple.size(); i++) { Descriptor desc = descTuple.get(i); @@ -1584,7 +2201,6 @@ public class LocationInference { } else if (desc instanceof FieldDescriptor) { enclosingDesc = ((FieldDescriptor) desc).getType().getClassDesc(); } else { - // TODO: inter descriptor case enclosingDesc = desc; } @@ -1627,12 +2243,12 @@ public class LocationInference { 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> mapIdxToArg = mapMethodInvokeNodeToArgIdxMap.get(min); - System.out.println("-----mapMethodInvokeNodeToArgIdxMap.get(min)=" - + mapMethodInvokeNodeToArgIdxMap.get(min)); + // System.out.println("-----mapMethodInvokeNodeToArgIdxMap.get(min)=" + // + mapMethodInvokeNodeToArgIdxMap.get(min)); Set keySet = mapIdxToArg.keySet(); for (Iterator iterator = keySet.iterator(); iterator.hasNext();) { @@ -1642,8 +2258,8 @@ public class LocationInference { NTuple argLocTuple = translateToLocTuple(mdCaller, argDescTuple); NTuple paramDescTuple = calleeFlowGraph.getParamFlowNode(idx).getDescTuple(); NTuple paramLocTuple = translateToLocTuple(possibleMdCallee, paramDescTuple); - System.out.println("-------paramDescTuple=" + paramDescTuple + "->argDescTuple=" - + argDescTuple); + // System.out.println("-------paramDescTuple=" + paramDescTuple + "->argDescTuple=" + // + argDescTuple); addMapCallerArgToCalleeParam(min, argDescTuple, paramDescTuple); } } @@ -1658,20 +2274,21 @@ public class LocationInference { addValueFlowFromCalleeNode(min, mdCaller, possibleMdCallee, calleeNode); } - System.out.println("$$$GLOBAL PC LOC ADD=" + mdCaller); + // System.out.println("$$$GLOBAL PC LOC ADD=" + mdCaller); Set> 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 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 pcLocTuple = (NTuple) iterator2.next(); + callerSubGlobalGraph.addValueFlowEdge(pcLocTuple, callerSrcNodeLocTuple); } } @@ -1703,7 +2320,8 @@ public class LocationInference { 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); } } @@ -1716,8 +2334,9 @@ public class LocationInference { // this method will return the same nodeLocTuple if the corresponding argument is literal // value. - FlowGraph calleeFlowGraph = getFlowGraph(mdCallee); + // System.out.println("translateToCallerLocTuple=" + nodeLocTuple); + FlowGraph calleeFlowGraph = getFlowGraph(mdCallee); NTuple nodeDescTuple = translateToDescTuple(nodeLocTuple); if (calleeFlowGraph.isParameter(nodeDescTuple)) { int paramIdx = calleeFlowGraph.getParamIdx(nodeDescTuple); @@ -1727,7 +2346,8 @@ public class LocationInference { // // the type of argument is primitive. // return nodeLocTuple.clone(); // } - // System.out.println("paramIdx=" + paramIdx + " argDescTuple=" + argDescTuple); + // System.out.println("paramIdx=" + paramIdx + " argDescTuple=" + argDescTuple + " from min=" + // + min.printNode(0)); NTuple argLocTuple = translateToLocTuple(mdCaller, argDescTuple); NTuple callerLocTuple = new NTuple(); @@ -1762,7 +2382,7 @@ public class LocationInference { TypeDescriptor type = ((FieldDescriptor) desc).getType(); if (type.isArray()) { - return false; + return !type.isPrimitive(); } else { return type.isPtr(); } @@ -1770,7 +2390,7 @@ public class LocationInference { } else if (desc instanceof VarDescriptor) { TypeDescriptor type = ((VarDescriptor) desc).getType(); if (type.isArray()) { - return false; + return !type.isPrimitive(); } else { return type.isPtr(); } @@ -1809,13 +2429,16 @@ public class LocationInference { 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()); } @@ -1830,20 +2453,8 @@ public class LocationInference { FlowNode flowNode = flowGraph.getParamFlowNode(paramIdx); CompositeLocation inferredCompLoc = updateCompositeLocation(flowNode.getCompositeLocation()); - // NTuple 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); @@ -1877,9 +2488,9 @@ public class LocationInference { 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; @@ -1919,9 +2530,9 @@ public class LocationInference { 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; @@ -1936,31 +2547,6 @@ public class LocationInference { return false; } - private CompositeLocation translateCompositeLocation(CompositeLocation compLoc) { - CompositeLocation newCompLoc = new CompositeLocation(); - - // 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; - } - private void debug_writeLattices() { Set keySet = mapDescriptorToSimpleLattice.keySet(); @@ -1970,37 +2556,86 @@ public class LocationInference { // 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 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 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 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 simpleLattice = buildLattice.buildLattice(desc); + + addMapDescToSimpleLattice(desc, simpleLattice); + + HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(desc); + // System.out.println("\n## insertIntermediateNodesToStraightLine:" + // + simpleHierarchyGraph.getName()); + SSJavaLattice lattice = + buildLattice.insertIntermediateNodesToStraightLine(desc, simpleLattice); + + if (lattice == null) { + return; + } + lattice.removeRedundantEdges(); - BuildLattice buildLattice = new BuildLattice(this); + 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 keySet = mapDescriptorToCombineSkeletonHierarchyGraph.keySet(); for (Iterator iterator = keySet.iterator(); iterator.hasNext();) { @@ -2017,6 +2652,8 @@ public class LocationInference { buildLattice.insertIntermediateNodesToStraightLine(desc, simpleLattice); lattice.removeRedundantEdges(); + LocationInference.numLocationsSInfer += lattice.getKeySet().size(); + if (desc instanceof ClassDescriptor) { // field lattice cd2lattice.put((ClassDescriptor) desc, lattice); @@ -2029,18 +2666,77 @@ public class LocationInference { // 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 rootNode = inheritanceTree.getRootNode(); + DFSBuildLatticeInheritanceTree(rootClassDescriptor); + } + + public Set getDirectSubClasses(ClassDescriptor parent) { + + Set result = new HashSet(); + + Set children = tu.getDirectSubClasses(parent); + if (children == null) { + children = new HashSet(); + } + + 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 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 parentMap = buildLattice.getIntermediateLocMap(parentMethodDesc); + Map childMap = new HashMap(); + Set 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 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); + } + } + } } } @@ -2069,15 +2765,17 @@ public class LocationInference { Set 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); } } @@ -2091,13 +2789,124 @@ public class LocationInference { 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 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 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 set) { + + if (curDesc instanceof ClassDescriptor) { + ClassDescriptor cd = (ClassDescriptor) curDesc; + ClassDescriptor parentClassDesc = cd.getSuperDesc(); + Set 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 directSubClasses = tu.getDirectSubClasses(cd); + for (Iterator iterator = directSubClasses.iterator(); iterator.hasNext();) { + ClassDescriptor child = (ClassDescriptor) iterator.next(); + + Set 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 set) { + + recurUpAccumulateInheritanceDesc(curDesc, set); + recurDownAccumulateInheritanceDesc(curDesc, set); + + } + + public boolean isValidMergeInheritanceCheck(Descriptor desc, Set mergeSet) { + + // set up inheritance chain set... + Set inheritanceDescSet = new HashSet(); + 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 incomingNode = graph.getIncomingNodeSet(firstNode); + Set 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 keySet = mapDescriptorToHierarchyGraph.keySet(); @@ -2115,6 +2924,7 @@ public class LocationInference { Descriptor desc = (Descriptor) iterator.next(); getHierarchyGraph(desc).writeGraph(); getSimpleHierarchyGraph(desc).writeGraph(); + getSimpleHierarchyGraph(desc).writeGraph(true); } } @@ -2159,6 +2969,60 @@ public class LocationInference { private void constructHierarchyGraph() { + LinkedList methodDescList = + (LinkedList) 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 keySet = mapDescriptorToHierarchyGraph.keySet(); + for (Iterator iterator = keySet.iterator(); iterator.hasNext();) { + Descriptor key = (Descriptor) iterator.next(); + HierarchyGraph graph = getHierarchyGraph(key); + + Set nodeToBeConnected = new HashSet(); + 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 descriptorListToAnalyze = ssjava.getSortedDescriptors(); @@ -2250,7 +3114,7 @@ public class LocationInference { 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); } @@ -2291,12 +3155,12 @@ public class LocationInference { Set sourceNodeSet = new HashSet(); if (originalSrcNode instanceof FlowReturnNode) { FlowReturnNode rnode = (FlowReturnNode) originalSrcNode; - System.out.println("rnode=" + rnode); + // System.out.println("rnode=" + rnode); Set> tupleSet = rnode.getReturnTupleSet(); for (Iterator iterator2 = tupleSet.iterator(); iterator2.hasNext();) { NTuple nTuple = (NTuple) 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); @@ -2339,7 +3203,7 @@ public class LocationInference { for (Iterator iterator4 = tupleSet.iterator(); iterator4.hasNext();) { NTuple nTuple = (NTuple) 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); @@ -2354,7 +3218,7 @@ public class LocationInference { if (dstLocalDesc instanceof InterDescriptor && ((InterDescriptor) dstLocalDesc).getMethodArgIdxPair() != null) { if (dstNode.getCompositeLocation() == null) { - System.out.println("%%%%%%%%%%%%%SKIP=" + dstNode); + // System.out.println("%%%%%%%%%%%%%SKIP=" + dstNode); continue; } } @@ -2365,8 +3229,24 @@ public class LocationInference { NTuple srcCurTuple = srcNode.getCurrentDescTuple(); NTuple 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))) { @@ -2432,6 +3312,31 @@ public class LocationInference { } + private NTuple translateBaseTuple(FlowNode flowNode, NTuple inTuple) { + + if (flowNode.getBaseTuple() != null) { + + NTuple translatedTuple = new NTuple(); + + NTuple 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)); @@ -2516,6 +3421,9 @@ public class LocationInference { Map> map = lattice.getTable(); Set 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(); @@ -2561,20 +3469,31 @@ public class LocationInference { } } - rtr += "\")"; - 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); + TypeDescriptor returnType = ((MethodDescriptor) desc).getReturnType(); + if (!ssjava.getMethodContainingSSJavaLoop().equals(desc) && returnType != null + && (!returnType.isVoid())) { + CompositeLocation returnLoc = methodSummary.getRETURNLoc(); + if (returnLoc.getSize() == 1) { + String returnLocStr = generateLocationAnnoatation(methodSummary.getRETURNLoc()); + if (rtr.indexOf(returnLocStr) == -1) { + rtr += "," + returnLocStr; + } + } + } + rtr += "\")"; + if (!ssjava.getMethodContainingSSJavaLoop().equals(desc)) { - TypeDescriptor returnType = ((MethodDescriptor) desc).getReturnType(); if (returnType != null && (!returnType.isVoid())) { rtr += "\n@RETURNLOC(\"" + generateLocationAnnoatation(methodSummary.getRETURNLoc()) + "\")"; } + CompositeLocation pcLoc = methodSummary.getPCLoc(); if ((pcLoc != null) && (!pcLoc.get(0).isTop())) { rtr += "\n@PCLOC(\"" + generateLocationAnnoatation(pcLoc) + "\")"; @@ -2586,6 +3505,8 @@ public class LocationInference { } rtr += "\n@GLOBALLOC(\"" + methodSummary.getGlobalLocName() + "\")"; + } else { + rtr += "\")"; } return rtr; @@ -2649,6 +3570,7 @@ public class LocationInference { } SSJavaLattice methodLattice = md2lattice.get(md); + // System.out.println("md=" + md + " methodLattice=" + methodLattice); if (methodLattice != null) { int methodDefLine = md.getLineNum(); @@ -2661,8 +3583,8 @@ public class LocationInference { Map 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 localVarDescSet = mapVarDescToInferLoc.keySet(); @@ -2670,7 +3592,7 @@ public class LocationInference { 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(); @@ -2684,11 +3606,12 @@ public class LocationInference { if (mapDescToDefinitionLine.containsKey(localVarDesc)) { int varLineNum = mapDescToDefinitionLine.get(localVarDesc); String orgSourceLine = sourceVec.get(varLineNum); + // 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 + " " @@ -2701,8 +3624,8 @@ public class LocationInference { 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 = @@ -2864,7 +3787,7 @@ public class LocationInference { SSJavaLattice classLattice = cd2lattice.get(cd); if (classLattice != null) { ssjava.writeLatticeDotFile(cd, null, classLattice); - debug_printDescriptorToLocNameMapping(cd); + // debug_printDescriptorToLocNameMapping(cd); } while (!toAnalyzeMethodIsEmpty()) { @@ -2872,7 +3795,7 @@ public class LocationInference { SSJavaLattice methodLattice = md2lattice.get(md); if (methodLattice != null) { ssjava.writeLatticeDotFile(cd, md, methodLattice); - debug_printDescriptorToLocNameMapping(md); + // debug_printDescriptorToLocNameMapping(md); } } } @@ -2892,7 +3815,9 @@ public class LocationInference { private void calculateExtraLocations() { - LinkedList methodDescList = ssjava.getSortedDescriptors(); + // LinkedList methodDescList = ssjava.getSortedDescriptors(); + LinkedList methodDescList = + (LinkedList) toanalyze_methodDescList.clone(); for (Iterator iterator = methodDescList.iterator(); iterator.hasNext();) { MethodDescriptor md = (MethodDescriptor) iterator.next(); if (!ssjava.getMethodContainingSSJavaLoop().equals(md)) { @@ -2997,7 +3922,7 @@ public class LocationInference { private void calculatePCLOC(MethodDescriptor md) { - System.out.println("#CalculatePCLOC"); + // System.out.println("#CalculatePCLOC"); MethodSummary methodSummary = getMethodSummary(md); FlowGraph fg = getFlowGraph(md); Map mapParamToLoc = methodSummary.getMapParamIdxToInferLoc(); @@ -3040,7 +3965,7 @@ public class LocationInference { } } - System.out.println("paramLocTupleHavingInFlowSet=" + paramLocTupleHavingInFlowSet); + // System.out.println("paramLocTupleHavingInFlowSet=" + paramLocTupleHavingInFlowSet); if (paramLocTupleHavingInFlowSet.size() > 0 && !coversAllParamters(md, fg, paramLocTupleHavingInFlowSet)) { @@ -3069,21 +3994,21 @@ public class LocationInference { 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 lowerLocTuple = translateToLocTuple(md, lowerNode.getDescTuple()); CompositeLocation newComp = calculateCompositeLocationFromSubGlobalGraph(md, lowerNode); @@ -3091,7 +4016,7 @@ public class LocationInference { 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); } } @@ -3104,35 +4029,50 @@ public class LocationInference { } } - private boolean coversAllParamters(MethodDescriptor md, FlowGraph fg, - Set> paramLocTupleHavingInFlowSet) { + private int countFirstDescriptorSetSize(Set> set) { - int numParam = fg.getNumParameters(); - int size = paramLocTupleHavingInFlowSet.size(); + Set descSet = new HashSet(); - if (!md.isStatic()) { + for (Iterator iterator = set.iterator(); iterator.hasNext();) { + NTuple locTuple = (NTuple) 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 thisParamLocTuple = - translateToLocTuple(md, thisParamNode.getCurrentDescTuple()); + private boolean coversAllParamters(MethodDescriptor md, FlowGraph fg, + Set> 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 paramTuple = (NTuple) 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 thisParamLocTuple = + // translateToLocTuple(md, thisParamNode.getCurrentDescTuple()); + // + // if (!paramLocTupleHavingInFlowSet.contains(thisParamLocTuple)) { + // + // for (Iterator iterator = paramLocTupleHavingInFlowSet.iterator(); iterator.hasNext();) { + // NTuple paramTuple = (NTuple) iterator.next(); + // if (paramTuple.size() > 1 && paramTuple.get(0).getLocDescriptor().equals(md.getThis())) { + // // paramLocTupleHavingInFlowSet.add(thisParamLocTuple); + // // break; + // size++; + // } + // } + // + // } + // } if (size == numParam) { return true; @@ -3144,14 +4084,16 @@ public class LocationInference { 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 MethodSummary methodSummary = getMethodSummary(md); - if (methodSummary.getRETURNLoc() != null) { - return; - } + // if (methodSummary.getRETURNLoc() != null) { + // System.out.println("$HERE?"); + // return; + // } + FlowGraph fg = getFlowGraph(md); Map mapParamToLoc = methodSummary.getMapParamIdxToInferLoc(); Set paramIdxSet = mapParamToLoc.keySet(); @@ -3177,8 +4119,8 @@ public class LocationInference { NTuple 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 @@ -3199,6 +4141,13 @@ public class LocationInference { } + // makes sure that PCLOC is higher than RETURNLOC + CompositeLocation pcLoc = methodSummary.getPCLoc(); + if (!pcLoc.get(0).isTop()) { + NTuple pcLocDescTuple = translateToDescTuple(pcLoc.getTuple()); + fg.addValueFlowEdge(pcLocDescTuple, returnDescTuple); + } + } } @@ -3275,7 +4224,7 @@ public class LocationInference { 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()); } @@ -3286,7 +4235,7 @@ public class LocationInference { 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; @@ -3473,7 +4422,7 @@ public class LocationInference { 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 @@ -3543,17 +4492,17 @@ public class LocationInference { 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 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 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> pcLocTupleSet = getPCLocTupleSet(min); @@ -3572,7 +4521,7 @@ public class LocationInference { 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; } } @@ -3599,7 +4548,7 @@ public class LocationInference { private CompositeLocation generateCompositeLocation(NTuple prefixLocTuple) { - System.out.println("generateCompositeLocation=" + prefixLocTuple); + // System.out.println("generateCompositeLocation=" + prefixLocTuple); CompositeLocation newCompLoc = new CompositeLocation(); for (int i = 0; i < prefixLocTuple.size(); i++) { @@ -3635,7 +4584,7 @@ public class LocationInference { private CompositeLocation generateCompositeLocation(MethodDescriptor md, NTuple paramPrefix) { - System.out.println("generateCompositeLocation=" + paramPrefix); + // System.out.println("generateCompositeLocation=" + paramPrefix); CompositeLocation newCompLoc = convertToCompositeLocation(md, paramPrefix); @@ -3703,6 +4652,8 @@ public class LocationInference { } else if (curDescriptor instanceof NameDescriptor) { // it is "GLOBAL LOC" case! enclosingDescriptor = GLOBALDESC; + } else if (curDescriptor instanceof InterDescriptor) { + enclosingDescriptor = getFlowGraph(md).getEnclosingDescriptor(curDescriptor); } else { enclosingDescriptor = null; } @@ -3834,7 +4785,7 @@ public class LocationInference { return false; } - private SSJavaLattice getLattice(Descriptor d) { + public SSJavaLattice getLattice(Descriptor d) { if (d instanceof MethodDescriptor) { return getMethodLattice((MethodDescriptor) d); } else { @@ -3887,14 +4838,14 @@ public class LocationInference { 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); } @@ -3921,6 +4872,11 @@ public class LocationInference { while (!toAnalyzeIsEmpty()) { ClassDescriptor cd = toAnalyzeNext(); + if (cd.getClassName().equals("Object")) { + rootClassDescriptor = cd; + // inheritanceTree = new InheritanceTree(cd); + } + setupToAnalazeMethod(cd); temp_toanalyzeMethodList.removeAll(visited); @@ -3986,10 +4942,33 @@ public class LocationInference { System.out.println(""); toanalyze_methodDescList = computeMethodList(); + // 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 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)")) { + mdToString1 = md; + } + if (md.toString().equals("public String Object.toString()")) { + mdToString2 = md; + } + } + + if (mdToString1 != null) { + toanalyze_methodDescList.remove(mdToString1); + toanalyze_methodDescList.addLast(mdToString1); + } + if (mdToString2 != null) { + toanalyze_methodDescList.remove(mdToString2); + toanalyze_methodDescList.addLast(mdToString2); + } + LinkedList methodDescList = (LinkedList) toanalyze_methodDescList.clone(); - System.out.println("@@@methodDescList=" + methodDescList); + // System.out.println("@@@methodDescList=" + methodDescList); // System.exit(0); while (!methodDescList.isEmpty()) { @@ -4045,7 +5024,7 @@ public class LocationInference { 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"); @@ -4066,7 +5045,7 @@ public class LocationInference { Set 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 paramDescTuple = paramFlowNode.getDescTuple(); NTuple paramLocTuple = translateToLocTuple(md, paramDescTuple); GlobalFlowNode paramGlobalNode = globalFlowGraph.getFlowNode(paramLocTuple); @@ -4200,7 +5179,6 @@ public class LocationInference { if (needToGenerateInterLoc(newImplicitTupleSet)) { // need to create an intermediate node for the GLB of conditional // locations & implicit flows - System.out.println("10"); NTuple interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple(); for (Iterator> idxIter = newImplicitTupleSet.iterator(); idxIter.hasNext();) { @@ -4267,7 +5245,6 @@ public class LocationInference { // System.out.println("---currentFlowTupleSet=" + currentFlowTupleSet); if (needToGenerateInterLoc(currentFlowTupleSet)) { - System.out.println("9"); FlowNode meetNode = fg.createIntermediateNode(); for (Iterator iterator = currentFlowTupleSet.iterator(); iterator.hasNext();) { @@ -4307,7 +5284,7 @@ public class LocationInference { } } if (size > 1) { - System.out.println("needToGenerateInterLoc=" + tupleSet + " size=" + size); + // System.out.println("needToGenerateInterLoc=" + tupleSet + " size=" + size); return true; } else { return false; @@ -4334,7 +5311,6 @@ public class LocationInference { if (needToGenerateInterLoc(newImplicitTupleSet)) { // need to create an intermediate node for the GLB of conditional // locations & implicit flows - System.out.println("6"); NTuple interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple(); for (Iterator> idxIter = newImplicitTupleSet.iterator(); idxIter @@ -4395,7 +5371,6 @@ public class LocationInference { if (needToGenerateInterLoc(newImplicitTupleSet)) { // need to create an intermediate node for the GLB of conditional // locations & implicit flows - System.out.println("7"); NTuple interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple(); for (Iterator> idxIter = newImplicitTupleSet.iterator(); idxIter @@ -4459,7 +5434,6 @@ public class LocationInference { // 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 interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple(); @@ -4502,6 +5476,7 @@ public class LocationInference { fn.setDeclarationNode(); if (dn.getExpression() != null) { + // System.out.println("-analyzeFlowDeclarationNode=" + dn.printNode(0)); NodeTupleSet nodeSetRHS = new NodeTupleSet(); analyzeFlowExpressionNode(md, nametable, dn.getExpression(), nodeSetRHS, null, @@ -4510,14 +5485,13 @@ public class LocationInference { // creates edges from RHS to LHS NTuple interTuple = null; if (needToGenerateInterLoc(nodeSetRHS)) { - System.out.println("3"); interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple(); } for (Iterator> iter = nodeSetRHS.iterator(); iter.hasNext();) { NTuple 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); } @@ -4530,9 +5504,20 @@ public class LocationInference { GlobalFlowGraph globalFlowGraph = getSubGlobalFlowGraph(md); for (Iterator> iterator = nodeSetRHS.globalIterator(); iterator.hasNext();) { NTuple calleeReturnLocTuple = iterator.next(); + globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple, translateToLocTuple(md, tupleLHS)); } + for (Iterator> iterator = implicitFlowTupleSet.globalIterator(); iterator + .hasNext();) { + NTuple implicitGlobalTuple = iterator.next(); + + globalFlowGraph.addValueFlowEdge(implicitGlobalTuple, translateToLocTuple(md, tupleLHS)); + } + + // System.out.println("-nodeSetRHS=" + nodeSetRHS); + // System.out.println("-implicitFlowTupleSet=" + implicitFlowTupleSet); + } } @@ -4552,12 +5537,13 @@ public class LocationInference { ExpressionNode en, NodeTupleSet nodeSet, NTuple base, NodeTupleSet implicitFlowTupleSet, boolean isLHS) { + // System.out.println("en=" + en.printNode(0) + " class=" + en.getClass()); + // note that expression node can create more than one flow node // nodeSet contains of flow nodes // base is always assigned to null except the case of a name node! NTuple flowTuple; switch (en.kind()) { - case Kind.AssignmentNode: analyzeFlowAssignmentNode(md, nametable, (AssignmentNode) en, nodeSet, base, implicitFlowTupleSet); @@ -4586,7 +5572,7 @@ public class LocationInference { break; case Kind.CreateObjectNode: - analyzeCreateObjectNode(md, nametable, (CreateObjectNode) en); + analyzeCreateObjectNode(md, nametable, (CreateObjectNode) en, nodeSet, implicitFlowTupleSet); break; case Kind.ArrayAccessNode: @@ -4643,7 +5629,7 @@ public class LocationInference { 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, @@ -4659,7 +5645,6 @@ public class LocationInference { // 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 interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple(); for (Iterator> idxIter = newImplicitTupleSet.iterator(); idxIter.hasNext();) { @@ -4672,7 +5657,8 @@ public class LocationInference { 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, @@ -4684,7 +5670,7 @@ public class LocationInference { 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, @@ -4724,7 +5710,7 @@ public class LocationInference { 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; @@ -4761,10 +5747,10 @@ public class LocationInference { addMapCallerMethodDescToMethodInvokeNodeSet(mdCaller, min); FlowGraph calleeFlowGraph = getFlowGraph(mdCallee); - System.out.println("mdCallee=" + mdCallee); + // System.out.println("mdCallee=" + mdCallee + " calleeFlowGraph=" + calleeFlowGraph); Set calleeReturnSet = calleeFlowGraph.getReturnNodeSet(); - System.out.println("---calleeReturnSet=" + calleeReturnSet); + // System.out.println("---calleeReturnSet=" + calleeReturnSet); NodeTupleSet tupleSet = new NodeTupleSet(); @@ -4773,9 +5759,17 @@ public class LocationInference { NodeTupleSet baseNodeSet = new NodeTupleSet(); analyzeFlowExpressionNode(mdCaller, nametable, min.getExpression(), baseNodeSet, null, implicitFlowTupleSet, false); + // System.out.println("baseNodeSet=" + baseNodeSet); assert (baseNodeSet.size() == 1); NTuple 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()) { @@ -4788,19 +5782,31 @@ public class LocationInference { // the location type of the return value is started with 'this' // reference NTuple inFlowTuple = new NTuple(baseTuple.getList()); + + if (inFlowTuple.get(0) instanceof InterDescriptor) { + // min.getExpression() + } else { + + } + inFlowTuple.addAll(returnDescTuple.subList(1, returnDescTuple.size())); // nodeSet.addTuple(inFlowTuple); - 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); Set 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()); tupleSet.addTupleSet(baseNodeSet); - } } } @@ -4825,7 +5831,7 @@ public class LocationInference { NodeTupleSet argTupleSet = new NodeTupleSet(); analyzeFlowExpressionNode(mdCaller, nametable, en, argTupleSet, false); // if argument is liternal node, argTuple is set to NULL - System.out.println("argTupleSet=" + argTupleSet); + // System.out.println("---arg idx=" + idx + " argTupleSet=" + argTupleSet); NTuple argTuple = generateArgTuple(mdCaller, argTupleSet); // if an argument is literal value, @@ -4861,11 +5867,12 @@ public class LocationInference { // } // } - 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); tupleSet.addTupleSet(argTupleSet); } } @@ -4873,10 +5880,52 @@ public class LocationInference { } if (mdCallee.getReturnType() != null && !mdCallee.getReturnType().isVoid()) { - FlowReturnNode setNode = getFlowGraph(mdCaller).createReturnNode(min); - System.out.println("ADD TUPLESET=" + tupleSet + " to returnnode=" + setNode); - setNode.addTupleSet(tupleSet); - nodeSet.addTuple(setNode.getDescTuple()); + FlowReturnNode returnHolderNode = getFlowGraph(mdCaller).createReturnNode(min); + + if (needToGenerateInterLoc(tupleSet)) { + FlowGraph fg = getFlowGraph(mdCaller); + FlowNode interNode = fg.createIntermediateNode(); + interNode.setFormHolder(true); + + NTuple interTuple = interNode.getDescTuple(); + + for (Iterator iterator = tupleSet.iterator(); iterator.hasNext();) { + NTuple tuple = (NTuple) iterator.next(); + + Set> addSet = new HashSet>(); + FlowNode node = fg.getFlowNode(tuple); + if (node instanceof FlowReturnNode) { + addSet.addAll(fg.getReturnTupleSet(((FlowReturnNode) node).getReturnTupleSet())); + } else { + addSet.add(tuple); + } + for (Iterator iterator2 = addSet.iterator(); iterator2.hasNext();) { + NTuple higher = (NTuple) iterator2.next(); + addFlowGraphEdge(mdCaller, higher, interTuple); + } + } + + returnHolderNode.addTuple(interTuple); + + 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); + // 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()); @@ -4888,15 +5937,62 @@ public class LocationInference { FlowNode calleeReturnNode = (FlowNode) iterator.next(); NTuple calleeReturnLocTuple = translateToLocTuple(mdCallee, calleeReturnNode.getDescTuple()); - System.out.println("calleeReturnLocTuple=" + calleeReturnLocTuple); - nodeSet.addGlobalFlowTuple(translateToCallerLocTuple(min, mdCallee, mdCaller, - calleeReturnLocTuple)); + // System.out.println("calleeReturnLocTuple=" + calleeReturnLocTuple); + NTuple transaltedToCaller = + translateToCallerLocTuple(min, mdCallee, mdCaller, calleeReturnLocTuple); + // System.out.println("translateToCallerLocTuple=" + // + translateToCallerLocTuple(min, mdCallee, mdCaller, calleeReturnLocTuple)); + if (transaltedToCaller.size() > 0) { + nodeSet.addGlobalFlowTuple(translateToCallerLocTuple(min, mdCallee, mdCaller, + calleeReturnLocTuple)); + } + } + + // System.out.println("min nodeSet=" + nodeSet); + + } + + } + + private NodeTupleSet getNodeTupleSetFromReturnNode(FlowGraph fg, FlowReturnNode node) { + NodeTupleSet nts = new NodeTupleSet(); + + Set> returnSet = node.getReturnTupleSet(); + + for (Iterator iterator = returnSet.iterator(); iterator.hasNext();) { + NTuple tuple = (NTuple) 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 nTuple = (NTuple) iterator.next(); + nts.addTuple(nTuple); + } + + return nts; - System.out.println("min nodeSet=" + nodeSet); + } + + private Set> recurGetNode(FlowGraph fg, FlowReturnNode rnode) { + Set> tupleSet = new HashSet>(); + + Set> returnSet = rnode.getReturnTupleSet(); + for (Iterator iterator = returnSet.iterator(); iterator.hasNext();) { + NTuple tuple = (NTuple) iterator.next(); + FlowNode flowNode = fg.getFlowNode(tuple); + if (flowNode instanceof FlowReturnNode) { + tupleSet.addAll(recurGetNode(fg, (FlowReturnNode) flowNode)); + } + tupleSet.add(tuple); } + return tupleSet; } private NTuple generateArgTuple(MethodDescriptor mdCaller, NodeTupleSet argTupleSet) { @@ -4920,7 +6016,6 @@ public class LocationInference { } if (argTupleSetNonLiteral.size() > 1) { - System.out.println("11"); NTuple interTuple = getFlowGraph(mdCaller).createIntermediateNode().getDescTuple(); @@ -4946,7 +6041,7 @@ public class LocationInference { } // Set reachableSet = fg.getReachFlowNodeSetFrom(inNode); Set 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(); @@ -4990,7 +6085,9 @@ public class LocationInference { NodeTupleSet expNodeTupleSet = new NodeTupleSet(); NTuple base = analyzeFlowExpressionNode(md, nametable, aan.getExpression(), expNodeTupleSet, isLHS); + // System.out.println("-base=" + base); + nodeSet.setMethodInvokeBaseDescTuple(base); NodeTupleSet idxNodeTupleSet = new NodeTupleSet(); analyzeFlowExpressionNode(md, nametable, aan.getIndex(), idxNodeTupleSet, isLHS); @@ -5012,6 +6109,7 @@ public class LocationInference { NTuple calleeReturnLocTuple = iterator.next(); for (Iterator> arrIter = expNodeTupleSet.iterator(); arrIter.hasNext();) { NTuple arrTuple = arrIter.next(); + globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple, translateToLocTuple(md, arrTuple)); } } @@ -5028,8 +6126,8 @@ public class LocationInference { || !arrayAccessNodeStack.peek().startsWith(currentArrayAccessNodeExpStr)) { if (needToGenerateInterLoc(nodeSetArrayAccessExp)) { - System.out.println("1"); - NTuple interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple(); + FlowNode interNode = getFlowGraph(md).createIntermediateNode(); + NTuple interTuple = interNode.getDescTuple(); for (Iterator> iter = nodeSetArrayAccessExp.iterator(); iter.hasNext();) { NTuple higherTuple = iter.next(); @@ -5037,6 +6135,14 @@ public class LocationInference { } nodeSetArrayAccessExp.clear(); nodeSetArrayAccessExp.addTuple(interTuple); + FlowGraph fg = getFlowGraph(md); + + // System.out.println("base=" + base); + if (base != null) { + fg.addMapInterLocNodeToEnclosingDescriptor(interTuple.get(0), + getClassTypeDescriptor(base.get(base.size() - 1))); + interNode.setBaseTuple(base); + } } } @@ -5048,8 +6154,18 @@ public class LocationInference { } 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); } @@ -5059,6 +6175,8 @@ public class LocationInference { NodeTupleSet leftOpSet = new NodeTupleSet(); NodeTupleSet rightOpSet = new NodeTupleSet(); + // System.out.println("analyzeFlowOpNode=" + on.printNode(0)); + // left operand analyzeFlowExpressionNode(md, nametable, on.getLeft(), leftOpSet, null, implicitFlowTupleSet, false); @@ -5266,6 +6384,7 @@ public class LocationInference { for (Iterator> iterator = idxNodeTupleSet.globalIterator(); iterator .hasNext();) { NTuple calleeReturnLocTuple = iterator.next(); + globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple, translateToLocTuple(md, flowFieldTuple)); } @@ -5286,8 +6405,7 @@ public class LocationInference { 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()); @@ -5299,10 +6417,14 @@ public class LocationInference { NTuple higherTuple = iter.next(); addFlowGraphEdge(md, higherTuple, interTuple); } + + FlowGraph fg = getFlowGraph(md); + fg.addMapInterLocNodeToEnclosingDescriptor(interTuple.get(0), + getClassTypeDescriptor(base.get(base.size() - 1))); + nodeSet.clear(); flowFieldTuple = interTuple; } - nodeSet.addGlobalFlowTupleSet(idxNodeTupleSet.getGlobalLocTupleSet()); } @@ -5343,10 +6465,10 @@ public class LocationInference { 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) { @@ -5364,7 +6486,6 @@ public class LocationInference { // creates edges from RHS to LHS NTuple interTuple = null; if (needToGenerateInterLoc(nodeSetRHS)) { - System.out.println("2"); interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple(); } @@ -5391,10 +6512,11 @@ public class LocationInference { NTuple calleeReturnLocTuple = iterator.next(); for (Iterator> iter2 = nodeSetLHS.iterator(); iter2.hasNext();) { NTuple callerLHSTuple = iter2.next(); + // System.out.println("$$$ GLOBAL FLOW ADD=" + calleeReturnLocTuple + " -> " + // + translateToLocTuple(md, callerLHSTuple)); + globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple, translateToLocTuple(md, callerLHSTuple)); - System.out.println("$$$ GLOBAL FLOW ADD=" + calleeReturnLocTuple + " -> " - + translateToLocTuple(md, callerLHSTuple)); } } @@ -5403,10 +6525,11 @@ public class LocationInference { NTuple calleeReturnLocTuple = iterator.next(); for (Iterator> iter2 = nodeSetLHS.iterator(); iter2.hasNext();) { NTuple 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)); } } @@ -5435,8 +6558,8 @@ public class LocationInference { NTuple 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)); } } @@ -5473,26 +6596,28 @@ public class LocationInference { } - public void writeInferredLatticeDotFile(ClassDescriptor cd, HierarchyGraph simpleHierarchyGraph, - SSJavaLattice 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 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 locOrder, String nameSuffix) { + SSJavaLattice 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> pairSet = locOrder.getOrderingPairSet(); Set addedLocSet = new HashSet(); @@ -5511,12 +6636,12 @@ public class LocationInference { 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"); @@ -5545,8 +6670,12 @@ public class LocationInference { return str; } - private void drawNode(BufferedWriter bw, SSJavaLattice lattice, HierarchyGraph graph, - String locName) throws IOException { + public void addNaiveLattice(Descriptor desc, SSJavaLattice lattice) { + desc2naiveLattice.put(desc, lattice); + } + + private void drawNode(BufferedWriter bw, SSJavaLattice lattice, String locName) + throws IOException { String prettyStr; if (lattice.isSharedLoc(locName)) {