X-Git-Url: http://plrg.eecs.uci.edu/git/?p=IRC.git;a=blobdiff_plain;f=Robust%2Fsrc%2FAnalysis%2FSSJava%2FLocationInference.java;h=b15742f55874221a52703f4ddf5653a6cb7b39fa;hp=18f1d3ed5b8580cb78a9122664b716f3a5a71352;hb=99040b5e3460f3e28210e6b672bc8b46545a775e;hpb=ddac34bb8ed87db61d32630e714e7f006a077c8e diff --git a/Robust/src/Analysis/SSJava/LocationInference.java b/Robust/src/Analysis/SSJava/LocationInference.java index 18f1d3ed..b15742f5 100644 --- a/Robust/src/Analysis/SSJava/LocationInference.java +++ b/Robust/src/Analysis/SSJava/LocationInference.java @@ -77,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; @@ -135,14 +138,14 @@ public class LocationInference { private Map> mapHighestOverriddenMethodDescToMethodDescSet; - private Map>> mapHighestOverriddenMethodDescToSetHigherThanRLoc; - private Map> mapHighestOverriddenMethodDescToReturnLocTuple; private Map> mapHighestOverriddenMethodDescToPCLocTuple; private Map>> mapHighestOverriddenMethodDescToSetLowerThanPCLoc; + private Map>> mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc; + public static final String GLOBALLOC = "GLOBALLOC"; public static final String INTERLOC = "INTERLOC"; @@ -181,6 +184,9 @@ public class LocationInference { 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; @@ -191,6 +197,8 @@ public class LocationInference { this.mapMethodDescriptorToFlowGraph = new HashMap(); this.cd2lattice = new HashMap>(); this.md2lattice = new HashMap>(); + this.desc2naiveLattice = new HashMap>(); + this.methodDescriptorsToVisitStack = new Stack(); this.mapMethodDescriptorToMethodInvokeNodeSet = new HashMap>(); @@ -233,9 +241,6 @@ public class LocationInference { mapMethodDescToHighestOverriddenMethodDesc = new HashMap(); - mapHighestOverriddenMethodDescToSetHigherThanRLoc = - new HashMap>>(); - mapHighestOverriddenMethodDescToSetLowerThanPCLoc = new HashMap>>(); @@ -248,6 +253,9 @@ public class LocationInference { mapHighestOverriddenMethodDescToPCLocTuple = new HashMap>(); + mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc = + new HashMap>>(); + this.buildLattice = new BuildLattice(this); } @@ -358,6 +366,11 @@ public class LocationInference { // + 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); } @@ -369,6 +382,7 @@ public class LocationInference { } private void updateFlowGraphPCReturnLocInheritance() { + Set keySet = mapHighestOverriddenMethodDescToMethodDescSet.keySet(); for (Iterator iterator = keySet.iterator(); iterator.hasNext();) { MethodDescriptor highestMethodDesc = (MethodDescriptor) iterator.next(); @@ -380,74 +394,91 @@ public class LocationInference { Set methodDescSet = mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc); - NTuple highestPCLoc = + NTuple highestPCLocDescTuple = mapHighestOverriddenMethodDescToPCLocTuple.get(highestMethodDesc); - NTuple highestRETURNLoc = + NTuple highestRETURNLocDescTuple = mapHighestOverriddenMethodDescToReturnLocTuple.get(highestMethodDesc); - System.out.println("---highestMethodDesc=" + 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(); - - // update PCLOC - if (highestPCLoc != null) { - // handle the case that PCLOC is started with 'this'... - NTuple newPCLoc = new NTuple(); - if (highestPCLoc.size() == 1) { - newPCLoc.add(highestPCLoc.get(0)); - } else { - newPCLoc.add(md.getThis()); - newPCLoc.add(highestPCLoc.get(1)); + 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); } - - FlowNode pcFlowNode = flowGraph.getFlowNode(translateToDescTuple(curPCLoc.getTuple())); - pcFlowNode.setBaseTuple(newPCLoc); - - CompositeLocation newPCLocCompLoc = - new CompositeLocation(translateToLocTuple(md, newPCLoc)); - summary.setPCLoc(newPCLocCompLoc); + summary.setPCLoc(new CompositeLocation(new Location(md, Location.TOP))); } else { - // need to remove PCLOC if the overridden method defines it - if (curPCLoc != null && !curPCLoc.get(0).isTop()) { - System.out.println("md=" + md + " curPCLoc=" + curPCLoc); - FlowNode pcFlowNode = flowGraph.getFlowNode(translateToDescTuple(curPCLoc.getTuple())); - System.out.println("#######REMOVE PCLOCNODE=" + pcFlowNode); - flowGraph.removeNode(pcFlowNode); + 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); } - } - // need to update RETURNLOC - if (highestRETURNLoc != null) { + } + // update return loc + if (highestRETURNLocDescTuple != null) { CompositeLocation curRETURNLoc = summary.getRETURNLoc(); - System.out.println("curRETURNLoc=" + curRETURNLoc); + NTuple curReturnDescTuple = translateToDescTuple(curRETURNLoc.getTuple()); - // handle the case that RETURNLOC is started with 'this'... - NTuple newRETURNLoc = new NTuple(); - if (highestRETURNLoc.size() == 1) { - newRETURNLoc.add(highestRETURNLoc.get(0)); - } else { - newRETURNLoc.add(md.getThis()); - newRETURNLoc.add(highestRETURNLoc.get(1)); - } + 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(translateToDescTuple(curRETURNLoc.getTuple())); - returnFlowNode.setBaseTuple(newRETURNLoc); + FlowNode returnFlowNode = flowGraph.getFlowNode(curReturnDescTuple); + flowGraph.updateTuple(returnFlowNode, newRETURNLocDescTuple); - CompositeLocation newRETURNLocCompLoc = - new CompositeLocation(translateToLocTuple(md, newRETURNLoc)); - summary.setPCLoc(newRETURNLocCompLoc); - System.out.println("md=" + md + "###newRETURNLocCompLoc=" + newRETURNLocCompLoc); + 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); + } } - } } } @@ -455,6 +486,10 @@ public class LocationInference { private void calculateHighestPCLocInheritance() { Set keySet = mapHighestOverriddenMethodDescToMethodDescSet.keySet(); + + Map mapMethodDescToParamCount = + new HashMap(); + next: for (Iterator iterator = keySet.iterator(); iterator.hasNext();) { MethodDescriptor highestMethodDesc = (MethodDescriptor) iterator.next(); @@ -465,6 +500,13 @@ public class LocationInference { 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(); @@ -473,69 +515,100 @@ public class LocationInference { continue; } Set paramNodeSet = flowGraph.getParamFlowNodeSet(); - System.out.println("###md=" + md + " paramNodeSet=" + paramNodeSet); + // 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()) { - if (pcLOC.getSize() == 1) { - // return location is not started with 'this' - // check whether the return location is lower than all parameters. - - 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++; - System.out.println("-------" + pcFlowNode + " -> " + paramNode); - } - } - int offset = 0; - if (!md.isStatic()) { - offset = 1; - } + FlowNode pcFlowNode = flowGraph.getFlowNode(translateToDescTuple(pcLOC.getTuple())); - NTuple rTuple = new NTuple(); - rTuple.add(pcLOC.get(0).getLocDescriptor()); - if (count == (md.numParameters() + offset)) { - // means return loc is lower than a composite location starting with 'this' - mapHighestOverriddenMethodDescToPCLocTuple.put(highestMethodDesc, rTuple); - } else { - if (tempTuple == null) { - tempTuple = rTuple; - } - } - } else { - // if the current overridden method has a composite pc loc(size>1) - // and it has not yet finalized the pc location, - // the highest overridden method would have the composite pc location starting with - // 'this' - NTuple rTuple = new NTuple(); - for (int i = 0; i < pcLOC.getSize(); i++) { - rTuple.add(pcLOC.get(i).getLocDescriptor()); + 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++; } - tempTuple = rTuple; } + 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)); + // 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); + } - if (!mapHighestOverriddenMethodDescToPCLocTuple.containsKey(highestMethodDesc) - && tempTuple != null) { - mapHighestOverriddenMethodDescToPCLocTuple.put(highestMethodDesc, tempTuple); } - System.out.println("highest=" + highestMethodDesc + " HIGHEST PCLOC=" - + mapHighestOverriddenMethodDescToPCLocTuple.get(highestMethodDesc)); + + // System.out.println("####################################"); + // System.out.println(" highest=" + highestMethodDesc + " HIGHEST PCLOC=" + // + mapHighestOverriddenMethodDescToPCLocTuple.get(highestMethodDesc)); + // System.out.println(" setLowerThanPCLoc=" + // + mapHighestOverriddenMethodDescToSetLowerThanPCLoc.get(highestMethodDesc)); } } @@ -543,76 +616,84 @@ public class LocationInference { private void calculateLowestReturnLocInheritance() { Set keySet = mapHighestOverriddenMethodDescToMethodDescSet.keySet(); - for (Iterator iterator = keySet.iterator(); iterator.hasNext();) { - MethodDescriptor highestMethodDesc = (MethodDescriptor) iterator.next(); - NTuple tempTuple = null; + Map mapMethodDescToParamCount = + new HashMap(); - if (getMethodSummary(highestMethodDesc).getRETURNLoc() != null) { - Set methodDescSet = - mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc); - for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) { - MethodDescriptor md = (MethodDescriptor) iterator2.next(); + next: for (Iterator iterator = keySet.iterator(); iterator.hasNext();) { + MethodDescriptor highestMethodDesc = (MethodDescriptor) iterator.next(); - FlowGraph flowGraph = getFlowGraph(md); - Set paramNodeSet = flowGraph.getParamFlowNodeSet(); - System.out.println("###md=" + md + " paramNodeSet=" + paramNodeSet); + Set methodDescSet = + mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc); - CompositeLocation returnLoc = getMethodSummary(md).getRETURNLoc(); - if (returnLoc.getSize() == 1) { - // return location is not started with 'this' - // check whether the return location is lower than all parameters. + if (methodDescSet.size() > 1 && getMethodSummary(highestMethodDesc).getRETURNLoc() != null) { + } else { + continue next; + } - FlowNode returnFlowNode = - flowGraph.getFlowNode(translateToDescTuple(returnLoc.getTuple())); + for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) { + MethodDescriptor md = (MethodDescriptor) iterator2.next(); - 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++; - System.out.println("-------" + paramNode + " -> " + returnFlowNode); - } - } + FlowGraph flowGraph = getFlowGraph(md); + Set paramNodeSet = flowGraph.getParamFlowNodeSet(); - int offset = 0; - if (!md.isStatic()) { - offset = 1; - } + CompositeLocation returnLoc = getMethodSummary(md).getRETURNLoc(); - NTuple rTuple = new NTuple(); - rTuple.add(returnLoc.get(0).getLocDescriptor()); - if (count == (md.numParameters() + offset)) { - // means return loc is lower than a composite location starting with 'this' - mapHighestOverriddenMethodDescToReturnLocTuple.put(highestMethodDesc, rTuple); - } else { - if (tempTuple == null) { - tempTuple = rTuple; - } - } - } else { - // if the current overridden method has a composite return loc(size>1) - // and it has not yet finalized the return location - // the highest overridden method has the composite return location starting with - // 'this' - NTuple rTuple = new NTuple(); - for (int i = 0; i < returnLoc.getSize(); i++) { - rTuple.add(returnLoc.get(i).getLocDescriptor()); - } - tempTuple = rTuple; - } + 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 (!mapHighestOverriddenMethodDescToReturnLocTuple.containsKey(highestMethodDesc) - && tempTuple != null) { - mapHighestOverriddenMethodDescToReturnLocTuple.put(highestMethodDesc, tempTuple); + 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("highest=" + highestMethodDesc + " rTuple=" - + mapHighestOverriddenMethodDescToReturnLocTuple.get(highestMethodDesc)); + + // System.out.println("####################################"); + // System.out.println(" highest=" + highestMethodDesc + " LOWEST RETURNLOC=" + // + mapHighestOverriddenMethodDescToReturnLocTuple.get(highestMethodDesc)); + // System.out.println(" setHigherThanReturnLoc=" + // + mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc.get(highestMethodDesc)); + } } @@ -645,10 +726,6 @@ public class LocationInference { } - private void addTupleLowerThanPCLoc(NTuple tuple) { - - } - private MethodDescriptor getHighestOverriddenMethod(ClassDescriptor curClassDesc, MethodDescriptor curMethodDesc) { @@ -699,6 +776,12 @@ public class LocationInference { 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(); @@ -713,7 +796,6 @@ public class LocationInference { } // copies nodes/edges from the parent class... - Set parentNodeSet = parentGraph.getNodeSet(); for (Iterator iterator2 = parentNodeSet.iterator(); iterator2.hasNext();) { HNode parentHNode = (HNode) iterator2.next(); @@ -745,6 +827,12 @@ public class LocationInference { 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(); @@ -833,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 = @@ -854,7 +950,9 @@ public class LocationInference { for (int i = 0; i < locTuple.size(); i++) { Location loc = locTuple.get(i); if (loc.getDescriptor() instanceof ClassDescriptor) { - toanalyze_classDescSet.add((ClassDescriptor) loc.getDescriptor()); + ClassDescriptor classDesc = (ClassDescriptor) loc.getDescriptor(); + toanalyze_classDescSet.add(classDesc); + addSuperClasses(classDesc); } else if (loc.getDescriptor() instanceof MethodDescriptor) { toanalyze_classDescSet.add(((MethodDescriptor) loc.getDescriptor()).getClassDesc()); } @@ -941,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()) { @@ -988,8 +1086,8 @@ public class LocationInference { HierarchyGraph scGraph = getSimpleHierarchyGraph(enclosingDesc); if (scGraph != null) { HNode curNode = scGraph.getCurrentHNode(nodeIdentifier); - System.out.println("nodeID=" + nodeIdentifier + " curNode=" + curNode - + " enclosingDesc=" + enclosingDesc); + // System.out.println("nodeID=" + nodeIdentifier + " curNode=" + curNode + // + " enclosingDesc=" + enclosingDesc); if (curNode != null) { nodeIdentifier = curNode.getName(); } @@ -1046,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 @@ -1115,18 +1173,18 @@ 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); + // 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 = @@ -1136,7 +1194,7 @@ public class LocationInference { // then need to remove old constraints // TODO SAT - System.out.println("###REMOVE OLD CONSTRAINTS=" + holderNode); + // System.out.println("###REMOVE OLD CONSTRAINTS=" + holderNode); for (Iterator> iter = holderTupleSet.iterator(); iter.hasNext();) { NTuple tupleFromHolder = iter.next(); Set holderOutEdge = callerFlowGraph.getOutEdgeSet(holderNode); @@ -1205,63 +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(); @@ -1274,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); } } } @@ -1282,8 +1283,8 @@ 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(); @@ -1425,8 +1426,8 @@ public class LocationInference { } } - 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(); @@ -1438,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); @@ -1452,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)) { @@ -1463,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); @@ -1476,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++) { @@ -1505,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 = @@ -1518,8 +1520,8 @@ public class LocationInference { } } - System.out.println("-----------------calleeParamFlowNode=" - + calleeParamFlowNode.getCompositeLocation()); + // System.out.println("-----------------calleeParamFlowNode=" + // + calleeParamFlowNode.getCompositeLocation()); // } @@ -1533,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()); @@ -1594,16 +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("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++) { @@ -1634,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(); } } @@ -1706,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();) { @@ -1754,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; @@ -1763,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); // } @@ -1819,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++)); @@ -1847,7 +1851,7 @@ 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); @@ -1870,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(); @@ -1893,7 +1897,7 @@ 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 = @@ -1908,7 +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("PREFIX FOUND=" + subGlobalReachalbeNode); return true; } } @@ -1919,7 +1923,7 @@ public class LocationInference { 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); + // System.out.println("$$$md=" + md + " minSet=" + minSet); if (minSet == null) { return false; } @@ -1940,15 +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("ARG " + argTuple + " IS MATCHED WITH=" + // + lastLocationOfPrefix); return true; } } @@ -1992,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)); @@ -2042,8 +2046,8 @@ public class LocationInference { private CompositeLocation calculateCompositeLocationFromFlowGraph(MethodDescriptor md, FlowNode node) { - System.out.println("#############################################################"); - System.out.println("calculateCompositeLocationFromFlowGraph=" + node); + // System.out.println("#############################################################"); + // System.out.println("calculateCompositeLocationFromFlowGraph=" + node); FlowGraph flowGraph = getFlowGraph(md); // NTuple paramLocTuple = translateToLocTuple(md, paramNode.getDescTuple()); @@ -2085,8 +2089,9 @@ public class LocationInference { // Location targetLocalLoc = paramGlobalNode.getLocTuple().get(0); CompositeLocation newCompLoc = generateCompositeLocation(curPrefix); - System.out.println("NEED2ASSIGN COMP LOC TO " + node + " with prefix=" + curPrefix); - System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc=" + newCompLoc); + // System.out.println("NEED2ASSIGN COMP LOC TO " + node + " with prefix=" + curPrefix); + // System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc=" + + // newCompLoc); node.setCompositeLocation(newCompLoc); @@ -2100,7 +2105,7 @@ public class LocationInference { private List> calculatePrefixListFlowGraph(FlowGraph graph, FlowNode node) { - System.out.println("\n##### calculatePrefixList node=" + node); + // System.out.println("\n##### calculatePrefixList node=" + node); MethodDescriptor md = graph.getMethodDescriptor(); Set incomingNodeSetPrefix = @@ -2148,20 +2153,6 @@ public class LocationInference { } - 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; - } - } - } - return false; - } - private GlobalFlowGraph constructSubGlobalFlowGraph(FlowGraph flowGraph) { MethodDescriptor md = flowGraph.getMethodDescriptor(); @@ -2252,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();) { @@ -2267,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); } } @@ -2283,17 +2274,17 @@ 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(); @@ -2313,11 +2304,11 @@ public class LocationInference { GlobalFlowGraph calleeSubGlobalGraph = getSubGlobalFlowGraph(mdCallee); GlobalFlowGraph callerSubGlobalGraph = getSubGlobalFlowGraph(mdCaller); - System.out.println("$addValueFlowFromCalleeNode calleeSrcNode=" + calleeSrcNode); + // System.out.println("$addValueFlowFromCalleeNode calleeSrcNode=" + calleeSrcNode); NTuple callerSrcNodeLocTuple = translateToCallerLocTuple(min, mdCallee, mdCaller, calleeSrcNode.getLocTuple()); - System.out.println("---callerSrcNodeLocTuple=" + callerSrcNodeLocTuple); + // System.out.println("---callerSrcNodeLocTuple=" + callerSrcNodeLocTuple); if (callerSrcNodeLocTuple != null && callerSrcNodeLocTuple.size() > 0) { @@ -2438,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()); } @@ -2459,8 +2453,8 @@ public class LocationInference { FlowNode flowNode = flowGraph.getParamFlowNode(paramIdx); CompositeLocation inferredCompLoc = updateCompositeLocation(flowNode.getCompositeLocation()); - 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); @@ -2494,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; @@ -2536,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; @@ -2553,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(); @@ -2587,50 +2556,78 @@ 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(); - System.out.println("########cd=" + cd); - 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(Descriptor desc) { - System.out.println("buildLattice=" + desc); + // System.out.println("buildLattice=" + desc); SSJavaLattice simpleLattice = buildLattice.buildLattice(desc); addMapDescToSimpleLattice(desc, simpleLattice); + if (desc instanceof ClassDescriptor) { + writeInferredLatticeDotFile((ClassDescriptor) desc, null, simpleLattice, "_SC"); + } else { + MethodDescriptor md = (MethodDescriptor) desc; + writeInferredLatticeDotFile(md.getClassDesc(), md, simpleLattice, "_SC"); + } + HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(desc); - System.out.println("\n## insertIntermediateNodesToStraightLine:" - + simpleHierarchyGraph.getName()); + + // System.out.println("\n## insertIntermediateNodesToStraightLine:" + // + simpleHierarchyGraph.getName()); SSJavaLattice lattice = buildLattice.insertIntermediateNodesToStraightLine(desc, simpleLattice); + + if (lattice == null) { + return; + } lattice.removeRedundantEdges(); + LocationInference.numLocationsSInfer += lattice.getKeySet().size(); + if (desc instanceof ClassDescriptor) { // field lattice cd2lattice.put((ClassDescriptor) desc, lattice); @@ -2645,6 +2642,7 @@ public class LocationInference { } + // deprecated: it builds method/class lattices without considering class inheritance private void buildLattice() { Set keySet = mapDescriptorToCombineSkeletonHierarchyGraph.keySet(); @@ -2662,6 +2660,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); @@ -2686,7 +2686,6 @@ public class LocationInference { public Set getDirectSubClasses(ClassDescriptor parent) { - System.out.println("$$$toanalyze_classDescSet=" + toanalyze_classDescSet); Set result = new HashSet(); Set children = tu.getDirectSubClasses(parent); @@ -2721,20 +2720,31 @@ public class LocationInference { MethodDescriptor parentMethodDesc = getParentMethodDesc(md.getClassDesc(), md); if (parentMethodDesc != null) { Map parentMap = buildLattice.getIntermediateLocMap(parentMethodDesc); - buildLattice.setIntermediateLocMap(md, parentMap); + 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 = getDirectSubClasses(cd); - for (Iterator iterator = children.iterator(); iterator.hasNext();) { - ClassDescriptor classDescriptor = (ClassDescriptor) iterator.next(); - if (toanalyze_classDescSet.contains(classDescriptor)) { - DFSBuildLatticeInheritanceTree(classDescriptor); + 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); + } + } } - } } @@ -2787,13 +2797,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(); @@ -2900,7 +3021,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); } @@ -3001,7 +3122,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); } @@ -3042,12 +3163,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); @@ -3090,7 +3211,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); @@ -3105,7 +3226,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; } } @@ -3129,8 +3250,8 @@ public class LocationInference { } // ////////////////////////// - System.out.println("-srcCurTuple=" + srcCurTuple + " dstCurTuple=" + dstCurTuple - + " srcNode=" + srcNode + " dstNode=" + dstNode); + // System.out.println("-srcCurTuple=" + srcCurTuple + " dstCurTuple=" + dstCurTuple + // + " srcNode=" + srcNode + " dstNode=" + dstNode); // srcCurTuple = translateBaseTuple(srcNode, srcCurTuple); // dstCurTuple = translateBaseTuple(dstNode, dstCurTuple); @@ -3215,7 +3336,7 @@ public class LocationInference { translatedTuple.add(inTuple.get(i)); } - System.out.println("------TRANSLATED " + inTuple + " -> " + translatedTuple); + // System.out.println("------TRANSLATED " + inTuple + " -> " + translatedTuple); return translatedTuple; } else { @@ -3308,6 +3429,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(); @@ -3354,7 +3478,7 @@ public class LocationInference { } 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); @@ -3454,6 +3578,7 @@ public class LocationInference { } SSJavaLattice methodLattice = md2lattice.get(md); + // System.out.println("md=" + md + " methodLattice=" + methodLattice); if (methodLattice != null) { int methodDefLine = md.getLineNum(); @@ -3466,8 +3591,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(); @@ -3475,7 +3600,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(); @@ -3489,12 +3614,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); + // 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 + " " @@ -3507,8 +3632,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 = @@ -3670,7 +3795,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()) { @@ -3678,7 +3803,7 @@ public class LocationInference { SSJavaLattice methodLattice = md2lattice.get(md); if (methodLattice != null) { ssjava.writeLatticeDotFile(cd, md, methodLattice); - debug_printDescriptorToLocNameMapping(md); + // debug_printDescriptorToLocNameMapping(md); } } } @@ -3698,7 +3823,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)) { @@ -3803,7 +3930,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(); @@ -3846,7 +3973,7 @@ public class LocationInference { } } - System.out.println("paramLocTupleHavingInFlowSet=" + paramLocTupleHavingInFlowSet); + // System.out.println("paramLocTupleHavingInFlowSet=" + paramLocTupleHavingInFlowSet); if (paramLocTupleHavingInFlowSet.size() > 0 && !coversAllParamters(md, fg, paramLocTupleHavingInFlowSet)) { @@ -3880,14 +4007,13 @@ public class LocationInference { 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.getDescTuple().size() == 1 && lowerNode.getCompositeLocation() == null) { @@ -3898,7 +4024,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); } } @@ -3930,7 +4056,7 @@ public class LocationInference { // int size = paramLocTupleHavingInFlowSet.size(); int size = countFirstDescriptorSetSize(paramLocTupleHavingInFlowSet); - System.out.println("numParam=" + numParam + " size=" + size); + // System.out.println("numParam=" + numParam + " size=" + size); // if (!md.isStatic()) { // @@ -3966,7 +4092,7 @@ 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 @@ -4001,8 +4127,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 @@ -4106,7 +4232,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()); } @@ -4117,7 +4243,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; @@ -4304,7 +4430,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 @@ -4374,17 +4500,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); @@ -4403,7 +4529,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; } } @@ -4430,7 +4556,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++) { @@ -4466,7 +4592,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); @@ -4720,14 +4846,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); } @@ -4826,23 +4952,31 @@ public class LocationInference { // hack... it seems that there is a problem with topological sorting. // so String.toString(Object o) is appeared too higher in the call chain. - MethodDescriptor mdToString = null; + MethodDescriptor mdToString1 = null; + MethodDescriptor mdToString2 = null; for (Iterator iterator = toanalyze_methodDescList.iterator(); iterator.hasNext();) { MethodDescriptor md = (MethodDescriptor) iterator.next(); if (md.toString().equals("public static String String.valueOf(Object o)")) { - mdToString = md; - break; + mdToString1 = md; + } + if (md.toString().equals("public String Object.toString()")) { + mdToString2 = md; } } - if (mdToString != null) { - toanalyze_methodDescList.remove(mdToString); - toanalyze_methodDescList.addLast(mdToString); + + 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()) { @@ -4898,7 +5032,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"); @@ -4919,7 +5053,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); @@ -5053,7 +5187,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();) { @@ -5120,7 +5253,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();) { @@ -5160,7 +5292,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; @@ -5187,7 +5319,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 @@ -5248,7 +5379,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 @@ -5312,7 +5442,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(); @@ -5355,7 +5484,7 @@ public class LocationInference { fn.setDeclarationNode(); if (dn.getExpression() != null) { - System.out.println("-analyzeFlowDeclarationNode=" + dn.printNode(0)); + // System.out.println("-analyzeFlowDeclarationNode=" + dn.printNode(0)); NodeTupleSet nodeSetRHS = new NodeTupleSet(); analyzeFlowExpressionNode(md, nametable, dn.getExpression(), nodeSetRHS, null, @@ -5364,14 +5493,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); } @@ -5395,8 +5523,8 @@ public class LocationInference { globalFlowGraph.addValueFlowEdge(implicitGlobalTuple, translateToLocTuple(md, tupleLHS)); } - System.out.println("-nodeSetRHS=" + nodeSetRHS); - System.out.println("-implicitFlowTupleSet=" + implicitFlowTupleSet); + // System.out.println("-nodeSetRHS=" + nodeSetRHS); + // System.out.println("-implicitFlowTupleSet=" + implicitFlowTupleSet); } @@ -5452,7 +5580,7 @@ public class LocationInference { break; case Kind.CreateObjectNode: - analyzeCreateObjectNode(md, nametable, (CreateObjectNode) en); + analyzeCreateObjectNode(md, nametable, (CreateObjectNode) en, nodeSet, implicitFlowTupleSet); break; case Kind.ArrayAccessNode: @@ -5525,7 +5653,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();) { @@ -5538,7 +5665,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, @@ -5550,7 +5678,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, @@ -5590,7 +5718,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; @@ -5627,10 +5755,10 @@ public class LocationInference { addMapCallerMethodDescToMethodInvokeNodeSet(mdCaller, min); FlowGraph calleeFlowGraph = getFlowGraph(mdCallee); - System.out.println("mdCallee=" + mdCallee + " calleeFlowGraph=" + calleeFlowGraph); + // 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(); @@ -5639,7 +5767,7 @@ public class LocationInference { NodeTupleSet baseNodeSet = new NodeTupleSet(); analyzeFlowExpressionNode(mdCaller, nametable, min.getExpression(), baseNodeSet, null, implicitFlowTupleSet, false); - System.out.println("baseNodeSet=" + baseNodeSet); + // System.out.println("baseNodeSet=" + baseNodeSet); assert (baseNodeSet.size() == 1); NTuple baseTuple = baseNodeSet.iterator().next(); @@ -5671,21 +5799,21 @@ public class LocationInference { inFlowTuple.addAll(returnDescTuple.subList(1, returnDescTuple.size())); // nodeSet.addTuple(inFlowTuple); - System.out.println("1CREATE A NEW TUPLE=" + inFlowTuple + " from=" - + mdCallee.getThis()); + // System.out.println("1CREATE A NEW TUPLE=" + inFlowTuple + " from=" + // + mdCallee.getThis()); // tupleSet.addTuple(inFlowTuple); tupleSet.addTuple(baseTuple); } else { // TODO - System.out.println("returnNode=" + returnNode); + // System.out.println("returnNode=" + returnNode); Set inFlowSet = calleeFlowGraph.getIncomingFlowNodeSet(returnNode); // System.out.println("inFlowSet=" + inFlowSet + " from retrunNode=" + returnNode); for (Iterator iterator2 = inFlowSet.iterator(); iterator2.hasNext();) { FlowNode inFlowNode = (FlowNode) iterator2.next(); if (inFlowNode.getDescTuple().startsWith(mdCallee.getThis())) { // nodeSet.addTupleSet(baseNodeSet); - System.out.println("2CREATE A NEW TUPLE=" + baseNodeSet + " from=" - + mdCallee.getThis()); + // System.out.println("2CREATE A NEW TUPLE=" + baseNodeSet + " from=" + // + mdCallee.getThis()); tupleSet.addTupleSet(baseNodeSet); } } @@ -5711,7 +5839,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("---arg idx=" + idx + " argTupleSet=" + argTupleSet); + // System.out.println("---arg idx=" + idx + " argTupleSet=" + argTupleSet); NTuple argTuple = generateArgTuple(mdCaller, argTupleSet); // if an argument is literal value, @@ -5747,12 +5875,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); + // System.out.println("3CREATE A NEW TUPLE=" + argTupleSet + " from=" + paramNode); tupleSet.addTupleSet(argTupleSet); } } @@ -5763,7 +5891,6 @@ public class LocationInference { FlowReturnNode returnHolderNode = getFlowGraph(mdCaller).createReturnNode(min); if (needToGenerateInterLoc(tupleSet)) { - System.out.println("20"); FlowGraph fg = getFlowGraph(mdCaller); FlowNode interNode = fg.createIntermediateNode(); interNode.setFormHolder(true); @@ -5789,11 +5916,12 @@ public class LocationInference { returnHolderNode.addTuple(interTuple); nodeSet.addTuple(interTuple); - System.out.println("ADD TUPLESET=" + interTuple + " to returnnode=" + returnHolderNode); + // System.out.println("ADD TUPLESET=" + interTuple + " to returnnode=" + + // returnHolderNode); } else { returnHolderNode.addTupleSet(tupleSet); - System.out.println("ADD TUPLESET=" + tupleSet + " to returnnode=" + returnHolderNode); + // System.out.println("ADD TUPLESET=" + tupleSet + " to returnnode=" + returnHolderNode); } // setNode.addTupleSet(tupleSet); // NodeTupleSet setFromReturnNode=new NodeTupleSet(); @@ -5802,7 +5930,7 @@ public class LocationInference { NodeTupleSet holderTupleSet = getNodeTupleSetFromReturnNode(getFlowGraph(mdCaller), returnHolderNode); - System.out.println("HOLDER TUPLe SET=" + holderTupleSet); + // System.out.println("HOLDER TUPLE SET=" + holderTupleSet); nodeSet.addTupleSet(holderTupleSet); nodeSet.addTuple(returnHolderNode.getDescTuple()); @@ -5817,7 +5945,7 @@ public class LocationInference { FlowNode calleeReturnNode = (FlowNode) iterator.next(); NTuple calleeReturnLocTuple = translateToLocTuple(mdCallee, calleeReturnNode.getDescTuple()); - System.out.println("calleeReturnLocTuple=" + calleeReturnLocTuple); + // System.out.println("calleeReturnLocTuple=" + calleeReturnLocTuple); NTuple transaltedToCaller = translateToCallerLocTuple(min, mdCallee, mdCaller, calleeReturnLocTuple); // System.out.println("translateToCallerLocTuple=" @@ -5828,7 +5956,7 @@ public class LocationInference { } } - System.out.println("min nodeSet=" + nodeSet); + // System.out.println("min nodeSet=" + nodeSet); } @@ -5896,7 +6024,6 @@ public class LocationInference { } if (argTupleSetNonLiteral.size() > 1) { - System.out.println("11"); NTuple interTuple = getFlowGraph(mdCaller).createIntermediateNode().getDescTuple(); @@ -5959,14 +6086,14 @@ public class LocationInference { private void analyzeFlowArrayAccessNode(MethodDescriptor md, SymbolTable nametable, ArrayAccessNode aan, NodeTupleSet nodeSet, boolean isLHS) { - System.out.println("analyzeFlowArrayAccessNode aan=" + aan.printNode(0)); + // System.out.println("analyzeFlowArrayAccessNode aan=" + aan.printNode(0)); String currentArrayAccessNodeExpStr = aan.printNode(0); arrayAccessNodeStack.push(aan.printNode(0)); NodeTupleSet expNodeTupleSet = new NodeTupleSet(); NTuple base = analyzeFlowExpressionNode(md, nametable, aan.getExpression(), expNodeTupleSet, isLHS); - System.out.println("-base=" + base); + // System.out.println("-base=" + base); nodeSet.setMethodInvokeBaseDescTuple(base); NodeTupleSet idxNodeTupleSet = new NodeTupleSet(); @@ -6007,7 +6134,6 @@ public class LocationInference { || !arrayAccessNodeStack.peek().startsWith(currentArrayAccessNodeExpStr)) { if (needToGenerateInterLoc(nodeSetArrayAccessExp)) { - System.out.println("1"); FlowNode interNode = getFlowGraph(md).createIntermediateNode(); NTuple interTuple = interNode.getDescTuple(); @@ -6019,7 +6145,7 @@ public class LocationInference { nodeSetArrayAccessExp.addTuple(interTuple); FlowGraph fg = getFlowGraph(md); - System.out.println("base=" + base); + // System.out.println("base=" + base); if (base != null) { fg.addMapInterLocNodeToEnclosingDescriptor(interTuple.get(0), getClassTypeDescriptor(base.get(base.size() - 1))); @@ -6036,8 +6162,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); } @@ -6047,19 +6183,17 @@ public class LocationInference { NodeTupleSet leftOpSet = new NodeTupleSet(); NodeTupleSet rightOpSet = new NodeTupleSet(); - System.out.println("analyzeFlowOpNode=" + on.printNode(0)); + // System.out.println("analyzeFlowOpNode=" + on.printNode(0)); // left operand analyzeFlowExpressionNode(md, nametable, on.getLeft(), leftOpSet, null, implicitFlowTupleSet, false); - System.out.println("--leftOpSet=" + leftOpSet); if (on.getRight() != null) { // right operand analyzeFlowExpressionNode(md, nametable, on.getRight(), rightOpSet, null, implicitFlowTupleSet, false); } - System.out.println("--rightOpSet=" + rightOpSet); Operation op = on.getOp(); @@ -6279,8 +6413,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()); @@ -6340,10 +6473,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) { @@ -6361,7 +6494,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(); } @@ -6388,8 +6520,8 @@ 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)); + // System.out.println("$$$ GLOBAL FLOW ADD=" + calleeReturnLocTuple + " -> " + // + translateToLocTuple(md, callerLHSTuple)); globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple, translateToLocTuple(md, callerLHSTuple)); @@ -6404,8 +6536,8 @@ public class LocationInference { 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)); } } @@ -6434,8 +6566,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)); } } @@ -6472,15 +6604,15 @@ 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) { @@ -6512,12 +6644,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"); @@ -6546,8 +6678,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)) {