// keep current descriptors to visit in fixed-point interprocedural analysis,
private Stack<MethodDescriptor> methodDescriptorsToVisitStack;
+ // map a descriptor to a naive lattice
+ private Map<Descriptor, SSJavaLattice<String>> desc2naiveLattice;
+
// map a class descriptor to a field lattice
private Map<ClassDescriptor, SSJavaLattice<String>> cd2lattice;
private BuildLattice buildLattice;
+ public static int numLocationsSInfer = 0;
+ public static int numLocationsNaive = 0;
+
public LocationInference(SSJavaAnalysis ssjava, State state, TypeUtil tu) {
this.ssjava = ssjava;
this.state = state;
this.mapMethodDescriptorToFlowGraph = new HashMap<MethodDescriptor, FlowGraph>();
this.cd2lattice = new HashMap<ClassDescriptor, SSJavaLattice<String>>();
this.md2lattice = new HashMap<MethodDescriptor, SSJavaLattice<String>>();
+ this.desc2naiveLattice = new HashMap<Descriptor, SSJavaLattice<String>>();
+
this.methodDescriptorsToVisitStack = new Stack<MethodDescriptor>();
this.mapMethodDescriptorToMethodInvokeNodeSet =
new HashMap<MethodDescriptor, Set<MethodInvokeNode>>();
buildInheritanceTree();
calculateReturnPCLocInheritance();
-// System.exit(0);
-
constructHierarchyGraph();
addInheritanceConstraintsToHierarchyGraph();
// + 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);
}
NTuple<Descriptor> highestRETURNLocDescTuple =
mapHighestOverriddenMethodDescToReturnLocTuple.get(highestMethodDesc);
- System.out.println("---updateFlowGraphPCReturnLocInheritance=" + highestMethodDesc);
- System.out.println("-----highestPCLoc=" + highestPCLocDescTuple);
- System.out.println("-----highestRETURNLoc=" + highestRETURNLocDescTuple);
+ // System.out.println("\n$$$$$$$$$$$$$$$$updateFlowGraphPCReturnLocInheritance="
+ // + highestMethodDesc);
+ // System.out.println("-----highestPCLoc=" + highestPCLocDescTuple);
+ // System.out.println("-----highestRETURNLoc=" + highestRETURNLocDescTuple);
for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) {
MethodDescriptor md = (MethodDescriptor) iterator2.next();
+ // System.out.println("\n --------MD=" + md);
FlowGraph flowGraph = getFlowGraph(md);
MethodSummary summary = getMethodSummary(md);
CompositeLocation curPCLoc = summary.getPCLoc();
NTuple<Descriptor> curPCDescTuple = translateToDescTuple(curPCLoc.getTuple());
- System.out.println("md=" + md + " curPCLoc=" + curPCLoc);
- System.out.println("highestPCLoc=" + highestPCLocDescTuple);
+ // 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");
+ // 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(curPCDescTuple);
flowGraph.updateTuple(pcFlowNode, newPCDescTuple);
// flowGraph.removeNode(pcFlowNode);
- System.out.println("####UPDATE PCLOC=" + newPCDescTuple);
Set<NTuple<Descriptor>> descSetLowerThanPCLoc =
mapHighestOverriddenMethodDescToSetLowerThanPCLoc.get(highestMethodDesc);
- System.out.println("####descSetLowerThanPCLoc=" + descSetLowerThanPCLoc);
for (Iterator iterator3 = descSetLowerThanPCLoc.iterator(); iterator3.hasNext();) {
NTuple<Descriptor> lowerNTuple = (NTuple<Descriptor>) iterator3.next();
flowGraph.addValueFlowEdge(newPCDescTuple, lowerNTuple);
CompositeLocation newPCCompLoc =
new CompositeLocation(translateToLocTuple(md, newPCDescTuple));
summary.setPCLoc(newPCCompLoc);
- } else {
- System.out.println("####DO NOTHING!:)");
}
}
if (highestRETURNLocDescTuple != null) {
CompositeLocation curRETURNLoc = summary.getRETURNLoc();
NTuple<Descriptor> curReturnDescTuple = translateToDescTuple(curRETURNLoc.getTuple());
- System.out.println("curRETURNLoc=" + curRETURNLoc);
if (!curReturnDescTuple.equals(highestRETURNLocDescTuple)) {
// handle the case that RETURNLOC is started with 'this'...
}
FlowNode returnFlowNode = flowGraph.getFlowNode(curReturnDescTuple);
- System.out.println("####UPDATE RETURNLOC=" + newRETURNLocDescTuple);
flowGraph.updateTuple(returnFlowNode, newRETURNLocDescTuple);
Set<NTuple<Descriptor>> descSetHigherThanRETURNLoc =
mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc.get(highestMethodDesc);
- System.out.println("####descSetLowerThanPCLoc=" + descSetHigherThanRETURNLoc);
for (Iterator iterator3 = descSetHigherThanRETURNLoc.iterator(); iterator3.hasNext();) {
NTuple<Descriptor> higherNTuple = (NTuple<Descriptor>) iterator3.next();
flowGraph.addValueFlowEdge(higherNTuple, newRETURNLocDescTuple);
CompositeLocation newRETURNLocCompLoc =
new CompositeLocation(translateToLocTuple(md, newRETURNLocDescTuple));
- summary.setPCLoc(newRETURNLocCompLoc);
- System.out.println("md=" + md + "###newRETURNLocCompLoc=" + newRETURNLocCompLoc);
- } else {
- System.out.println("####DO NOTHING!:)");
+ summary.setRETURNLoc(newRETURNLocCompLoc);
}
}
-
-
-// try {
-// flowGraph.writeGraph("2");
-// } catch (IOException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
}
}
}
mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc);
if (methodDescSet.size() > 1) {
- System.out.println("---method desc set=" + methodDescSet + " from=" + highestMethodDesc);
+ // System.out.println("---method desc set=" + methodDescSet + " from=" +
+ // highestMethodDesc);
} else {
continue next;
}
continue;
}
Set<FlowNode> 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);
+ // System.out.println("---pcLOC=" + pcLOC);
if (md.equals(highestMethodDesc)) {
mapHighestOverriddenMethodDescToPCLocTuple.put(highestMethodDesc,
if (flowGraph.getReachableSetFrom(pcFlowNode.getCurrentDescTuple().subList(0, 1))
.contains(paramNode)) {
count++;
- System.out.println("-------" + pcFlowNode + " -> " + paramNode);
}
}
- System.out.println("$$$ pcLOC=" + pcLOC + " count higher=" + count);
mapMethodDescToParamCount.put(md, count);
} else {
FlowNode flowNode = (FlowNode) iterator3.next();
descTupleSetLowerThanPC.add(flowNode.getCurrentDescTuple());
}
- System.out.println("###TOP CASE");
- System.out.println("descTupleSetLowerThanPC=" + descTupleSetLowerThanPC);
mapHighestOverriddenMethodDescToSetLowerThanPCLoc.put(highestMethodDesc,
descTupleSetLowerThanPC);
}
}
- System.out.println("#INDENTIFY WHICH METHOD...");
// 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;
reachableParamNodeSet.add(flowNode);
}
- System.out.println(flowNode + " is PARAM="
- + flowGraph.isParameter(flowNode.getCurrentDescTuple()));
}
Set<NTuple<Descriptor>> descTupleSetLowerThanPC = new HashSet<NTuple<Descriptor>>();
}
- System.out.println("####################################");
- System.out.println(" highest=" + highestMethodDesc + " HIGHEST PCLOC="
- + mapHighestOverriddenMethodDescToPCLocTuple.get(highestMethodDesc));
- System.out.println(" setLowerThanPCLoc="
- + mapHighestOverriddenMethodDescToSetLowerThanPCLoc.get(highestMethodDesc));
+ // System.out.println("####################################");
+ // System.out.println(" highest=" + highestMethodDesc + " HIGHEST PCLOC="
+ // + mapHighestOverriddenMethodDescToPCLocTuple.get(highestMethodDesc));
+ // System.out.println(" setLowerThanPCLoc="
+ // + mapHighestOverriddenMethodDescToSetLowerThanPCLoc.get(highestMethodDesc));
}
}
Map<MethodDescriptor, Integer> mapMethodDescToParamCount =
new HashMap<MethodDescriptor, Integer>();
- for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+ next: for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
MethodDescriptor highestMethodDesc = (MethodDescriptor) iterator.next();
- NTuple<Descriptor> tempTuple = null;
-
- if (getMethodSummary(highestMethodDesc).getRETURNLoc() != null) {
-
- System.out.println("---calculateLowestReturnLocInheritance=" + highestMethodDesc);
+ Set<MethodDescriptor> methodDescSet =
+ mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc);
- Set<MethodDescriptor> methodDescSet =
- mapHighestOverriddenMethodDescToMethodDescSet.get(highestMethodDesc);
+ if (methodDescSet.size() > 1 && getMethodSummary(highestMethodDesc).getRETURNLoc() != null) {
+ } else {
+ continue next;
+ }
- for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) {
- MethodDescriptor md = (MethodDescriptor) iterator2.next();
+ for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) {
+ MethodDescriptor md = (MethodDescriptor) iterator2.next();
- FlowGraph flowGraph = getFlowGraph(md);
- Set<FlowNode> paramNodeSet = flowGraph.getParamFlowNodeSet();
- System.out.println("###md=" + md + " paramNodeSet=" + paramNodeSet + " returnLoc="
- + getMethodSummary(md).getRETURNLoc());
+ FlowGraph flowGraph = getFlowGraph(md);
+ Set<FlowNode> paramNodeSet = flowGraph.getParamFlowNodeSet();
- CompositeLocation returnLoc = getMethodSummary(md).getRETURNLoc();
+ CompositeLocation returnLoc = getMethodSummary(md).getRETURNLoc();
- FlowNode returnFlowNode =
- flowGraph.getFlowNode(translateToDescTuple(returnLoc.getTuple()));
+ 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++;
- }
+ 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);
}
+ mapMethodDescToParamCount.put(md, count);
+ // System.out.println("###returnLoc=" + returnLoc + " count higher=" + count);
+ }
- System.out.println("#INDENTIFY WHICH METHOD...");
- // 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;
- }
+ // identify which method in the inheritance chain has the highest PCLOC
+ // basically, finds a method that has the highest count or TOP location
+ int highestCount = -1;
+ MethodDescriptor methodDescHighestCount = null;
+ for (Iterator iterator2 = methodDescSet.iterator(); iterator2.hasNext();) {
+ MethodDescriptor methodDesc = (MethodDescriptor) iterator2.next();
+ int curCount = mapMethodDescToParamCount.get(methodDesc).intValue();
+ if (highestCount < curCount) {
+ highestCount = curCount;
+ methodDescHighestCount = methodDesc;
}
+ }
- if (methodDescHighestCount != null) {
- FlowGraph flowGraph = getFlowGraph(methodDescHighestCount);
- CompositeLocation returnLOC = getMethodSummary(methodDescHighestCount).getRETURNLoc();
- NTuple<Descriptor> returnLocTuple = translateToDescTuple(returnLOC.getTuple());
- FlowNode returnFlowNode = flowGraph.getFlowNode(returnLocTuple);
-
- Set<FlowNode> curMethodParamNodeSet = flowGraph.getParamFlowNodeSet();
- Set<NTuple<Descriptor>> descTupleSetHigherThanPC = new HashSet<NTuple<Descriptor>>();
- for (Iterator iterator3 = curMethodParamNodeSet.iterator(); iterator3.hasNext();) {
- FlowNode paramNode = (FlowNode) iterator3.next();
- if (flowGraph.getReachableSetFrom(paramNode.getCurrentDescTuple().subList(0, 1))
- .contains(returnFlowNode)) {
- descTupleSetHigherThanPC.add(paramNode.getCurrentDescTuple());
- }
- }
-
- mapHighestOverriddenMethodDescToReturnLocTuple.put(highestMethodDesc, returnLocTuple);
- mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc.put(highestMethodDesc,
- descTupleSetHigherThanPC);
+ if (methodDescHighestCount != null) {
+ FlowGraph flowGraph = getFlowGraph(methodDescHighestCount);
+ CompositeLocation returnLOC = getMethodSummary(methodDescHighestCount).getRETURNLoc();
+ NTuple<Descriptor> returnLocTuple = translateToDescTuple(returnLOC.getTuple());
+ FlowNode returnFlowNode = flowGraph.getFlowNode(returnLocTuple);
+ Set<FlowNode> curMethodParamNodeSet = flowGraph.getParamFlowNodeSet();
+ Set<NTuple<Descriptor>> descTupleSetHigherThanPC = new HashSet<NTuple<Descriptor>>();
+ for (Iterator iterator3 = curMethodParamNodeSet.iterator(); iterator3.hasNext();) {
+ FlowNode paramNode = (FlowNode) iterator3.next();
+ if (flowGraph.getReachableSetFrom(paramNode.getCurrentDescTuple().subList(0, 1))
+ .contains(returnFlowNode)) {
+ descTupleSetHigherThanPC.add(paramNode.getCurrentDescTuple());
+ }
}
- System.out.println("####################################");
- System.out.println(" highest=" + highestMethodDesc + " LOWEST RETURNLOC="
- + mapHighestOverriddenMethodDescToReturnLocTuple.get(highestMethodDesc));
- System.out.println(" setHigherThanReturnLoc="
- + mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc.get(highestMethodDesc));
+ mapHighestOverriddenMethodDescToReturnLocTuple.put(highestMethodDesc, returnLocTuple);
+ mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc.put(highestMethodDesc,
+ descTupleSetHigherThanPC);
}
+ // System.out.println("####################################");
+ // System.out.println(" highest=" + highestMethodDesc + " LOWEST RETURNLOC="
+ // + mapHighestOverriddenMethodDescToReturnLocTuple.get(highestMethodDesc));
+ // System.out.println(" setHigherThanReturnLoc="
+ // + mapHighestOverriddenMethodDescToSetHigherThanRETURNLoc.get(highestMethodDesc));
+
}
}
}
+ private void addSuperClasses(ClassDescriptor cd) {
+ ClassDescriptor parentClassDesc = cd.getSuperDesc();
+ if (parentClassDesc != null) {
+ toanalyze_classDescSet.add(parentClassDesc);
+ addSuperClasses(parentClassDesc);
+ }
+ }
+
private void updateFlowGraph() {
LinkedList<MethodDescriptor> methodDescList =
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());
}
Set<FlowNode> nodeSet = flowGraph.getNodeSet();
for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
FlowNode node = (FlowNode) iterator.next();
- System.out.println("-node=" + node + " node.getDescTuple=" + node.getDescTuple());
+ // System.out.println("-node=" + node + " node.getDescTuple=" + node.getDescTuple());
if (node.getCompositeLocation() != null) {
CompositeLocation compLoc = node.getCompositeLocation();
CompositeLocation updatedCompLoc = updateCompositeLocation(compLoc);
node.setCompositeLocation(updatedCompLoc);
- System.out.println("---updatedCompLoc1=" + updatedCompLoc);
+ // System.out.println("---updatedCompLoc1=" + updatedCompLoc);
} else {
NTuple<Descriptor> descTuple = node.getDescTuple();
- System.out.println("update desc=" + descTuple);
+ // System.out.println("update desc=" + descTuple);
CompositeLocation compLoc = convertToCompositeLocation(md, descTuple);
compLoc = updateCompositeLocation(compLoc);
node.setCompositeLocation(compLoc);
- System.out.println("---updatedCompLoc2=" + compLoc);
+ // System.out.println("---updatedCompLoc2=" + compLoc);
}
if (node.isDeclaratonNode()) {
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();
}
//
// update return flow nodes in the caller
CompositeLocation returnLoc = getMethodSummary(mdCallee).getRETURNLoc();
- System.out.println("### min=" + min.printNode(0) + " returnLoc=" + returnLoc);
+ // System.out.println("### min=" + min.printNode(0) + " returnLoc=" + returnLoc);
if (returnLoc != null && returnLoc.get(0).getLocDescriptor().equals(mdCallee.getThis())
&& returnLoc.getSize() > 1) {
- System.out.println("###RETURN COMP LOC=" + returnLoc);
+ // System.out.println("###RETURN COMP LOC=" + returnLoc);
NTuple<Location> returnLocTuple = returnLoc.getTuple();
NTuple<Descriptor> baseTuple = mapMethodInvokeNodeToBaseTuple.get(min);
- System.out.println("###basetuple=" + baseTuple);
+ // System.out.println("###basetuple=" + baseTuple);
NTuple<Descriptor> newReturnTuple = baseTuple.clone();
for (int i = 1; i < returnLocTuple.size(); i++) {
newReturnTuple.add(returnLocTuple.get(i).getLocDescriptor());
}
- System.out.println("###NEW RETURN TUPLE FOR CALLER=" + newReturnTuple);
+ // System.out.println("###NEW RETURN TUPLE FOR CALLER=" + newReturnTuple);
FlowReturnNode holderNode = callerFlowGraph.getFlowReturnNode(min);
NodeTupleSet holderTupleSet =
// then need to remove old constraints
// TODO SAT
- System.out.println("###REMOVE OLD CONSTRAINTS=" + holderNode);
+ // System.out.println("###REMOVE OLD CONSTRAINTS=" + holderNode);
for (Iterator<NTuple<Descriptor>> iter = holderTupleSet.iterator(); iter.hasNext();) {
NTuple<Descriptor> tupleFromHolder = iter.next();
Set<FlowEdge> holderOutEdge = callerFlowGraph.getOutEdgeSet(holderNode);
return mapMethodDescToMethodInvokeNodeSet.get(md);
}
- private void addOrderingConstraintFromCompLocParamToArg(MethodDescriptor mdCaller,
- MethodInvokeNode min) {
- System.out.println("-addOrderingConstraintFromCompLocParamToArg=" + min.printNode(0));
-
- GlobalFlowGraph globalGraph = getSubGlobalFlowGraph(ssjava.getMethodContainingSSJavaLoop());
-
- Set<NTuple<Location>> pcLocTupleSet = getPCLocTupleSet(min);
-
- MethodDescriptor mdCallee = min.getMethod();
-
- FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
- for (int idx = 0; idx < calleeFlowGraph.getNumParameters(); idx++) {
- FlowNode paramNode = calleeFlowGraph.getParamFlowNode(idx);
- NTuple<Location> globalParamLocTuple =
- translateToLocTuple(mdCallee, paramNode.getDescTuple());
- translateToLocTuple(mdCallee, paramNode.getDescTuple());
- CompositeLocation compLoc = paramNode.getCompositeLocation();
- System.out.println("---paramNode=" + paramNode + " compLoc=" + compLoc);
- if (compLoc != null) {
- NTuple<Descriptor> argTuple = getNodeTupleByArgIdx(min, idx);
- NTuple<Location> globalArgLocTuple = translateToLocTuple(mdCaller, argTuple);
-
- if (!isLiteralValueLocTuple(globalArgLocTuple)
- && !isLiteralValueLocTuple(globalParamLocTuple)) {
- if (!globalGraph.hasValueFlowEdge(globalArgLocTuple, globalParamLocTuple)) {
- System.out.println("----- add global flow globalArgLocTuple=" + globalArgLocTuple
- + "-> globalParamLocTuple=" + globalParamLocTuple);
- hasChanges = true;
- globalGraph.addValueFlowEdge(globalArgLocTuple, globalParamLocTuple);
- }
- }
-
- for (Iterator iterator = pcLocTupleSet.iterator(); iterator.hasNext();) {
- NTuple<Location> pcLocTuple = (NTuple<Location>) iterator.next();
-
- if (!isLiteralValueLocTuple(pcLocTuple) && !isLiteralValueLocTuple(globalParamLocTuple)) {
- if (!globalGraph.hasValueFlowEdge(pcLocTuple, globalParamLocTuple)) {
- System.out
- .println("----- add global flow PCLOC="
- + pcLocTuple
- + "-> globalParamLocTu!globalArgLocTuple.get(0).getLocDescriptor().equals(LITERALDESC)ple="
- + globalParamLocTuple);
- hasChanges = true;
-
- globalGraph.addValueFlowEdge(pcLocTuple, globalParamLocTuple);
- }
- }
-
- }
- }
- }
- }
-
- private boolean isLiteralValueLocTuple(NTuple<Location> locTuple) {
- return locTuple.get(0).getLocDescriptor().equals(LITERALDESC);
- }
-
public void assignCompositeLocationToFlowGraph(FlowGraph flowGraph, Location loc,
CompositeLocation inferCompLoc) {
Descriptor localDesc = loc.getLocDescriptor();
// need to assign the inferred composite location to this node
CompositeLocation newCompLoc = generateCompositeLocation(node.getDescTuple(), inferCompLoc);
node.setCompositeLocation(newCompLoc);
- System.out.println("SET Node=" + node + " inferCompLoc=" + newCompLoc);
+ // System.out.println("SET Node=" + node + " inferCompLoc=" + newCompLoc);
}
}
}
private CompositeLocation generateCompositeLocation(NTuple<Descriptor> nodeDescTuple,
CompositeLocation inferCompLoc) {
- System.out.println("generateCompositeLocation=" + nodeDescTuple + " with inferCompLoc="
- + inferCompLoc);
+ // System.out.println("generateCompositeLocation=" + nodeDescTuple + " with inferCompLoc="
+ // + inferCompLoc);
MethodDescriptor md = (MethodDescriptor) inferCompLoc.get(0).getDescriptor();
}
}
- System.out.println("#ASSIGN COMP LOC TO CALLEE PARAMS: callee=" + mdCallee + " caller="
- + mdCaller);
+ // System.out.println("#ASSIGN COMP LOC TO CALLEE PARAMS: callee=" + mdCallee + " caller="
+ // + mdCaller);
// If the location of an argument has a composite location
// need to assign a proper composite location to the corresponding callee parameter
Set<Integer> idxSet = mapIdxToArgTuple.keySet();
}
NTuple<Descriptor> argTuple = mapIdxToArgTuple.get(idx);
- System.out.println("-argTuple=" + argTuple + " idx=" + idx);
+ // System.out.println("-argTuple=" + argTuple + " idx=" + idx);
if (argTuple.size() > 0) {
// check if an arg tuple has been already assigned to a composite location
NTuple<Location> argLocTuple = translateToLocTuple(mdCaller, argTuple);
callerCompLoc.addLocation(argLocTuple.get(i));
}
- System.out.println("---callerCompLoc=" + callerCompLoc);
+ // System.out.println("---callerCompLoc=" + callerCompLoc);
// if (baseLocTuple != null && callerCompLoc.getTuple().startsWith(baseLocTuple)) {
translateToLocTuple(mdCallee, calleeParamDescTuple);
int refParamIdx = getParamIdx(callerCompLoc, mapIdxToArgTuple);
- System.out.println("-----paramIdx=" + refParamIdx);
+ // System.out.println("-----paramIdx=" + refParamIdx);
if (refParamIdx == 0 && !mdCallee.isStatic()) {
- System.out.println("-------need to translate callerCompLoc=" + callerCompLoc
- + " with baseTuple=" + baseLocTuple + " calleeParamLocTuple="
- + calleeParamLocTuple);
+ // System.out.println("-------need to translate callerCompLoc=" + callerCompLoc
+ // + " with baseTuple=" + baseLocTuple + " calleeParamLocTuple="
+ // + calleeParamLocTuple);
CompositeLocation newCalleeCompLoc =
translateCompositeLocationToCallee(callerCompLoc, baseLocTuple, mdCallee);
calleeGlobalGraph.addMapLocationToInferCompositeLocation(calleeParamLocTuple.get(0),
newCalleeCompLoc);
- System.out.println("---------key=" + calleeParamLocTuple.get(0) + " callerCompLoc="
- + callerCompLoc + " newCalleeCompLoc=" + newCalleeCompLoc);
+ // System.out.println("---------key=" + calleeParamLocTuple.get(0) + " callerCompLoc="
+ // + callerCompLoc + " newCalleeCompLoc=" + newCalleeCompLoc);
} else if (refParamIdx != -1) {
// the first element of an argument composite location matches with one of paramtere
// composite locations
- System.out.println("-------param match case=");
+ // System.out.println("-------param match case=");
NTuple<Descriptor> argTupleRef = mapIdxToArgTuple.get(refParamIdx);
FlowNode refParamFlowNode = calleeFlowGraph.getParamFlowNode(refParamIdx);
NTuple<Location> refParamLocTuple =
translateToLocTuple(mdCallee, refParamFlowNode.getDescTuple());
- System.out.println("---------refParamLocTuple=" + refParamLocTuple
- + " from argTupleRef=" + argTupleRef);
+ // System.out.println("---------refParamLocTuple=" + refParamLocTuple
+ // + " from argTupleRef=" + argTupleRef);
CompositeLocation newCalleeCompLoc = new CompositeLocation();
for (int i = 0; i < refParamLocTuple.size(); i++) {
newCalleeCompLoc);
calleeParamFlowNode.setCompositeLocation(newCalleeCompLoc);
- System.out.println("-----------key=" + calleeParamLocTuple.get(0) + " callerCompLoc="
- + callerCompLoc + " newCalleeCompLoc=" + newCalleeCompLoc);
+ // System.out.println("-----------key=" + calleeParamLocTuple.get(0) +
+ // " callerCompLoc="
+ // + callerCompLoc + " newCalleeCompLoc=" + newCalleeCompLoc);
} else {
CompositeLocation newCalleeCompLoc =
}
}
- System.out.println("-----------------calleeParamFlowNode="
- + calleeParamFlowNode.getCompositeLocation());
+ // System.out.println("-----------------calleeParamFlowNode="
+ // + calleeParamFlowNode.getCompositeLocation());
// }
private CompositeLocation calculateCompositeLocationFromSubGlobalGraph(MethodDescriptor md,
FlowNode paramNode) {
- System.out.println("#############################################################");
- System.out.println("calculateCompositeLocationFromSubGlobalGraph=" + paramNode);
+ // System.out.println("#############################################################");
+ // System.out.println("calculateCompositeLocationFromSubGlobalGraph=" + paramNode);
GlobalFlowGraph subGlobalFlowGraph = getSubGlobalFlowGraph(md);
NTuple<Location> paramLocTuple = translateToLocTuple(md, paramNode.getDescTuple());
}
if (!needToGenerateCompositeLocation(paramGlobalNode, curPrefix)) {
- System.out.println("NO NEED TO GENERATE COMP LOC to " + paramGlobalNode
- + " with prefix=" + curPrefix);
+ // System.out.println("NO NEED TO GENERATE COMP LOC to " + paramGlobalNode
+ // + " with prefix=" + curPrefix);
return null;
}
Location targetLocalLoc = paramGlobalNode.getLocTuple().get(0);
CompositeLocation newCompLoc = generateCompositeLocation(curPrefix);
- System.out.println("NEED TO ASSIGN COMP LOC TO " + paramGlobalNode + " with prefix="
- + curPrefix);
- System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc=" + newCompLoc);
+ // System.out.println("NEED TO ASSIGN COMP LOC TO " + paramGlobalNode + " with prefix="
+ // + curPrefix);
+ // System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc=" +
+ // newCompLoc);
// makes sure that a newly generated location appears in the hierarchy graph
for (int compIdx = 0; compIdx < newCompLoc.getSize(); compIdx++) {
Integer key = (Integer) iterator.next();
NTuple<Descriptor> argTuple = mapIdxToArgTuple.get(key);
if (argTuple.size() > 0 && translateToDescTuple(compLoc.getTuple()).startsWith(argTuple)) {
- System.out.println("compLoc.getTuple=" + compLoc + " is started with " + argTuple);
+ // System.out.println("compLoc.getTuple=" + compLoc + " is started with " + argTuple);
return key.intValue();
}
}
// Set<GlobalFlowNode> reachNodeSet = globalFlowGraph.getReachableNodeSetFrom(node);
// System.out.println("node=" + node + " prefixList=" + prefixList);
- System.out.println("---prefixList=" + prefixList);
+ // System.out.println("---prefixList=" + prefixList);
nextprefix: for (int i = 0; i < prefixList.size(); i++) {
NTuple<Location> curPrefix = prefixList.get(i);
- System.out.println("---curPrefix=" + curPrefix);
+ // System.out.println("---curPrefix=" + curPrefix);
Set<NTuple<Location>> reachableCommonPrefixSet = new HashSet<NTuple<Location>>();
for (Iterator iterator2 = reachableNodeSet.iterator(); iterator2.hasNext();) {
}
if (!needToGenerateCompositeLocation(node, curPrefix)) {
- System.out.println("NO NEED TO GENERATE COMP LOC to " + node + " with prefix="
- + curPrefix);
+ // System.out.println("NO NEED TO GENERATE COMP LOC to " + node + " with prefix="
+ // + curPrefix);
// System.out.println("prefixList=" + prefixList);
// System.out.println("reachableNodeSet=" + reachableNodeSet);
continue nextprefix;
Location targetLocalLoc = node.getLocTuple().get(0);
CompositeLocation newCompLoc = generateCompositeLocation(curPrefix);
- System.out.println("NEED TO ASSIGN COMP LOC TO " + node + " with prefix=" + curPrefix);
- System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc="
- + newCompLoc);
+ // System.out.println("NEED TO ASSIGN COMP LOC TO " + node + " with prefix=" +
+ // curPrefix);
+ // System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc="
+ // + newCompLoc);
globalFlowGraph.addMapLocationToInferCompositeLocation(targetLocalLoc, newCompLoc);
// }
// in this case, all return nodes in the method returns values coming from a location that
// starts with "this"
- System.out.println("$$$SET RETURN LOC TRUE=" + md);
+ // System.out.println("$$$SET RETURN LOC TRUE=" + md);
mapMethodDescriptorToCompositeReturnCase.put(md, Boolean.TRUE);
// NameDescriptor returnLocDesc = new NameDescriptor("RLOC" + (locSeed++));
// return true if there is a path between a node to which we want to give a composite location
// and nodes which start with curPrefix
- System.out.println("---needToGenerateCompositeLocation curPrefix=" + curPrefix);
+ // System.out.println("---needToGenerateCompositeLocation curPrefix=" + curPrefix);
Location targetLocalLoc = node.getLocTuple().get(0);
((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();
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 =
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;
}
}
Location lastLocationOfPrefix = curPrefix.get(curPrefix.size() - 1);
// check whether prefix appears in the list of parameters
Set<MethodInvokeNode> minSet = mapMethodDescToMethodInvokeNodeSet.get(md);
- System.out.println("$$$md=" + md + " minSet=" + minSet);
+ // System.out.println("$$$md=" + md + " minSet=" + minSet);
if (minSet == null) {
return false;
}
NTuple<Location> locTuple =
translateToLocTuple(md, flowGraph.getParamFlowNode(argIdx).getDescTuple());
lastLocationOfPrefix = locTuple.get(0);
- System.out.println("ARG CASE=" + locTuple);
+ // System.out.println("ARG CASE=" + locTuple);
for (Iterator iterator3 = subGlobalReachableSet.iterator(); iterator3.hasNext();) {
GlobalFlowNode subGlobalReachalbeNode = (GlobalFlowNode) iterator3.next();
// NTuple<Location> locTuple = translateToLocTuple(md, reachalbeNode.getDescTuple());
NTuple<Location> globalReachlocTuple = subGlobalReachalbeNode.getLocTuple();
for (int i = 0; i < globalReachlocTuple.size(); i++) {
if (globalReachlocTuple.get(i).equals(lastLocationOfPrefix)) {
- System.out.println("ARG " + argTuple + " IS MATCHED WITH="
- + lastLocationOfPrefix);
+ // System.out.println("ARG " + argTuple + " IS MATCHED WITH="
+ // + lastLocationOfPrefix);
return true;
}
}
private List<NTuple<Location>> calculatePrefixList(GlobalFlowGraph graph, GlobalFlowNode node) {
- System.out.println("\n##### calculatePrefixList node=" + node);
+ // System.out.println("\n##### calculatePrefixList node=" + node);
Set<GlobalFlowNode> incomingNodeSetPrefix =
graph.getIncomingNodeSetByPrefix(node.getLocTuple().get(0));
private CompositeLocation calculateCompositeLocationFromFlowGraph(MethodDescriptor md,
FlowNode node) {
- System.out.println("#############################################################");
- System.out.println("calculateCompositeLocationFromFlowGraph=" + node);
+ // System.out.println("#############################################################");
+ // System.out.println("calculateCompositeLocationFromFlowGraph=" + node);
FlowGraph flowGraph = getFlowGraph(md);
// NTuple<Location> paramLocTuple = translateToLocTuple(md, paramNode.getDescTuple());
// 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);
private List<NTuple<Location>> calculatePrefixListFlowGraph(FlowGraph graph, FlowNode node) {
- System.out.println("\n##### calculatePrefixList node=" + node);
+ // System.out.println("\n##### calculatePrefixList node=" + node);
MethodDescriptor md = graph.getMethodDescriptor();
Set<FlowNode> incomingNodeSetPrefix =
private void propagateValueFlowsToCallerFromSubGlobalFlowGraph(MethodInvokeNode min,
MethodDescriptor mdCaller, MethodDescriptor possibleMdCallee) {
- System.out.println("---propagate from " + min.printNode(0) + " to caller=" + mdCaller);
+ // System.out.println("---propagate from " + min.printNode(0) + " to caller=" + mdCaller);
FlowGraph calleeFlowGraph = getFlowGraph(possibleMdCallee);
Map<Integer, NTuple<Descriptor>> mapIdxToArg = mapMethodInvokeNodeToArgIdxMap.get(min);
- System.out.println("-----mapMethodInvokeNodeToArgIdxMap.get(min)="
- + mapMethodInvokeNodeToArgIdxMap.get(min));
+ // System.out.println("-----mapMethodInvokeNodeToArgIdxMap.get(min)="
+ // + mapMethodInvokeNodeToArgIdxMap.get(min));
Set<Integer> keySet = mapIdxToArg.keySet();
for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
NTuple<Location> argLocTuple = translateToLocTuple(mdCaller, argDescTuple);
NTuple<Descriptor> paramDescTuple = calleeFlowGraph.getParamFlowNode(idx).getDescTuple();
NTuple<Location> paramLocTuple = translateToLocTuple(possibleMdCallee, paramDescTuple);
- System.out.println("-------paramDescTuple=" + paramDescTuple + "->argDescTuple="
- + argDescTuple);
+ // System.out.println("-------paramDescTuple=" + paramDescTuple + "->argDescTuple="
+ // + argDescTuple);
addMapCallerArgToCalleeParam(min, argDescTuple, paramDescTuple);
}
}
addValueFlowFromCalleeNode(min, mdCaller, possibleMdCallee, calleeNode);
}
- System.out.println("$$$GLOBAL PC LOC ADD=" + mdCaller);
+ // System.out.println("$$$GLOBAL PC LOC ADD=" + mdCaller);
Set<NTuple<Location>> pcLocTupleSet = mapMethodInvokeNodeToPCLocTupleSet.get(min);
- System.out.println("---pcLocTupleSet=" + pcLocTupleSet);
+ // System.out.println("---pcLocTupleSet=" + pcLocTupleSet);
GlobalFlowGraph callerSubGlobalGraph = getSubGlobalFlowGraph(mdCaller);
for (Iterator iterator = calleeNodeSet.iterator(); iterator.hasNext();) {
GlobalFlowNode calleeNode = (GlobalFlowNode) iterator.next();
if (calleeNode.isParamNodeWithIncomingFlows()) {
- System.out.println("calleeNode.getLocTuple()" + calleeNode.getLocTuple());
+ // System.out.println("calleeNode.getLocTuple()" + calleeNode.getLocTuple());
NTuple<Location> callerSrcNodeLocTuple =
translateToCallerLocTuple(min, possibleMdCallee, mdCaller, calleeNode.getLocTuple());
- System.out.println("---callerSrcNodeLocTuple=" + callerSrcNodeLocTuple);
+ // System.out.println("---callerSrcNodeLocTuple=" + callerSrcNodeLocTuple);
if (callerSrcNodeLocTuple != null && callerSrcNodeLocTuple.size() > 0) {
for (Iterator iterator2 = pcLocTupleSet.iterator(); iterator2.hasNext();) {
NTuple<Location> pcLocTuple = (NTuple<Location>) iterator2.next();
GlobalFlowGraph calleeSubGlobalGraph = getSubGlobalFlowGraph(mdCallee);
GlobalFlowGraph callerSubGlobalGraph = getSubGlobalFlowGraph(mdCaller);
- System.out.println("$addValueFlowFromCalleeNode calleeSrcNode=" + calleeSrcNode);
+ // System.out.println("$addValueFlowFromCalleeNode calleeSrcNode=" + calleeSrcNode);
NTuple<Location> callerSrcNodeLocTuple =
translateToCallerLocTuple(min, mdCallee, mdCaller, calleeSrcNode.getLocTuple());
- System.out.println("---callerSrcNodeLocTuple=" + callerSrcNodeLocTuple);
+ // System.out.println("---callerSrcNodeLocTuple=" + callerSrcNodeLocTuple);
if (callerSrcNodeLocTuple != null && callerSrcNodeLocTuple.size() > 0) {
// set the 'this' reference location
if (!md.isStatic()) {
- System.out.println("setThisLocName=" + scGraph.getHNode(md.getThis()).getName());
+ // System.out.println("setThisLocName=" + scGraph.getHNode(md.getThis()).getName());
methodSummary.setThisLocName(scGraph.getHNode(md.getThis()).getName());
}
FlowNode flowNode = flowGraph.getParamFlowNode(paramIdx);
CompositeLocation inferredCompLoc =
updateCompositeLocation(flowNode.getCompositeLocation());
- System.out.println("-paramIdx=" + paramIdx + " infer=" + inferredCompLoc + " original="
- + flowNode.getCompositeLocation());
+ // System.out.println("-paramIdx=" + paramIdx + " infer=" + inferredCompLoc + " original="
+ // + flowNode.getCompositeLocation());
Descriptor localVarDesc = flowNode.getDescTuple().get(0);
methodSummary.addMapVarNameToInferCompLoc(localVarDesc, inferredCompLoc);
HNode node1 = hierarchyGraph.getHNode(locDesc1);
HNode node2 = hierarchyGraph.getHNode(locDesc2);
- System.out.println("---node1=" + node1 + " node2=" + node2);
- System.out.println("---hierarchyGraph.getIncomingNodeSet(node2)="
- + hierarchyGraph.getIncomingNodeSet(node2));
+ // System.out.println("---node1=" + node1 + " node2=" + node2);
+ // System.out.println("---hierarchyGraph.getIncomingNodeSet(node2)="
+ // + hierarchyGraph.getIncomingNodeSet(node2));
if (locDesc1.equals(locDesc2)) {
continue;
HNode node1 = hierarchyGraph.getHNode(locDesc1);
HNode node2 = hierarchyGraph.getHNode(locDesc2);
- System.out.println("---node1=" + node1 + " node2=" + node2);
- System.out.println("---hierarchyGraph.getIncomingNodeSet(node2)="
- + hierarchyGraph.getIncomingNodeSet(node2));
+ // System.out.println("---node1=" + node1 + " node2=" + node2);
+ // System.out.println("---hierarchyGraph.getIncomingNodeSet(node2)="
+ // + hierarchyGraph.getIncomingNodeSet(node2));
if (locDesc1.equals(locDesc2)) {
continue;
// HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(key);
HierarchyGraph scHierarchyGraph = getSkeletonCombinationHierarchyGraph(key);
if (key instanceof ClassDescriptor) {
- // writeInferredLatticeDotFile((ClassDescriptor) key, scHierarchyGraph, simpleLattice,
- // "_SIMPLE");
+ writeInferredLatticeDotFile((ClassDescriptor) key, simpleLattice, "_SIMPLE");
} else if (key instanceof MethodDescriptor) {
MethodDescriptor md = (MethodDescriptor) key;
- // writeInferredLatticeDotFile(md.getClassDesc(), md, scHierarchyGraph, simpleLattice,
- // "_SIMPLE");
+ writeInferredLatticeDotFile(md.getClassDesc(), md, simpleLattice, "_SIMPLE");
}
LocationSummary ls = getLocationSummary(key);
- System.out.println("####LOC SUMMARY=" + key + "\n" + ls.getMapHNodeNameToLocationName());
+ // System.out.println("####LOC SUMMARY=" + key + "\n" + ls.getMapHNodeNameToLocationName());
}
Set<ClassDescriptor> cdKeySet = cd2lattice.keySet();
for (Iterator iterator = cdKeySet.iterator(); iterator.hasNext();) {
ClassDescriptor cd = (ClassDescriptor) iterator.next();
- 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<MethodDescriptor> mdKeySet = md2lattice.keySet();
for (Iterator iterator = mdKeySet.iterator(); iterator.hasNext();) {
MethodDescriptor md = (MethodDescriptor) iterator.next();
- writeInferredLatticeDotFile(md.getClassDesc(), md, getSkeletonCombinationHierarchyGraph(md),
- md2lattice.get(md), "");
+ writeInferredLatticeDotFile(md.getClassDesc(), md, md2lattice.get(md), "");
COUNT += md2lattice.get(md).getKeySet().size();
}
System.out.println("###COUNT=" + COUNT);
+
+ Set<Descriptor> descKeySet = desc2naiveLattice.keySet();
+ for (Iterator iterator = descKeySet.iterator(); iterator.hasNext();) {
+ Descriptor desc = (Descriptor) iterator.next();
+ // System.out.println("########cd=" + cd);
+
+ ClassDescriptor cd_naive;
+ MethodDescriptor md_naive;
+ if (desc instanceof ClassDescriptor) {
+ cd_naive = (ClassDescriptor) desc;
+ md_naive = null;
+ } else {
+ md_naive = (MethodDescriptor) desc;
+ cd_naive = md_naive.getClassDesc();
+ }
+
+ writeInferredLatticeDotFile(cd_naive, md_naive, desc2naiveLattice.get(desc), "_naive");
+ }
}
private void buildLattice(Descriptor desc) {
- System.out.println("buildLattice=" + desc);
+ // System.out.println("buildLattice=" + desc);
SSJavaLattice<String> 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<String> 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);
}
+ // deprecated: it builds method/class lattices without considering class inheritance
private void buildLattice() {
Set<Descriptor> keySet = mapDescriptorToCombineSkeletonHierarchyGraph.keySet();
buildLattice.insertIntermediateNodesToStraightLine(desc, simpleLattice);
lattice.removeRedundantEdges();
+ LocationInference.numLocationsSInfer += lattice.getKeySet().size();
+
if (desc instanceof ClassDescriptor) {
// field lattice
cd2lattice.put((ClassDescriptor) desc, lattice);
public Set<ClassDescriptor> getDirectSubClasses(ClassDescriptor parent) {
- System.out.println("$$$toanalyze_classDescSet=" + toanalyze_classDescSet);
Set<ClassDescriptor> result = new HashSet<ClassDescriptor>();
Set<ClassDescriptor> children = tu.getDirectSubClasses(parent);
MethodDescriptor parentMethodDesc = getParentMethodDesc(md.getClassDesc(), md);
if (parentMethodDesc != null) {
Map<TripleItem, String> parentMap = buildLattice.getIntermediateLocMap(parentMethodDesc);
- buildLattice.setIntermediateLocMap(md, parentMap);
+ Map<TripleItem, String> childMap = new HashMap<TripleItem, String>();
+ Set<TripleItem> keySet = parentMap.keySet();
+ for (Iterator iterator2 = keySet.iterator(); iterator2.hasNext();) {
+ TripleItem key = (TripleItem) iterator2.next();
+ childMap.put(key, parentMap.get(key));
+ }
+ buildLattice.setIntermediateLocMap(md, childMap);
}
buildLattice(md);
}
}
// traverse children
- Set<ClassDescriptor> children = getDirectSubClasses(cd);
- for (Iterator iterator = children.iterator(); iterator.hasNext();) {
- ClassDescriptor classDescriptor = (ClassDescriptor) iterator.next();
- if (toanalyze_classDescSet.contains(classDescriptor)) {
- DFSBuildLatticeInheritanceTree(classDescriptor);
+ Set<ClassDescriptor> children = tu.getDirectSubClasses(cd);
+ if (children != null) {
+ for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ ClassDescriptor classDescriptor = (ClassDescriptor) iterator.next();
+ if (toanalyze_classDescSet.contains(classDescriptor)) {
+ DFSBuildLatticeInheritanceTree(classDescriptor);
+ } else {
+ if (classDescriptor.isAbstract()) {
+ DFSBuildLatticeInheritanceTree(classDescriptor);
+ }
+ }
}
-
}
}
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);
}
for (Iterator iterator2 = nodeToBeConnected.iterator(); iterator2.hasNext();) {
HNode node = (HNode) iterator2.next();
- System.out.println("NEED TO BE CONNECTED TO TOP=" + node);
+ // System.out.println("NEED TO BE CONNECTED TO TOP=" + node);
graph.addEdge(graph.getHNode(TOPDESC), node);
}
Set<FlowNode> sourceNodeSet = new HashSet<FlowNode>();
if (originalSrcNode instanceof FlowReturnNode) {
FlowReturnNode rnode = (FlowReturnNode) originalSrcNode;
- System.out.println("rnode=" + rnode);
+ // System.out.println("rnode=" + rnode);
Set<NTuple<Descriptor>> tupleSet = rnode.getReturnTupleSet();
for (Iterator iterator2 = tupleSet.iterator(); iterator2.hasNext();) {
NTuple<Descriptor> nTuple = (NTuple<Descriptor>) iterator2.next();
sourceNodeSet.add(fg.getFlowNode(nTuple));
- System.out.println("&&&SOURCE fg.getFlowNode(nTuple)=" + fg.getFlowNode(nTuple));
+ // System.out.println("&&&SOURCE fg.getFlowNode(nTuple)=" + fg.getFlowNode(nTuple));
}
} else {
sourceNodeSet.add(originalSrcNode);
for (Iterator iterator4 = tupleSet.iterator(); iterator4.hasNext();) {
NTuple<Descriptor> nTuple = (NTuple<Descriptor>) iterator4.next();
dstNodeSet.add(fg.getFlowNode(nTuple));
- System.out.println("&&&DST fg.getFlowNode(nTuple)=" + fg.getFlowNode(nTuple));
+ // System.out.println("&&&DST fg.getFlowNode(nTuple)=" + fg.getFlowNode(nTuple));
}
} else {
dstNodeSet.add(originalDstNode);
if (dstLocalDesc instanceof InterDescriptor
&& ((InterDescriptor) dstLocalDesc).getMethodArgIdxPair() != null) {
if (dstNode.getCompositeLocation() == null) {
- System.out.println("%%%%%%%%%%%%%SKIP=" + dstNode);
+ // System.out.println("%%%%%%%%%%%%%SKIP=" + dstNode);
continue;
}
}
}
// //////////////////////////
- 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);
translatedTuple.add(inTuple.get(i));
}
- System.out.println("------TRANSLATED " + inTuple + " -> " + translatedTuple);
+ // System.out.println("------TRANSLATED " + inTuple + " -> " + translatedTuple);
return translatedTuple;
} else {
Map<String, Set<String>> map = lattice.getTable();
Set<String> keySet = map.keySet();
+
+ // System.out.println("@generateLatticeDefinition=" + desc + " map=" + map);
+
boolean first = true;
for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
String key = (String) iterator.next();
}
if (desc instanceof MethodDescriptor) {
- System.out.println("#EXTRA LOC DECLARATION GEN=" + desc);
+ // System.out.println("#EXTRA LOC DECLARATION GEN=" + desc);
MethodDescriptor md = (MethodDescriptor) desc;
MethodSummary methodSummary = getMethodSummary(md);
}
SSJavaLattice<String> methodLattice = md2lattice.get(md);
+ // System.out.println("md=" + md + " methodLattice=" + methodLattice);
if (methodLattice != null) {
int methodDefLine = md.getLineNum();
Map<Descriptor, CompositeLocation> mapVarDescToInferLoc =
methodSummary.getMapVarDescToInferCompositeLocation();
- System.out.println("-----md=" + md);
- System.out.println("-----mapVarDescToInferLoc=" + mapVarDescToInferLoc);
+ // System.out.println("-----md=" + md + " methodDefLine=" + methodDefLine);
+ // System.out.println("-----mapVarDescToInferLoc=" + mapVarDescToInferLoc);
Set<Descriptor> localVarDescSet = mapVarDescToInferLoc.keySet();
for (Iterator iterator = localVarDescSet.iterator(); iterator.hasNext();) {
Descriptor localVarDesc = (Descriptor) iterator.next();
- System.out.println("-------localVarDesc=" + localVarDesc);
+ // System.out.println("-------localVarDesc=" + localVarDesc);
CompositeLocation inferLoc = mapVarDescToInferLoc.get(localVarDesc);
String localLocIdentifier = inferLoc.get(0).getLocIdentifier();
if (mapDescToDefinitionLine.containsKey(localVarDesc)) {
int varLineNum = mapDescToDefinitionLine.get(localVarDesc);
String orgSourceLine = sourceVec.get(varLineNum);
- System.out.println("varLineNum=" + varLineNum + " org src=" + orgSourceLine);
+ // System.out.println("varLineNum=" + varLineNum + " org src=" + orgSourceLine);
int idx =
orgSourceLine.indexOf(generateVarDeclaration((VarDescriptor) localVarDesc));
- System.out.println("idx=" + idx
- + " generateVarDeclaration((VarDescriptor) localVarDesc)="
- + generateVarDeclaration((VarDescriptor) localVarDesc));
+ // System.out.println("idx=" + idx
+ // + " generateVarDeclaration((VarDescriptor) localVarDesc)="
+ // + generateVarDeclaration((VarDescriptor) localVarDesc));
assert (idx != -1);
String annoatedStr =
orgSourceLine.substring(0, idx) + locAnnotationStr + " "
int idx =
getParamLocation(methodDefStr,
generateVarDeclaration((VarDescriptor) localVarDesc));
- System.out.println("methodDefStr=" + methodDefStr + " localVarDesc=" + localVarDesc
- + " idx=" + idx);
+ // System.out.println("methodDefStr=" + methodDefStr + " localVarDesc=" + localVarDesc
+ // + " idx=" + idx);
assert (idx != -1);
String annoatedStr =
SSJavaLattice<String> classLattice = cd2lattice.get(cd);
if (classLattice != null) {
ssjava.writeLatticeDotFile(cd, null, classLattice);
- debug_printDescriptorToLocNameMapping(cd);
+ // debug_printDescriptorToLocNameMapping(cd);
}
while (!toAnalyzeMethodIsEmpty()) {
SSJavaLattice<String> methodLattice = md2lattice.get(md);
if (methodLattice != null) {
ssjava.writeLatticeDotFile(cd, md, methodLattice);
- debug_printDescriptorToLocNameMapping(md);
+ // debug_printDescriptorToLocNameMapping(md);
}
}
}
private void calculatePCLOC(MethodDescriptor md) {
- System.out.println("#CalculatePCLOC");
+ // System.out.println("#CalculatePCLOC");
MethodSummary methodSummary = getMethodSummary(md);
FlowGraph fg = getFlowGraph(md);
Map<Integer, CompositeLocation> mapParamToLoc = methodSummary.getMapParamIdxToInferLoc();
}
}
- System.out.println("paramLocTupleHavingInFlowSet=" + paramLocTupleHavingInFlowSet);
+ // System.out.println("paramLocTupleHavingInFlowSet=" + paramLocTupleHavingInFlowSet);
if (paramLocTupleHavingInFlowSet.size() > 0
&& !coversAllParamters(md, fg, paramLocTupleHavingInFlowSet)) {
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) {
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);
}
}
// 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()) {
//
private void calculateRETURNLOC(MethodDescriptor md) {
- System.out.println("#calculateRETURNLOC= " + md);
+ // System.out.println("#calculateRETURNLOC= " + md);
// calculate a return location:
// the return location type is lower than all parameters and the location of return values
NTuple<Descriptor> returnDescTuple = returnNode.getCurrentDescTuple();
tupleToBeHigherThanReturnLocSet.add(translateToLocTuple(md, returnDescTuple));
}
- System.out.println("-flow graph's returnNodeSet=" + returnNodeSet);
- System.out.println("tupleSetToBeHigherThanReturnLoc=" + tupleToBeHigherThanReturnLocSet);
+ // System.out.println("-flow graph's returnNodeSet=" + returnNodeSet);
+ // System.out.println("tupleSetToBeHigherThanReturnLoc=" + tupleToBeHigherThanReturnLocSet);
// Here, generates a return location in the method lattice that is lower than the
// locFlowingToReturnValueSet
break;
}
Location newLocElement = new Location(curLoc.getDescriptor(), curLoc.getLocDescriptor());
- System.out.println("newLocElement" + newLocElement);
+ // System.out.println("newLocElement" + newLocElement);
higherLocTuple.add(newLocElement);
enclosingDesc = getClassTypeDescriptor(curLoc.getLocDescriptor());
}
NameDescriptor locDesc = new NameDescriptor(locIdentifier);
Location newLoc = new Location(enclosingDesc, locDesc);
higherLocTuple.add(newLoc);
- System.out.println("---new loc tuple=" + higherLocTuple);
+ // System.out.println("---new loc tuple=" + higherLocTuple);
return higherLocTuple;
private void propagateFlowsToCallerWithNoCompositeLocation(MethodInvokeNode min,
MethodDescriptor mdCaller, MethodDescriptor mdCallee) {
- System.out.println("-propagateFlowsToCallerWithNoCompositeLocation=" + min.printNode(0));
+ // System.out.println("-propagateFlowsToCallerWithNoCompositeLocation=" + min.printNode(0));
// if the parameter A reaches to the parameter B
// then, add an edge the argument A -> the argument B to the caller's flow
// graph
for (int idx = 0; idx < numParam; idx++) {
FlowNode paramNode = calleeFlowGraph.getParamFlowNode(idx);
CompositeLocation compLoc = paramNode.getCompositeLocation();
- System.out.println("paramNode=" + paramNode + " compLoc=" + compLoc);
+ // System.out.println("paramNode=" + paramNode + " compLoc=" + compLoc);
if (compLoc != null && compLoc.get(0).getLocDescriptor().equals(min.getMethod().getThis())) {
- System.out.println("$$$COMPLOC CASE=" + compLoc + " idx=" + idx);
+ // System.out.println("$$$COMPLOC CASE=" + compLoc + " idx=" + idx);
NTuple<Descriptor> argTuple = getNodeTupleByArgIdx(min, idx);
- System.out.println("--- argTuple=" + argTuple + " current compLoc="
- + callerFlowGraph.getFlowNode(argTuple).getCompositeLocation());
+ // System.out.println("--- argTuple=" + argTuple + " current compLoc="
+ // + callerFlowGraph.getFlowNode(argTuple).getCompositeLocation());
NTuple<Descriptor> translatedParamTuple =
translateCompositeLocationToCaller(idx, min, compLoc);
- System.out.println("add a flow edge= " + argTuple + "->" + translatedParamTuple);
+ // System.out.println("add a flow edge= " + argTuple + "->" + translatedParamTuple);
callerFlowGraph.addValueFlowEdge(argTuple, translatedParamTuple);
Set<NTuple<Location>> pcLocTupleSet = getPCLocTupleSet(min);
for (Iterator iterator = set.iterator(); iterator.hasNext();) {
FlowNode flowNode = (FlowNode) iterator.next();
if (flowNode.getDescTuple().startsWith(prefixDesc)) {
- System.out.println("FOUND=" + flowNode);
+ // System.out.println("FOUND=" + flowNode);
return true;
}
}
private CompositeLocation generateCompositeLocation(NTuple<Location> prefixLocTuple) {
- System.out.println("generateCompositeLocation=" + prefixLocTuple);
+ // System.out.println("generateCompositeLocation=" + prefixLocTuple);
CompositeLocation newCompLoc = new CompositeLocation();
for (int i = 0; i < prefixLocTuple.size(); i++) {
private CompositeLocation generateCompositeLocation(MethodDescriptor md,
NTuple<Descriptor> paramPrefix) {
- System.out.println("generateCompositeLocation=" + paramPrefix);
+ // System.out.println("generateCompositeLocation=" + paramPrefix);
CompositeLocation newCompLoc = convertToCompositeLocation(md, paramPrefix);
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);
}
// 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;
- // 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;
- // }
- // }
- // if (mdToString != null) {
- // toanalyze_methodDescList.remove(mdToString);
- // toanalyze_methodDescList.addLast(mdToString);
- // }
+ MethodDescriptor mdToString1 = null;
+ MethodDescriptor mdToString2 = null;
+ for (Iterator iterator = toanalyze_methodDescList.iterator(); iterator.hasNext();) {
+ MethodDescriptor md = (MethodDescriptor) iterator.next();
+ if (md.toString().equals("public static String String.valueOf(Object o)")) {
+ mdToString1 = md;
+ }
+ if (md.toString().equals("public String Object.toString()")) {
+ mdToString2 = md;
+ }
+ }
+
+ if (mdToString1 != null) {
+ toanalyze_methodDescList.remove(mdToString1);
+ toanalyze_methodDescList.addLast(mdToString1);
+ }
+ if (mdToString2 != null) {
+ toanalyze_methodDescList.remove(mdToString2);
+ toanalyze_methodDescList.addLast(mdToString2);
+ }
LinkedList<MethodDescriptor> methodDescList =
(LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
- System.out.println("@@@methodDescList=" + methodDescList);
+ // System.out.println("@@@methodDescList=" + methodDescList);
// System.exit(0);
while (!methodDescList.isEmpty()) {
constructSubGlobalFlowGraph(getFlowGraph(md));
// TODO
- System.out.println("-add Value Flows From CalleeSubGlobalFlowGraph");
+ // System.out.println("-add Value Flows From CalleeSubGlobalFlowGraph");
addValueFlowsFromCalleeSubGlobalFlowGraph(md);
// subGlobalFlowGraph.writeGraph("_SUBGLOBAL");
Set<FlowNode> paramFlowNodeSet = flowGraph.getParamFlowNodeSet();
for (Iterator iterator = paramFlowNodeSet.iterator(); iterator.hasNext();) {
FlowNode paramFlowNode = (FlowNode) iterator.next();
- System.out.println("paramFlowNode=" + paramFlowNode);
+ // System.out.println("paramFlowNode=" + paramFlowNode);
NTuple<Descriptor> paramDescTuple = paramFlowNode.getDescTuple();
NTuple<Location> paramLocTuple = translateToLocTuple(md, paramDescTuple);
GlobalFlowNode paramGlobalNode = globalFlowGraph.getFlowNode(paramLocTuple);
if (needToGenerateInterLoc(newImplicitTupleSet)) {
// need to create an intermediate node for the GLB of conditional
// locations & implicit flows
- System.out.println("10");
NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
for (Iterator<NTuple<Descriptor>> idxIter = newImplicitTupleSet.iterator(); idxIter.hasNext();) {
// System.out.println("---currentFlowTupleSet=" + currentFlowTupleSet);
if (needToGenerateInterLoc(currentFlowTupleSet)) {
- System.out.println("9");
FlowNode meetNode = fg.createIntermediateNode();
for (Iterator iterator = currentFlowTupleSet.iterator(); iterator.hasNext();) {
}
}
if (size > 1) {
- System.out.println("needToGenerateInterLoc=" + tupleSet + " size=" + size);
+ // System.out.println("needToGenerateInterLoc=" + tupleSet + " size=" + size);
return true;
} else {
return false;
if (needToGenerateInterLoc(newImplicitTupleSet)) {
// need to create an intermediate node for the GLB of conditional
// locations & implicit flows
- System.out.println("6");
NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
for (Iterator<NTuple<Descriptor>> idxIter = newImplicitTupleSet.iterator(); idxIter
if (needToGenerateInterLoc(newImplicitTupleSet)) {
// need to create an intermediate node for the GLB of conditional
// locations & implicit flows
- System.out.println("7");
NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
for (Iterator<NTuple<Descriptor>> idxIter = newImplicitTupleSet.iterator(); idxIter
// System.out.println("-newImplicitTupleSet=" + newImplicitTupleSet);
if (needToGenerateInterLoc(newImplicitTupleSet)) {
- System.out.println("5");
// need to create an intermediate node for the GLB of conditional locations & implicit flows
NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
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,
// creates edges from RHS to LHS
NTuple<Descriptor> interTuple = null;
if (needToGenerateInterLoc(nodeSetRHS)) {
- System.out.println("3");
interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
}
for (Iterator<NTuple<Descriptor>> iter = nodeSetRHS.iterator(); iter.hasNext();) {
NTuple<Descriptor> fromTuple = iter.next();
- System.out.println("fromTuple=" + fromTuple + " interTuple=" + interTuple + " tupleLSH="
- + tupleLHS);
+ // System.out.println("fromTuple=" + fromTuple + " interTuple=" + interTuple + " tupleLSH="
+ // + tupleLHS);
addFlowGraphEdge(md, fromTuple, interTuple, tupleLHS);
}
globalFlowGraph.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);
}
break;
case Kind.CreateObjectNode:
- analyzeCreateObjectNode(md, nametable, (CreateObjectNode) en);
+ analyzeCreateObjectNode(md, nametable, (CreateObjectNode) en, nodeSet, implicitFlowTupleSet);
break;
case Kind.ArrayAccessNode:
// System.out.println("-newImplicitTupleSet=" + newImplicitTupleSet);
if (needToGenerateInterLoc(newImplicitTupleSet)) {
- System.out.println("15");
// need to create an intermediate node for the GLB of conditional locations & implicit flows
NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
for (Iterator<NTuple<Descriptor>> idxIter = newImplicitTupleSet.iterator(); idxIter.hasNext();) {
newImplicitTupleSet.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,
nodeSet.addGlobalFlowTupleSet(tertiaryTupleNode.getGlobalLocTupleSet());
nodeSet.addTupleSet(tertiaryTupleNode);
- System.out.println("#tertiary node set=" + nodeSet);
+ // System.out.println("#tertiary node set=" + nodeSet);
}
private void addMapCallerMethodDescToMethodInvokeNodeSet(MethodDescriptor caller,
private void analyzeFlowMethodInvokeNode(MethodDescriptor mdCaller, SymbolTable nametable,
MethodInvokeNode min, NodeTupleSet nodeSet, NodeTupleSet implicitFlowTupleSet) {
- System.out.println("analyzeFlowMethodInvokeNode=" + min.printNode(0));
+ // System.out.println("analyzeFlowMethodInvokeNode=" + min.printNode(0));
if (!toanalyze_methodDescList.contains(min.getMethod())) {
return;
addMapCallerMethodDescToMethodInvokeNodeSet(mdCaller, min);
FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
- System.out.println("mdCallee=" + mdCallee + " calleeFlowGraph=" + calleeFlowGraph);
+ // System.out.println("mdCallee=" + mdCallee + " calleeFlowGraph=" + calleeFlowGraph);
Set<FlowNode> calleeReturnSet = calleeFlowGraph.getReturnNodeSet();
- System.out.println("---calleeReturnSet=" + calleeReturnSet);
+ // System.out.println("---calleeReturnSet=" + calleeReturnSet);
NodeTupleSet tupleSet = new NodeTupleSet();
NodeTupleSet baseNodeSet = new NodeTupleSet();
analyzeFlowExpressionNode(mdCaller, nametable, min.getExpression(), baseNodeSet, null,
implicitFlowTupleSet, false);
- System.out.println("baseNodeSet=" + baseNodeSet);
+ // System.out.println("baseNodeSet=" + baseNodeSet);
assert (baseNodeSet.size() == 1);
NTuple<Descriptor> baseTuple = baseNodeSet.iterator().next();
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<FlowNode> inFlowSet = calleeFlowGraph.getIncomingFlowNodeSet(returnNode);
// System.out.println("inFlowSet=" + inFlowSet + " from retrunNode=" + returnNode);
for (Iterator iterator2 = inFlowSet.iterator(); iterator2.hasNext();) {
FlowNode inFlowNode = (FlowNode) iterator2.next();
if (inFlowNode.getDescTuple().startsWith(mdCallee.getThis())) {
// nodeSet.addTupleSet(baseNodeSet);
- System.out.println("2CREATE A NEW TUPLE=" + baseNodeSet + " from="
- + mdCallee.getThis());
+ // System.out.println("2CREATE A NEW TUPLE=" + baseNodeSet + " from="
+ // + mdCallee.getThis());
tupleSet.addTupleSet(baseNodeSet);
}
}
NodeTupleSet argTupleSet = new NodeTupleSet();
analyzeFlowExpressionNode(mdCaller, nametable, en, argTupleSet, false);
// if argument is liternal node, argTuple is set to NULL
- System.out.println("---arg idx=" + idx + " argTupleSet=" + argTupleSet);
+ // System.out.println("---arg idx=" + idx + " argTupleSet=" + argTupleSet);
NTuple<Descriptor> argTuple = generateArgTuple(mdCaller, argTupleSet);
// if an argument is literal value,
// }
// }
- System.out.println("paramNode=" + paramNode + " calleeReturnSet=" + calleeReturnSet);
+ // System.out.println("paramNode=" + paramNode + " calleeReturnSet=" + calleeReturnSet);
if (hasInFlowTo(calleeFlowGraph, paramNode, calleeReturnSet)
|| mdCallee.getModifiers().isNative()) {
addParamNodeFlowingToReturnValue(mdCallee, paramNode);
// nodeSet.addTupleSet(argTupleSet);
- System.out.println("3CREATE A NEW TUPLE=" + argTupleSet + " from=" + paramNode);
+ // System.out.println("3CREATE A NEW TUPLE=" + argTupleSet + " from=" + paramNode);
tupleSet.addTupleSet(argTupleSet);
}
}
FlowReturnNode returnHolderNode = getFlowGraph(mdCaller).createReturnNode(min);
if (needToGenerateInterLoc(tupleSet)) {
- System.out.println("20");
FlowGraph fg = getFlowGraph(mdCaller);
FlowNode interNode = fg.createIntermediateNode();
interNode.setFormHolder(true);
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();
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());
FlowNode calleeReturnNode = (FlowNode) iterator.next();
NTuple<Location> calleeReturnLocTuple =
translateToLocTuple(mdCallee, calleeReturnNode.getDescTuple());
- System.out.println("calleeReturnLocTuple=" + calleeReturnLocTuple);
+ // System.out.println("calleeReturnLocTuple=" + calleeReturnLocTuple);
NTuple<Location> transaltedToCaller =
translateToCallerLocTuple(min, mdCallee, mdCaller, calleeReturnLocTuple);
// System.out.println("translateToCallerLocTuple="
}
}
- System.out.println("min nodeSet=" + nodeSet);
+ // System.out.println("min nodeSet=" + nodeSet);
}
}
if (argTupleSetNonLiteral.size() > 1) {
- System.out.println("11");
NTuple<Descriptor> interTuple =
getFlowGraph(mdCaller).createIntermediateNode().getDescTuple();
private void analyzeFlowArrayAccessNode(MethodDescriptor md, SymbolTable nametable,
ArrayAccessNode aan, NodeTupleSet nodeSet, boolean isLHS) {
- System.out.println("analyzeFlowArrayAccessNode aan=" + aan.printNode(0));
+ // System.out.println("analyzeFlowArrayAccessNode aan=" + aan.printNode(0));
String currentArrayAccessNodeExpStr = aan.printNode(0);
arrayAccessNodeStack.push(aan.printNode(0));
NodeTupleSet expNodeTupleSet = new NodeTupleSet();
NTuple<Descriptor> base =
analyzeFlowExpressionNode(md, nametable, aan.getExpression(), expNodeTupleSet, isLHS);
- System.out.println("-base=" + base);
+ // System.out.println("-base=" + base);
nodeSet.setMethodInvokeBaseDescTuple(base);
NodeTupleSet idxNodeTupleSet = new NodeTupleSet();
|| !arrayAccessNodeStack.peek().startsWith(currentArrayAccessNodeExpStr)) {
if (needToGenerateInterLoc(nodeSetArrayAccessExp)) {
- System.out.println("1");
FlowNode interNode = getFlowGraph(md).createIntermediateNode();
NTuple<Descriptor> interTuple = interNode.getDescTuple();
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)));
}
private void analyzeCreateObjectNode(MethodDescriptor md, SymbolTable nametable,
- CreateObjectNode en) {
- // TODO Auto-generated method stub
+ CreateObjectNode en, NodeTupleSet nodeSet, NodeTupleSet implicitFlowTupleSet) {
+ // System.out.println("#analyzeCreateObjectNode=" + en.printNode(0));
+ int numArgs = en.numArgs();
+ NodeTupleSet argSet = new NodeTupleSet();
+
+ for (int i = 0; i < numArgs; i++) {
+ analyzeFlowExpressionNode(md, nametable, en.getArg(i), argSet, null, implicitFlowTupleSet,
+ false);
+ }
+
+ // System.out.println("###argSet=" + argSet);
+ nodeSet.addTupleSet(argSet);
}
NodeTupleSet leftOpSet = new NodeTupleSet();
NodeTupleSet rightOpSet = new NodeTupleSet();
- System.out.println("analyzeFlowOpNode=" + on.printNode(0));
+ // System.out.println("analyzeFlowOpNode=" + on.printNode(0));
// left operand
analyzeFlowExpressionNode(md, nametable, on.getLeft(), leftOpSet, null, implicitFlowTupleSet,
false);
- System.out.println("--leftOpSet=" + leftOpSet);
if (on.getRight() != null) {
// right operand
analyzeFlowExpressionNode(md, nametable, on.getRight(), rightOpSet, null,
implicitFlowTupleSet, false);
}
- System.out.println("--rightOpSet=" + rightOpSet);
Operation op = on.getOp();
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());
analyzeFlowExpressionNode(md, nametable, an.getSrc(), nodeSetRHS, null, implicitFlowTupleSet,
false);
- System.out.println("-analyzeFlowAssignmentNode=" + an.printNode(0));
- System.out.println("-nodeSetLHS=" + nodeSetLHS);
- System.out.println("-nodeSetRHS=" + nodeSetRHS);
- System.out.println("-implicitFlowTupleSet=" + implicitFlowTupleSet);
+ // System.out.println("-analyzeFlowAssignmentNode=" + an.printNode(0));
+ // System.out.println("-nodeSetLHS=" + nodeSetLHS);
+ // System.out.println("-nodeSetRHS=" + nodeSetRHS);
+ // System.out.println("-implicitFlowTupleSet=" + implicitFlowTupleSet);
// System.out.println("-");
if (an.getOperation().getOp() >= 2 && an.getOperation().getOp() <= 12) {
// creates edges from RHS to LHS
NTuple<Descriptor> interTuple = null;
if (needToGenerateInterLoc(nodeSetRHS)) {
- System.out.println("2");
interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
}
NTuple<Location> calleeReturnLocTuple = iterator.next();
for (Iterator<NTuple<Descriptor>> iter2 = nodeSetLHS.iterator(); iter2.hasNext();) {
NTuple<Descriptor> callerLHSTuple = iter2.next();
- System.out.println("$$$ GLOBAL FLOW ADD=" + calleeReturnLocTuple + " -> "
- + translateToLocTuple(md, callerLHSTuple));
+ // System.out.println("$$$ GLOBAL FLOW ADD=" + calleeReturnLocTuple + " -> "
+ // + translateToLocTuple(md, callerLHSTuple));
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
translateToLocTuple(md, callerLHSTuple));
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
translateToLocTuple(md, callerLHSTuple));
- System.out.println("$$$ GLOBAL FLOW PCLOC ADD=" + calleeReturnLocTuple + " -> "
- + translateToLocTuple(md, callerLHSTuple));
+ // System.out.println("$$$ GLOBAL FLOW PCLOC ADD=" + calleeReturnLocTuple + " -> "
+ // + translateToLocTuple(md, callerLHSTuple));
}
}
NTuple<Descriptor> callerLHSTuple = iter2.next();
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
translateToLocTuple(md, callerLHSTuple));
- System.out.println("$$$ GLOBAL FLOW PC ADD=" + calleeReturnLocTuple + " -> "
- + translateToLocTuple(md, callerLHSTuple));
+ // System.out.println("$$$ GLOBAL FLOW PC ADD=" + calleeReturnLocTuple + " -> "
+ // + translateToLocTuple(md, callerLHSTuple));
}
}
}
- public void writeInferredLatticeDotFile(ClassDescriptor cd, HierarchyGraph simpleHierarchyGraph,
- SSJavaLattice<String> locOrder, String nameSuffix) {
- System.out.println("@cd=" + cd);
- System.out.println("@sharedLoc=" + locOrder.getSharedLocSet());
- writeInferredLatticeDotFile(cd, null, simpleHierarchyGraph, locOrder, nameSuffix);
+ public void writeInferredLatticeDotFile(ClassDescriptor cd, SSJavaLattice<String> locOrder,
+ String nameSuffix) {
+ // System.out.println("@cd=" + cd);
+ // System.out.println("@sharedLoc=" + locOrder.getSharedLocSet());
+ writeInferredLatticeDotFile(cd, null, locOrder, nameSuffix);
}
public void writeInferredLatticeDotFile(ClassDescriptor cd, MethodDescriptor md,
- HierarchyGraph simpleHierarchyGraph, SSJavaLattice<String> locOrder, String nameSuffix) {
+ SSJavaLattice<String> locOrder, String nameSuffix) {
String fileName = "lattice_";
if (md != null) {
String lowLocId = pair.getSecond();
if (!addedLocSet.contains(highLocId)) {
addedLocSet.add(highLocId);
- drawNode(bw, locOrder, simpleHierarchyGraph, highLocId);
+ drawNode(bw, locOrder, highLocId);
}
if (!addedLocSet.contains(lowLocId)) {
addedLocSet.add(lowLocId);
- drawNode(bw, locOrder, simpleHierarchyGraph, lowLocId);
+ drawNode(bw, locOrder, lowLocId);
}
bw.write(highLocId + " -> " + lowLocId + ";\n");
return str;
}
- private void drawNode(BufferedWriter bw, SSJavaLattice<String> lattice, HierarchyGraph graph,
- String locName) throws IOException {
+ public void addNaiveLattice(Descriptor desc, SSJavaLattice<String> lattice) {
+ desc2naiveLattice.put(desc, lattice);
+ }
+
+ private void drawNode(BufferedWriter bw, SSJavaLattice<String> lattice, String locName)
+ throws IOException {
String prettyStr;
if (lattice.isSharedLoc(locName)) {
projects / IRC.git / blobdiff