debug_writeHierarchyDotFiles();
+ // System.exit(0);
+
simplifyHierarchyGraph();
debug_writeSimpleHierarchyDotFiles();
System.out.println("\nSSJAVA: Add addtional ordering constriants:");
MethodDescriptor methodEventLoopDesc = ssjava.getMethodContainingSSJavaLoop();
addAddtionalOrderingConstraints(methodEventLoopDesc);
+ // calculateReturnHolderLocation();
+ }
+
+ private void calculateReturnHolderLocation() {
+ LinkedList<MethodDescriptor> methodDescList =
+ (LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
+
+ while (!methodDescList.isEmpty()) {
+ MethodDescriptor md = methodDescList.removeLast();
+
+ FlowGraph fg = getFlowGraph(md);
+ Set<FlowNode> nodeSet = fg.getNodeSet();
+ for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
+ FlowNode flowNode = (FlowNode) iterator.next();
+ if (flowNode.isFromHolder()) {
+ calculateCompositeLocationFromFlowGraph(md, flowNode);
+ }
+ }
+
+ }
}
private void updateCompositeLocationAssignments() {
while (!methodDescList.isEmpty()) {
MethodDescriptor md = methodDescList.removeLast();
- System.out.println("\n#updateCompositeLocationAssignments=" + md);
+ // System.out.println("\n#updateCompositeLocationAssignments=" + md);
FlowGraph flowGraph = getFlowGraph(md);
Set<FlowNode> nodeSet = flowGraph.getNodeSet();
for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
FlowNode node = (FlowNode) iterator.next();
- System.out.println("-node=" + node + " node.getDescTuple=" + node.getDescTuple());
+ // System.out.println("-node=" + node + " node.getDescTuple=" + node.getDescTuple());
if (node.getCompositeLocation() != null) {
CompositeLocation compLoc = node.getCompositeLocation();
CompositeLocation updatedCompLoc = updateCompositeLocation(compLoc);
node.setCompositeLocation(updatedCompLoc);
- System.out.println("---updatedCompLoc1=" + updatedCompLoc);
+ // System.out.println("---updatedCompLoc1=" + updatedCompLoc);
} else {
NTuple<Descriptor> descTuple = node.getDescTuple();
- System.out.println("update desc=" + descTuple);
+ // System.out.println("update desc=" + descTuple);
CompositeLocation compLoc = convertToCompositeLocation(md, descTuple);
compLoc = updateCompositeLocation(compLoc);
node.setCompositeLocation(compLoc);
- System.out.println("---updatedCompLoc2=" + compLoc);
+ // System.out.println("---updatedCompLoc2=" + compLoc);
}
if (node.isDeclaratonNode()) {
private void translateCompositeLocationAssignmentToFlowGraph(MethodDescriptor mdCaller) {
- System.out.println("\n\n###translateCompositeLocationAssignmentToFlowGraph mdCaller="
- + mdCaller);
+ // System.out.println("\n\n###translateCompositeLocationAssignmentToFlowGraph mdCaller="
+ // + mdCaller);
// First, assign a composite location to a node in the flow graph
GlobalFlowGraph callerGlobalFlowGraph = getSubGlobalFlowGraph(mdCaller);
MethodDescriptor mdCallee = min.getMethod();
calleeSet.add(mdCallee);
- FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
-
- NTuple<Descriptor> methodInvokeBaseDescTuple = mapMethodInvokeNodeToBaseTuple.get(min);
- NTuple<Location> methodInvokeBaseLocTuple = null;
- if (methodInvokeBaseDescTuple != null) {
- methodInvokeBaseLocTuple = translateToLocTuple(mdCaller, methodInvokeBaseDescTuple);
- }
-
- // ////////////////
- // ////////////////
-
- // If the location of an argument has a composite location
- // need to assign a proper composite location to the corresponding callee parameter
- // System.out.println("---translate arg composite location to callee param. min="
- // + min.printNode(0));
- Map<Integer, NTuple<Descriptor>> mapIdxToArgTuple = mapMethodInvokeNodeToArgIdxMap.get(min);
- Set<Integer> idxSet = mapIdxToArgTuple.keySet();
- for (Iterator iterator2 = idxSet.iterator(); iterator2.hasNext();) {
- Integer idx = (Integer) iterator2.next();
-
- if (idx == 0 && !min.getMethod().isStatic()) {
- continue;
- }
-
- NTuple<Descriptor> argTuple = mapIdxToArgTuple.get(idx);
- if (argTuple.size() > 0) {
- // check if an arg tuple has been already assigned to a composite location
- NTuple<Location> argLocTuple = translateToLocTuple(mdCaller, argTuple);
- Location argLocalLoc = argLocTuple.get(0);
-
- // if (!isPrimitiveType(argTuple)) {
- if (callerMapLocToCompLoc.containsKey(argLocalLoc)) {
-
- CompositeLocation argLocalCompositeLocation = callerMapLocToCompLoc.get(argLocalLoc);
- CompositeLocation argCompLoc = argLocalCompositeLocation.clone();
- for (int i = 1; i < argLocTuple.size(); i++) {
- argCompLoc.addLocation(argLocTuple.get(i));
- }
-
- FlowNode calleeParamFlowNode = calleeFlowGraph.getParamFlowNode(idx);
-
- System.out
- .println("----- argLocTuple=" + argLocTuple + " argLocalLoc=+" + argLocalLoc);
- System.out.println("-------need to translate argCompLoc=" + argCompLoc
- + " with baseTuple=" + methodInvokeBaseLocTuple + " calleeParamLocTuple="
- + calleeParamFlowNode);
-
- // CompositeLocation paramCompLoc = translateArgCompLocToParamCompLoc(min, argCompLoc);
- // calleeParamFlowNode.setCompositeLocation(paramCompLoc);
-
- // if (baseLocTuple != null && callerCompLoc.getTuple().startsWith(baseLocTuple)) {
- //
- // FlowNode calleeParamFlowNode = calleeFlowGraph.getParamFlowNode(idx);
- // NTuple<Descriptor> calleeParamDescTuple = calleeParamFlowNode.getDescTuple();
- // NTuple<Location> calleeParamLocTuple
- // =###translateCompositeLocationAssignmentToFlowGraph mdCaller=public static void
- // huffcodetab.huffman_decoder(int htIdx, int x, BitReserve br)
-
- // translateToLocTuple(mdCallee, calleeParamDescTuple);
- //
- // 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("---callee loc=" + calleeParamLocTuple.get(0)
- // + " newCalleeCompLoc=" + newCalleeCompLoc);
- //
- // // System.out.println("###need to assign composite location to=" +
- // // calleeParamDescTuple
- // // + " with baseTuple=" + baseLocTuple);
- // }
-
- }
- }
- }
}
- // ////////////////
- // ////////////////
for (Iterator iterator = calleeSet.iterator(); iterator.hasNext();) {
MethodDescriptor callee = (MethodDescriptor) iterator.next();
translateCompositeLocationAssignmentToFlowGraph(callee);
}
- // for (Iterator iterator = minSet.iterator(); iterator.hasNext();) {
- // MethodInvokeNode min = (MethodInvokeNode) iterator.next();
- // // add an additional ordering constraint
- // // if the first element of a parameter composite location matches 'this' reference,
- // // the corresponding argument in the caller is required to be higher than the translated
- // // parameter location in the caller lattice
- // // TODO
- // // addOrderingConstraintFromCompLocParamToArg(mdCaller, min);
- // }
-
}
private CompositeLocation translateArgCompLocToParamCompLoc(MethodInvokeNode min,
// 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);
+ // System.out.println("----------found paramNode=" + paramNode);
NTuple<Descriptor> paramDescTuple = paramNode.getCurrentDescTuple();
NTuple<Location> newParamTupleFromArgTuple = translateToLocTuple(mdCallee, paramDescTuple);
newParamTupleFromArgTuple.add(argLocTuple.get(i));
}
- System.out.println("-----------newParamTuple=" + newParamTupleFromArgTuple);
+ // System.out.println("-----------newParamTuple=" + newParamTupleFromArgTuple);
return new CompositeLocation(newParamTupleFromArgTuple);
}
//
// update return flow nodes in the caller
CompositeLocation returnLoc = getMethodSummary(mdCallee).getRETURNLoc();
-
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);
NTuple<Location> returnLocTuple = returnLoc.getTuple();
NTuple<Descriptor> baseTuple = mapMethodInvokeNodeToBaseTuple.get(min);
+ System.out.println("###basetuple=" + baseTuple);
NTuple<Descriptor> newReturnTuple = baseTuple.clone();
for (int i = 1; i < returnLocTuple.size(); i++) {
newReturnTuple.add(returnLocTuple.get(i).getLocDescriptor());
}
System.out.println("###NEW RETURN TUPLE FOR CALLER=" + newReturnTuple);
+
+ FlowReturnNode holderNode = callerFlowGraph.getFlowReturnNode(min);
+ NodeTupleSet holderTupleSet =
+ getNodeTupleSetFromReturnNode(getFlowGraph(mdCaller), holderNode);
+
callerFlowGraph.getFlowReturnNode(min).setNewTuple(newReturnTuple);
+
+ // then need to remove old constraints
+ // TODO SAT
+ System.out.println("###REMOVE OLD CONSTRAINTS=" + holderNode);
+ for (Iterator<NTuple<Descriptor>> iter = holderTupleSet.iterator(); iter.hasNext();) {
+ NTuple<Descriptor> tupleFromHolder = iter.next();
+ Set<FlowEdge> holderOutEdge = callerFlowGraph.getOutEdgeSet(holderNode);
+ for (Iterator iterator2 = holderOutEdge.iterator(); iterator2.hasNext();) {
+ FlowEdge outEdge = (FlowEdge) iterator2.next();
+ NTuple<Descriptor> toberemovedTuple = outEdge.getEndTuple();
+ // System.out.println("---remove " + tupleFromHolder + " -> " + toberemovedTuple);
+ callerFlowGraph.removeEdge(tupleFromHolder, toberemovedTuple);
+ }
+ }
+
+ } else {
+ // if the return loc set was empty and later pcloc was connected to the return loc
+ // need to make sure that return loc reflects to this changes.
+ FlowReturnNode flowReturnNode = callerFlowGraph.getFlowReturnNode(min);
+ if (flowReturnNode != null && flowReturnNode.getReturnTupleSet().isEmpty()) {
+
+ if (needToUpdateReturnLocHolder(min.getMethod(), flowReturnNode)) {
+ NTuple<Descriptor> baseTuple = mapMethodInvokeNodeToBaseTuple.get(min);
+ NTuple<Descriptor> newReturnTuple = baseTuple.clone();
+ flowReturnNode.addTuple(newReturnTuple);
+ }
+
+ }
+
}
}
}
+ private boolean needToUpdateReturnLocHolder(MethodDescriptor mdCallee,
+ FlowReturnNode flowReturnNode) {
+ FlowGraph fg = getFlowGraph(mdCallee);
+ MethodSummary summary = getMethodSummary(mdCallee);
+ CompositeLocation returnCompLoc = summary.getRETURNLoc();
+ NTuple<Descriptor> returnDescTuple = translateToDescTuple(returnCompLoc.getTuple());
+ Set<FlowNode> incomingNodeToReturnNode =
+ fg.getIncomingFlowNodeSet(fg.getFlowNode(returnDescTuple));
+ for (Iterator iterator = incomingNodeToReturnNode.iterator(); iterator.hasNext();) {
+ FlowNode inNode = (FlowNode) iterator.next();
+ if (inNode.getDescTuple().get(0).equals(mdCallee.getThis())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private void addMapMethodDescToMethodInvokeNodeSet(MethodInvokeNode min) {
MethodDescriptor md = min.getMethod();
if (!mapMethodDescToMethodInvokeNodeSet.containsKey(md)) {
+ "-> globalParamLocTu!globalArgLocTuple.get(0).getLocDescriptor().equals(LITERALDESC)ple="
+ globalParamLocTuple);
hasChanges = true;
+
globalGraph.addValueFlowEdge(pcLocTuple, globalParamLocTuple);
}
}
System.out.println("generateCompositeLocation=" + nodeDescTuple + " with inferCompLoc="
+ inferCompLoc);
+ MethodDescriptor md = (MethodDescriptor) inferCompLoc.get(0).getDescriptor();
+
CompositeLocation newCompLoc = new CompositeLocation();
for (int i = 0; i < inferCompLoc.getSize(); i++) {
newCompLoc.addLocation(inferCompLoc.get(i));
Descriptor lastDescOfPrefix = nodeDescTuple.get(0);
Descriptor enclosingDescriptor;
if (lastDescOfPrefix instanceof InterDescriptor) {
- enclosingDescriptor = null;
+ enclosingDescriptor = getFlowGraph(md).getEnclosingDescriptor(lastDescOfPrefix);
} else {
enclosingDescriptor = ((VarDescriptor) lastDescOfPrefix).getType().getClassDesc();
}
baseLocTuple = translateToLocTuple(mdCaller, mapMethodInvokeNodeToBaseTuple.get(min));
}
- System.out.println("\n-#translate caller=" + mdCaller + " infer composite loc to callee="
- + mdCallee + " baseLocTuple=" + baseLocTuple);
- // System.out.println("-mapIdxToArgTuple=" + mapIdxToArgTuple);
- // System.out.println("-callerMapLocToCompLoc=" + callerMapLocToCompLoc);
+ // System.out.println("\n-#translate caller=" + mdCaller + " infer composite loc to callee="
+ // + mdCallee + " baseLocTuple=" + baseLocTuple);
Set<Location> keySet = callerMapLocToCompLoc.keySet();
for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
translateCompositeLocationToCallee(callerCompLoc, baseLocTuple, mdCallee);
calleeGlobalGraph.addMapLocationToInferCompositeLocation(key, newCalleeCompLoc);
- // System.out.println("---key=" + key + " callerCompLoc=" + callerCompLoc
+ // System.out.println("1---key=" + key + " callerCompLoc=" + callerCompLoc
// + " newCalleeCompLoc=" + newCalleeCompLoc);
- // System.out.println("-----baseLoctuple=" + baseLocTuple);
// System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
+ if (!newCalleeCompLoc.get(0).getDescriptor().equals(mdCallee)) {
+ System.exit(0);
+ }
+
+ // System.out.println("-----baseLoctuple=" + baseLocTuple);
} else {
// check if it is the global access
Location compLocFirstElement = callerCompLoc.getTuple().get(0);
newCalleeCompLoc.addLocation(callerCompLoc.get(i));
}
calleeGlobalGraph.addMapLocationToInferCompositeLocation(key, newCalleeCompLoc);
- // System.out.println("---key=" + key + " callerCompLoc=" + callerCompLoc
+ // System.out.println("2---key=" + key + " callerCompLoc=" + callerCompLoc
// + " newCalleeCompLoc=" + newCalleeCompLoc);
// System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
} else {
int paramIdx = getParamIdx(callerCompLoc, mapIdxToArgTuple);
if (paramIdx == -1) {
- System.out.println("*****key=" + key + " callerCompLoc=" + callerCompLoc);
+ // here, the first element of the current composite location comes from the current
+ // callee
+ // so transfer the same composite location to the callee
if (!calleeGlobalGraph.contrainsInferCompositeLocationMapKey(key)) {
- calleeGlobalGraph.addMapLocationToInferCompositeLocation(key, callerCompLoc);
+ if (callerCompLoc.get(0).getDescriptor().equals(mdCallee)) {
+ // System.out.println("3---key=" + key + " callerCompLoc=" + callerCompLoc
+ // + " newCalleeCompLoc=" + callerCompLoc);
+ // System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
+ calleeGlobalGraph.addMapLocationToInferCompositeLocation(key, callerCompLoc);
+ } else {
+ // System.out.println("3---SKIP key=" + key + " callerCompLoc=" + callerCompLoc);
+ }
}
continue;
}
+
+ // It is the case where two parameters have relative orderings between them by having
+ // composite locations
+ // if we found the param idx, it means that the first part of the caller composite
+ // location corresponds to the one of arguments.
+ // for example, if the caller argument is <<caller.this>,<Decoder.br>>
+ // and the current caller composite location mapping
+ // <<caller.this>,<Decoder.br>,<Br.value>>
+ // and the parameter which matches with the caller argument is 'Br brParam'
+ // then, the translated callee composite location will be <<callee.brParam>,<Br.value>>
NTuple<Descriptor> argTuple = mapIdxToArgTuple.get(paramIdx);
FlowNode paramFlowNode = calleeFlowGraph.getParamFlowNode(paramIdx);
newCalleeCompLoc.addLocation(callerCompLoc.get(i));
}
calleeGlobalGraph.addMapLocationToInferCompositeLocation(key, newCalleeCompLoc);
- System.out.println("---key=" + key + " callerCompLoc=" + callerCompLoc
- + " newCalleeCompLoc=" + newCalleeCompLoc);
- System.out.println("-----argTuple=" + argTuple + " caller=" + mdCaller + " callee="
- + mdCallee);
- System.out.println("-----paramIdx=" + paramIdx + " paramFlowNode=" + paramFlowNode);
+ // System.out.println("4---key=" + key + " callerCompLoc=" + callerCompLoc
+ // + " newCalleeCompLoc=" + newCalleeCompLoc);
+ // System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
}
}
}
- // System.out.println("-----*AFTER TRANSLATING COMP LOC MAPPING, CALLEE MAPPING="
- // + calleeGlobalGraph.getMapLocationToInferCompositeLocation());
-
System.out.println("#ASSIGN COMP LOC TO CALLEE PARAMS: callee=" + mdCallee + " caller="
+ mdCaller);
// If the location of an argument has a composite location
calleeGlobalGraph.addMapLocationToInferCompositeLocation(calleeParamLocTuple.get(0),
newCalleeCompLoc);
+ calleeParamFlowNode.setCompositeLocation(newCalleeCompLoc);
System.out.println("-----------key=" + calleeParamLocTuple.get(0) + " callerCompLoc="
+ callerCompLoc + " newCalleeCompLoc=" + newCalleeCompLoc);
+ } else {
+ CompositeLocation newCalleeCompLoc =
+ calculateCompositeLocationFromSubGlobalGraph(mdCallee, calleeParamFlowNode);
+ if (newCalleeCompLoc != null) {
+ calleeGlobalGraph.addMapLocationToInferCompositeLocation(calleeParamLocTuple.get(0),
+ newCalleeCompLoc);
+ calleeParamFlowNode.setCompositeLocation(newCalleeCompLoc);
+ }
}
System.out.println("-----------------calleeParamFlowNode="
}
+ private CompositeLocation calculateCompositeLocationFromSubGlobalGraph(MethodDescriptor md,
+ FlowNode paramNode) {
+
+ System.out.println("#############################################################");
+ System.out.println("calculateCompositeLocationFromSubGlobalGraph=" + paramNode);
+
+ GlobalFlowGraph subGlobalFlowGraph = getSubGlobalFlowGraph(md);
+ NTuple<Location> paramLocTuple = translateToLocTuple(md, paramNode.getDescTuple());
+ GlobalFlowNode paramGlobalNode = subGlobalFlowGraph.getFlowNode(paramLocTuple);
+
+ List<NTuple<Location>> prefixList = calculatePrefixList(subGlobalFlowGraph, paramGlobalNode);
+
+ Location prefixLoc = paramLocTuple.get(0);
+
+ Set<GlobalFlowNode> reachableNodeSet =
+ subGlobalFlowGraph.getReachableNodeSetByPrefix(paramGlobalNode.getLocTuple().get(0));
+ // Set<GlobalFlowNode> reachNodeSet = globalFlowGraph.getReachableNodeSetFrom(node);
+
+ // System.out.println("node=" + node + " prefixList=" + prefixList);
+
+ for (int i = 0; i < prefixList.size(); i++) {
+ NTuple<Location> curPrefix = prefixList.get(i);
+ Set<NTuple<Location>> reachableCommonPrefixSet = new HashSet<NTuple<Location>>();
+
+ for (Iterator iterator2 = reachableNodeSet.iterator(); iterator2.hasNext();) {
+ GlobalFlowNode reachNode = (GlobalFlowNode) iterator2.next();
+ if (reachNode.getLocTuple().startsWith(curPrefix)) {
+ reachableCommonPrefixSet.add(reachNode.getLocTuple());
+ }
+ }
+ // System.out.println("reachableCommonPrefixSet=" + reachableCommonPrefixSet);
+
+ if (!reachableCommonPrefixSet.isEmpty()) {
+
+ MethodDescriptor curPrefixFirstElementMethodDesc =
+ (MethodDescriptor) curPrefix.get(0).getDescriptor();
+
+ MethodDescriptor nodePrefixLocFirstElementMethodDesc =
+ (MethodDescriptor) prefixLoc.getDescriptor();
+
+ // System.out.println("curPrefixFirstElementMethodDesc=" +
+ // curPrefixFirstElementMethodDesc);
+ // System.out.println("nodePrefixLocFirstElementMethodDesc="
+ // + nodePrefixLocFirstElementMethodDesc);
+
+ if (curPrefixFirstElementMethodDesc.equals(nodePrefixLocFirstElementMethodDesc)
+ || isTransitivelyCalledFrom(nodePrefixLocFirstElementMethodDesc,
+ curPrefixFirstElementMethodDesc)) {
+
+ // TODO
+ // if (!node.getLocTuple().startsWith(curPrefix.get(0))) {
+
+ Location curPrefixLocalLoc = curPrefix.get(0);
+ if (subGlobalFlowGraph.mapLocationToInferCompositeLocation.containsKey(curPrefixLocalLoc)) {
+ // in this case, the local variable of the current prefix has already got a composite
+ // location
+ // so we just ignore the current composite location.
+
+ // System.out.println("HERE WE DO NOT ASSIGN A COMPOSITE LOCATION TO =" + node
+ // + " DUE TO " + curPrefix);
+ return null;
+ }
+
+ if (!needToGenerateCompositeLocation(paramGlobalNode, 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);
+
+ // makes sure that a newly generated location appears in the hierarchy graph
+ for (int compIdx = 0; compIdx < newCompLoc.getSize(); compIdx++) {
+ Location curLoc = newCompLoc.get(compIdx);
+ getHierarchyGraph(curLoc.getDescriptor()).getHNode(curLoc.getLocDescriptor());
+ }
+
+ subGlobalFlowGraph.addMapLocationToInferCompositeLocation(targetLocalLoc, newCompLoc);
+
+ return newCompLoc;
+
+ }
+
+ }
+
+ }
+ return null;
+ }
+
private int getParamIdx(CompositeLocation compLoc,
Map<Integer, NTuple<Descriptor>> mapIdxToArgTuple) {
// Set<GlobalFlowNode> reachNodeSet = globalFlowGraph.getReachableNodeSetFrom(node);
// System.out.println("node=" + node + " prefixList=" + prefixList);
+ System.out.println("---prefixList=" + prefixList);
- for (int i = 0; i < prefixList.size(); i++) {
+ nextprefix: for (int i = 0; i < prefixList.size(); i++) {
NTuple<Location> curPrefix = prefixList.get(i);
+ System.out.println("---curPrefix=" + curPrefix);
Set<NTuple<Location>> reachableCommonPrefixSet = new HashSet<NTuple<Location>>();
for (Iterator iterator2 = reachableNodeSet.iterator(); iterator2.hasNext();) {
+ curPrefix);
// System.out.println("prefixList=" + prefixList);
// System.out.println("reachableNodeSet=" + reachableNodeSet);
- continue next;
+ continue nextprefix;
}
Location targetLocalLoc = node.getLocTuple().get(0);
MethodDescriptor md = (MethodDescriptor) targetLocalLoc.getDescriptor();
FlowGraph flowGraph = getFlowGraph(md);
+
FlowNode flowNode = flowGraph.getFlowNode(node.getDescTuple());
Set<FlowNode> reachableSet = flowGraph.getReachFlowNodeSetFrom(flowNode);
+ Set<FlowNode> paramNodeSet = flowGraph.getParamFlowNodeSet();
+ for (Iterator iterator = paramNodeSet.iterator(); iterator.hasNext();) {
+ FlowNode paramFlowNode = (FlowNode) iterator.next();
+ if (curPrefix.startsWith(translateToLocTuple(md, paramFlowNode.getDescTuple()))) {
+ return true;
+ }
+ }
+
if (targetLocalLoc.getLocDescriptor() instanceof InterDescriptor) {
Pair<MethodInvokeNode, Integer> pair =
((InterDescriptor) targetLocalLoc.getLocDescriptor()).getMethodArgIdxPair();
}
- if (mapMethodDescriptorToCompositeReturnCase.containsKey(md)) {
- boolean hasCompReturnLocWithThis =
- mapMethodDescriptorToCompositeReturnCase.get(md).booleanValue();
+ GlobalFlowGraph subGlobalFlowGraph = getSubGlobalFlowGraph(md);
+ Set<GlobalFlowNode> subGlobalReachableSet = subGlobalFlowGraph.getReachableNodeSetFrom(node);
- if (hasCompReturnLocWithThis) {
+ if (!md.isStatic()) {
+ ClassDescriptor currentMethodThisType = getClassTypeDescriptor(md.getThis());
+ 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);
+
+ if (mapMethodDescriptorToCompositeReturnCase.containsKey(md)) {
+ boolean hasCompReturnLocWithThis =
+ mapMethodDescriptorToCompositeReturnCase.get(md).booleanValue();
+ if (hasCompReturnLocWithThis) {
+ if (checkNodeReachToReturnNode(md, flowNode)) {
+ return true;
+ }
+ }
+ }
- if (checkNodeReachToReturnNode(md, flowNode)) {
- return true;
+ for (Iterator iterator3 = subGlobalReachableSet.iterator(); iterator3.hasNext();) {
+ GlobalFlowNode subGlobalReachalbeNode = (GlobalFlowNode) iterator3.next();
+ if (subGlobalReachalbeNode.getLocTuple().get(0).getLocDescriptor().equals(md.getThis())) {
+ System.out.println("PREFIX FOUND=" + subGlobalReachalbeNode);
+ return true;
+ }
+ }
}
-
- // for (Iterator iterator = flowGraph.getReturnNodeSet().iterator(); iterator.hasNext();) {
- // FlowNode returnFlowNode = (FlowNode) iterator.next();
- // if (reachableSet.contains(returnFlowNode)) {
- // return true;
- // }
- // }
}
-
}
- // System.out.println("flowGraph.getReturnNodeSet()=" + flowGraph.getReturnNodeSet());
- // System.out.println("flowGraph.contains(node.getDescTuple())="
- // + flowGraph.contains(node.getDescTuple()) + " flowGraph.getFlowNode(node.getDescTuple())="
- // + flowGraph.getFlowNode(node.getDescTuple()));reachableSet
-
- // if (flowGraph.contains(node.getDescTuple())
- // && flowGraph.getReturnNodeSet().contains(flowGraph.getFlowNode(node.getDescTuple()))) {
- // // return checkFlowNodeReturnThisField(flowGraph);
- // }
-
Location lastLocationOfPrefix = curPrefix.get(curPrefix.size() - 1);
// check whether prefix appears in the list of parameters
Set<MethodInvokeNode> minSet = mapMethodDescToMethodInvokeNodeSet.get(md);
MethodInvokeNode min = (MethodInvokeNode) iterator.next();
Map<Integer, NTuple<Descriptor>> map = mapMethodInvokeNodeToArgIdxMap.get(min);
Set<Integer> keySet = map.keySet();
- System.out.println("min=" + min.printNode(0));
+ // System.out.println("min=" + min.printNode(0));
+
for (Iterator iterator2 = keySet.iterator(); iterator2.hasNext();) {
Integer argIdx = (Integer) iterator2.next();
NTuple<Descriptor> argTuple = map.get(argIdx);
- if (argTuple.get(argTuple.size() - 1).equals(lastLocationOfPrefix.getLocDescriptor())) {
- NTuple<Location> locTuple =
- translateToLocTuple(md, flowGraph.getParamFlowNode(argIdx).getDescTuple());
- lastLocationOfPrefix = locTuple.get(0);
- break found;
- }
- }
- }
- ClassDescriptor cd;
- if (lastLocationOfPrefix.getLocDescriptor() instanceof VarDescriptor) {
- cd = ((VarDescriptor) lastLocationOfPrefix.getLocDescriptor()).getType().getClassDesc();
- } else {
- // it is a field descriptor
- cd = ((FieldDescriptor) lastLocationOfPrefix.getLocDescriptor()).getType().getClassDesc();
- }
-
- GlobalFlowGraph subGlobalFlowGraph = getSubGlobalFlowGraph(md);
- Set<GlobalFlowNode> subGlobalReachableSet = subGlobalFlowGraph.getReachableNodeSetFrom(node);
-
- for (Iterator iterator2 = subGlobalReachableSet.iterator(); iterator2.hasNext();) {
- GlobalFlowNode subGlobalReachalbeNode = (GlobalFlowNode) iterator2.next();
- // NTuple<Location> locTuple = translateToLocTuple(md, reachalbeNode.getDescTuple());
- NTuple<Location> locTuple = subGlobalReachalbeNode.getLocTuple();
-
- for (int i = 0; i < locTuple.size(); i++) {
- if (locTuple.get(i).equals(lastLocationOfPrefix)) {
- return true;
+ if (!(!md.isStatic() && argIdx == 0)) {
+ // if the argTuple is empty, we don't need to do with anything(LITERAL CASE).
+ if (argTuple.size() > 0
+ && argTuple.get(argTuple.size() - 1).equals(lastLocationOfPrefix.getLocDescriptor())) {
+ NTuple<Location> locTuple =
+ translateToLocTuple(md, flowGraph.getParamFlowNode(argIdx).getDescTuple());
+ lastLocationOfPrefix = locTuple.get(0);
+ 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);
+ return true;
+ }
+ }
+ }
+ }
}
}
- Location lastLoc = locTuple.get(locTuple.size() - 1);
- Descriptor enclosingDescriptor = lastLoc.getDescriptor();
-
- if (enclosingDescriptor != null && enclosingDescriptor.equals(cd)) {
- System.out.println("# WHY HERE?");
- System.out.println("subGlobalReachalbeNode="+subGlobalReachalbeNode);
- return true;
- }
}
return false;
Set<GlobalFlowNode> incomingNodeSetPrefix =
graph.getIncomingNodeSetByPrefix(node.getLocTuple().get(0));
- System.out.println("---incomingNodeSetPrefix=" + incomingNodeSetPrefix);
+ // System.out.println("---incomingNodeSetPrefix=" + incomingNodeSetPrefix);
Set<GlobalFlowNode> reachableNodeSetPrefix =
graph.getReachableNodeSetByPrefix(node.getLocTuple().get(0));
- System.out.println("---reachableNodeSetPrefix=" + reachableNodeSetPrefix);
+ // System.out.println("---reachableNodeSetPrefix=" + reachableNodeSetPrefix);
List<NTuple<Location>> prefixList = new ArrayList<NTuple<Location>>();
}
});
- // remove a prefix which is not suitable for generating composite location
- Location localVarLoc = node.getLocTuple().get(0);
- MethodDescriptor md = (MethodDescriptor) localVarLoc.getDescriptor();
- ClassDescriptor cd = md.getClassDesc();
-
- int idx = 0;
- Set<NTuple<Location>> toberemoved = new HashSet<NTuple<Location>>();
- // for (int i = 0; i < prefixList.size(); i++) {
- // NTuple<Location> prefixLocTuple = prefixList.get(i);
- // if (!containsClassDesc(cd, prefixLocTuple)) {
- // toberemoved.add(prefixLocTuple);
- // }
- // }
+ return prefixList;
- // System.out.println("method class=" + cd + " toberemoved=" + toberemoved);
+ }
- prefixList.removeAll(toberemoved);
+ private CompositeLocation calculateCompositeLocationFromFlowGraph(MethodDescriptor md,
+ FlowNode node) {
- return prefixList;
+ System.out.println("#############################################################");
+ System.out.println("calculateCompositeLocationFromFlowGraph=" + node);
- // List<NTuple<Location>> prefixList = new ArrayList<NTuple<Location>>();
- //
- // for (Iterator iterator = incomingNodeSet.iterator(); iterator.hasNext();) {
- // GlobalFlowNode inNode = (GlobalFlowNode) iterator.next();
- // NTuple<Location> inNodeTuple = inNode.getLocTuple();
- //
- // for (int i = 1; i < inNodeTuple.size(); i++) {
- // NTuple<Location> prefix = inNodeTuple.subList(0, i);
- // if (!prefixList.contains(prefix)) {
- // prefixList.add(prefix);
- // }
- // }
- // }
+ FlowGraph flowGraph = getFlowGraph(md);
+ // NTuple<Location> paramLocTuple = translateToLocTuple(md, paramNode.getDescTuple());
+ // GlobalFlowNode paramGlobalNode = subGlobalFlowGraph.getFlowNode(paramLocTuple);
+
+ List<NTuple<Location>> prefixList = calculatePrefixListFlowGraph(flowGraph, node);
+
+ // Set<GlobalFlowNode> reachableNodeSet =
+ // subGlobalFlowGraph.getReachableNodeSetByPrefix(paramGlobalNode.getLocTuple().get(0));
//
- // Collections.sort(prefixList, new Comparator<NTuple<Location>>() {
- // public int compare(NTuple<Location> arg0, NTuple<Location> arg1) {
- // int s0 = arg0.size();
- // int s1 = arg1.size();
- // if (s0 > s1) {
- // return -1;
- // } else if (s0 == s1) {
- // return 0;
- // } else {
- // return 1;
- // }
- // }
- // });
- // return prefixList;
+ Set<FlowNode> reachableNodeSet =
+ flowGraph.getReachableSetFrom(node.getDescTuple().subList(0, 1));
+
+ // Set<GlobalFlowNode> reachNodeSet = globalFlowGraph.getReachableNodeSetFrom(node);
+
+ // System.out.println("node=" + node + " prefixList=" + prefixList);
+
+ for (int i = 0; i < prefixList.size(); i++) {
+ NTuple<Location> curPrefix = prefixList.get(i);
+ Set<NTuple<Location>> reachableCommonPrefixSet = new HashSet<NTuple<Location>>();
+
+ for (Iterator iterator2 = reachableNodeSet.iterator(); iterator2.hasNext();) {
+ FlowNode reachNode = (FlowNode) iterator2.next();
+ NTuple<Location> reachLocTuple = translateToLocTuple(md, reachNode.getCurrentDescTuple());
+ if (reachLocTuple.startsWith(curPrefix)) {
+ reachableCommonPrefixSet.add(reachLocTuple);
+ }
+ }
+ // System.out.println("reachableCommonPrefixSet=" + reachableCommonPrefixSet);
+
+ if (!reachableCommonPrefixSet.isEmpty()) {
+
+ MethodDescriptor curPrefixFirstElementMethodDesc =
+ (MethodDescriptor) curPrefix.get(0).getDescriptor();
+
+ Location curPrefixLocalLoc = curPrefix.get(0);
+
+ Location targetLocalLoc = new Location(md, node.getDescTuple().get(0));
+ // Location targetLocalLoc = paramGlobalNode.getLocTuple().get(0);
+
+ CompositeLocation newCompLoc = generateCompositeLocation(curPrefix);
+ System.out.println("NEED2ASSIGN COMP LOC TO " + node + " with prefix=" + curPrefix);
+ System.out.println("-targetLocalLoc=" + targetLocalLoc + " - newCompLoc=" + newCompLoc);
+
+ node.setCompositeLocation(newCompLoc);
+
+ return newCompLoc;
+
+ }
+
+ }
+ return null;
+ }
+
+ private List<NTuple<Location>> calculatePrefixListFlowGraph(FlowGraph graph, FlowNode node) {
+
+ System.out.println("\n##### calculatePrefixList node=" + node);
+
+ MethodDescriptor md = graph.getMethodDescriptor();
+ Set<FlowNode> incomingNodeSetPrefix =
+ graph.getIncomingNodeSetByPrefix(node.getDescTuple().get(0));
+ // System.out.println("---incomingNodeSetPrefix=" + incomingNodeSetPrefix);
+
+ Set<FlowNode> reachableNodeSetPrefix =
+ graph.getReachableSetFrom(node.getDescTuple().subList(0, 1));
+ // System.out.println("---reachableNodeSetPrefix=" + reachableNodeSetPrefix);
+
+ List<NTuple<Location>> prefixList = new ArrayList<NTuple<Location>>();
+
+ for (Iterator iterator = incomingNodeSetPrefix.iterator(); iterator.hasNext();) {
+ FlowNode inNode = (FlowNode) iterator.next();
+ NTuple<Location> inNodeTuple = translateToLocTuple(md, inNode.getCurrentDescTuple());
+
+ // if (inNodeTuple.get(0).getLocDescriptor() instanceof InterDescriptor
+ // || inNodeTuple.get(0).getLocDescriptor().equals(GLOBALDESC)) {
+ // continue;
+ // }
+
+ for (int i = 1; i < inNodeTuple.size(); i++) {
+ NTuple<Location> prefix = inNodeTuple.subList(0, i);
+ if (!prefixList.contains(prefix)) {
+ prefixList.add(prefix);
+ }
+ }
+ }
+
+ Collections.sort(prefixList, new Comparator<NTuple<Location>>() {
+ public int compare(NTuple<Location> arg0, NTuple<Location> arg1) {
+ int s0 = arg0.size();
+ int s1 = arg1.size();
+ if (s0 > s1) {
+ return -1;
+ } else if (s0 == s1) {
+ return 0;
+ } else {
+ return 1;
+ }
+ }
+ });
+
+ return prefixList;
+
}
private boolean containsClassDesc(ClassDescriptor cd, NTuple<Location> prefixLocTuple) {
// here only keep the first element(method location) of the descriptor
// tuple
NTuple<Location> srcLocTuple = translateToLocTuple(md, srcDescTuple);
- // Location srcMethodLoc = srcLocTuple.get(0);
- // Descriptor srcVarDesc = srcMethodLoc.getLocDescriptor();
- // // if (flowGraph.isParamDesc(srcVarDesc) &&
- // (!srcVarDesc.equals(md.getThis()))) {
- // if (!srcVarDesc.equals(md.getThis())) {
- // srcLocTuple = new NTuple<Location>();
- // Location loc = new Location(md, srcVarDesc);
- // srcLocTuple.add(loc);
- // }
- //
NTuple<Location> dstLocTuple = translateToLocTuple(md, dstDescTuple);
- // Location dstMethodLoc = dstLocTuple.get(0);
- // Descriptor dstVarDesc = dstMethodLoc.getLocDescriptor();
- // if (!dstVarDesc.equals(md.getThis())) {
- // dstLocTuple = new NTuple<Location>();
- // Location loc = new Location(md, dstVarDesc);
- // dstLocTuple.add(loc);
- // }
globalGraph.addValueFlowEdge(srcLocTuple, dstLocTuple);
NTuple<Location> locTuple = new NTuple<Location>();
Descriptor enclosingDesc = md;
- // System.out.println("md=" + md + " descTuple=" + descTuple);
for (int i = 0; i < descTuple.size(); i++) {
Descriptor desc = descTuple.get(i);
} else if (desc instanceof FieldDescriptor) {
enclosingDesc = ((FieldDescriptor) desc).getType().getClassDesc();
} else {
- // TODO: inter descriptor case
enclosingDesc = desc;
}
for (Iterator iterator = calleeNodeSet.iterator(); iterator.hasNext();) {
GlobalFlowNode calleeNode = (GlobalFlowNode) iterator.next();
if (calleeNode.isParamNodeWithIncomingFlows()) {
+ System.out.println("calleeNode.getLocTuple()" + calleeNode.getLocTuple());
NTuple<Location> callerSrcNodeLocTuple =
translateToCallerLocTuple(min, possibleMdCallee, mdCaller, calleeNode.getLocTuple());
System.out.println("---callerSrcNodeLocTuple=" + callerSrcNodeLocTuple);
if (callerSrcNodeLocTuple != null && callerSrcNodeLocTuple.size() > 0) {
for (Iterator iterator2 = pcLocTupleSet.iterator(); iterator2.hasNext();) {
NTuple<Location> pcLocTuple = (NTuple<Location>) iterator2.next();
+
callerSubGlobalGraph.addValueFlowEdge(pcLocTuple, callerSrcNodeLocTuple);
}
}
}
- private void addValueFlowBetweenParametersToCaller(MethodInvokeNode min,
- MethodDescriptor mdCaller, MethodDescriptor mdCallee) {
-
- System.out.println("***addValueFlowBetweenParametersToCaller from mdCallee=" + mdCallee);
-
- Set<NTuple<Location>> PCLocTupleSet = mapMethodInvokeNodeToPCLocTupleSet.get(min);
- System.out.println("-PCLocTupleSet=" + PCLocTupleSet);
-
- GlobalFlowGraph calleeSubGlobalGraph = getSubGlobalFlowGraph(mdCallee);
- GlobalFlowGraph callerSubGlobalGraph = getSubGlobalFlowGraph(mdCaller);
-
- // if the parameter A reaches to the parameter B
- // then, add an edge the argument A -> the argument B to the global flow graph
- FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
- FlowGraph callerFlowGraph = getFlowGraph(mdCaller);
- int numParam = calleeFlowGraph.getNumParameters();
-
- for (int i = 0; i < numParam; i++) {
- for (int k = 0; k < numParam; k++) {
-
- if (i != k) {
-
- System.out.println("i=" + i + " k=" + k);
-
- FlowNode paramNode1 = calleeFlowGraph.getParamFlowNode(i);
- FlowNode paramNode2 = calleeFlowGraph.getParamFlowNode(k);
-
- NTuple<Descriptor> arg1Tuple = getNodeTupleByArgIdx(min, i);
- NTuple<Descriptor> arg2Tuple = getNodeTupleByArgIdx(min, k);
-
- NTuple<Descriptor> paramDescTuple1 = paramNode1.getCurrentDescTuple();
- NTuple<Descriptor> paramDescTuple2 = paramNode2.getCurrentDescTuple();
-
- if (paramDescTuple1.get(0).equals(paramDescTuple2.get(0))) {
- // if two parameters share the same prefix
- // it already has been assigned to a composite location
- // so we don't need to add an additional ordering relation caused by these two
- // paramters.
- continue;
- }
-
- NTuple<Location> paramLocTuple1 = translateToLocTuple(mdCallee, paramDescTuple1);
- NTuple<Location> paramLocTuple2 = translateToLocTuple(mdCallee, paramDescTuple2);
-
- // check if the callee propagates an ordering constraints through
- // parameters
-
- // Set<FlowNode> localReachSet = calleeFlowGraph.getLocalReachFlowNodeSetFrom(paramNode1);
-
- Set<GlobalFlowNode> reachToParam1Set =
- calleeSubGlobalGraph.getIncomingNodeSetByPrefix(paramLocTuple1.get(0));
-
- // System.out.println("-- localReachSet from param1=" + localReachSet);
-
- GlobalFlowNode globalFlowNodeParam1 = calleeSubGlobalGraph.getFlowNode(paramLocTuple1);
- GlobalFlowNode globalFlowNodeParam2 = calleeSubGlobalGraph.getFlowNode(paramLocTuple2);
-
- System.out.println("-param1CurTuple=" + paramDescTuple1 + " param2CurTuple="
- + paramDescTuple2);
-
- System.out.println("arg1Tuple=" + arg1Tuple + " arg2Tuple=" + arg2Tuple);
- // System.out.println("-reachToParam1Set=" + reachToParam1Set);
-
- if (arg1Tuple.size() > 0 && arg2Tuple.size() > 0
- && reachToParam1Set.contains(globalFlowNodeParam2)) {
- // need to propagate an ordering relation s.t. arg1 is higher
- // than arg2
- System.out.println("---param1=" + paramNode1 + " is higher than param2=" + paramNode2);
-
- NTuple<Location> callerSrcNodeLocTuple =
- translateToCallerLocTuple(min, mdCallee, mdCaller, paramLocTuple1);
-
- NTuple<Location> callerDstNodeLocTuple =
- translateToCallerLocTuple(min, mdCallee, mdCaller, paramLocTuple2);
-
- System.out.println("---callerSrcNodeLocTuple=" + callerSrcNodeLocTuple);
- System.out.println("---callerDstNodeLocTuple=" + callerDstNodeLocTuple);
-
- System.out.println("-----add global value flow :" + callerSrcNodeLocTuple + "->"
- + callerDstNodeLocTuple);
- callerSubGlobalGraph.addValueFlowEdge(callerSrcNodeLocTuple, callerDstNodeLocTuple);
- for (Iterator iterator = PCLocTupleSet.iterator(); iterator.hasNext();) {
- NTuple<Location> pcLocTuple = (NTuple<Location>) iterator.next();
- System.out.println("-----add global value flow PC :" + pcLocTuple + "->"
- + callerSrcNodeLocTuple);
- callerSubGlobalGraph.addValueFlowEdge(pcLocTuple, callerSrcNodeLocTuple);
- }
-
- // add a new flow between the corresponding arguments.
- callerFlowGraph.addValueFlowEdge(arg1Tuple, arg2Tuple);
- System.out.println("arg1=" + arg1Tuple + " arg2=" + arg2Tuple);
-
- // System.out
- // .println("-arg1Tuple=" + arg1Tuple + " is higher than arg2Tuple=" + arg2Tuple);
-
- }
-
- System.out.println();
- }
- }
- }
-
- }
-
private void addValueFlowFromCalleeNode(MethodInvokeNode min, MethodDescriptor mdCaller,
MethodDescriptor mdCallee, GlobalFlowNode calleeSrcNode) {
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) {
translateToCallerLocTuple(min, mdCallee, mdCaller, outNode.getLocTuple());
// System.out.println("outNode=" + outNode + " callerDstNodeLocTuple="
// + callerDstNodeLocTuple);
- if (callerDstNodeLocTuple != null) {
+ if (callerSrcNodeLocTuple != null && callerDstNodeLocTuple != null
+ && callerSrcNodeLocTuple.size() > 0 && callerDstNodeLocTuple.size() > 0) {
callerSubGlobalGraph.addValueFlowEdge(callerSrcNodeLocTuple, callerDstNodeLocTuple);
}
}
// this method will return the same nodeLocTuple if the corresponding argument is literal
// value.
- FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
+ // System.out.println("translateToCallerLocTuple=" + nodeLocTuple);
+ FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
NTuple<Descriptor> nodeDescTuple = translateToDescTuple(nodeLocTuple);
if (calleeFlowGraph.isParameter(nodeDescTuple)) {
int paramIdx = calleeFlowGraph.getParamIdx(nodeDescTuple);
// // the type of argument is primitive.
// return nodeLocTuple.clone();
// }
- System.out.println("paramIdx=" + paramIdx + " argDescTuple=" + argDescTuple);
+ // System.out.println("paramIdx=" + paramIdx + " argDescTuple=" + argDescTuple + " from min="
+ // + min.printNode(0));
NTuple<Location> argLocTuple = translateToLocTuple(mdCaller, argDescTuple);
NTuple<Location> callerLocTuple = new NTuple<Location>();
return false;
}
+ public static boolean isReference(Descriptor desc) {
+
+ if (desc instanceof FieldDescriptor) {
+
+ TypeDescriptor type = ((FieldDescriptor) desc).getType();
+ if (type.isArray()) {
+ return !type.isPrimitive();
+ } else {
+ return type.isPtr();
+ }
+
+ } else if (desc instanceof VarDescriptor) {
+ TypeDescriptor type = ((VarDescriptor) desc).getType();
+ if (type.isArray()) {
+ return !type.isPrimitive();
+ } else {
+ return type.isPtr();
+ }
+ }
+
+ return false;
+ }
+
private NTuple<Descriptor> translateToDescTuple(NTuple<Location> locTuple) {
NTuple<Descriptor> descTuple = new NTuple<Descriptor>();
FlowNode flowNode = flowGraph.getParamFlowNode(paramIdx);
CompositeLocation inferredCompLoc =
updateCompositeLocation(flowNode.getCompositeLocation());
- // NTuple<Descriptor> descTuple = flowNode.getDescTuple();
- //
- // CompositeLocation assignedCompLoc = flowNode.getCompositeLocation();
- // CompositeLocation inferredCompLoc;
- // if (assignedCompLoc != null) {
- // inferredCompLoc = translateCompositeLocation(assignedCompLoc);
- // } else {
- // Descriptor locDesc = descTuple.get(0);
- // Location loc = new Location(md, locDesc.getSymbol());
- // loc.setLocDescriptor(locDesc);
- // inferredCompLoc = new CompositeLocation(loc);
- // }
System.out.println("-paramIdx=" + paramIdx + " infer=" + inferredCompLoc + " original="
+ flowNode.getCompositeLocation());
private void constructHierarchyGraph() {
+ LinkedList<MethodDescriptor> methodDescList =
+ (LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
+
+ while (!methodDescList.isEmpty()) {
+ MethodDescriptor md = methodDescList.removeLast();
+ if (state.SSJAVADEBUG) {
+ HierarchyGraph hierarchyGraph = new HierarchyGraph(md);
+ System.out.println();
+ System.out.println("SSJAVA: Construcing the hierarchy graph from " + md);
+ constructHierarchyGraph(md, hierarchyGraph);
+ mapDescriptorToHierarchyGraph.put(md, hierarchyGraph);
+
+ }
+ }
+
+ setupToAnalyze();
+ while (!toAnalyzeIsEmpty()) {
+ ClassDescriptor cd = toAnalyzeNext();
+ HierarchyGraph graph = getHierarchyGraph(cd);
+ for (Iterator iter = cd.getFields(); iter.hasNext();) {
+ FieldDescriptor fieldDesc = (FieldDescriptor) iter.next();
+ if (!(fieldDesc.isStatic() && fieldDesc.isFinal())) {
+ graph.getHNode(fieldDesc);
+ }
+ }
+ }
+
+ Set<Descriptor> keySet = mapDescriptorToHierarchyGraph.keySet();
+ for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+ Descriptor key = (Descriptor) iterator.next();
+ HierarchyGraph graph = getHierarchyGraph(key);
+
+ Set<HNode> nodeToBeConnected = new HashSet<HNode>();
+ for (Iterator iterator2 = graph.getNodeSet().iterator(); iterator2.hasNext();) {
+ HNode node = (HNode) iterator2.next();
+ if (!node.isSkeleton() && !node.isCombinationNode()) {
+ if (graph.getIncomingNodeSet(node).size() == 0) {
+ nodeToBeConnected.add(node);
+ }
+ }
+ }
+
+ for (Iterator iterator2 = nodeToBeConnected.iterator(); iterator2.hasNext();) {
+ HNode node = (HNode) iterator2.next();
+ System.out.println("NEED TO BE CONNECTED TO TOP=" + node);
+ graph.addEdge(graph.getHNode(TOPDESC), node);
+ }
+
+ }
+
+ }
+
+ private void constructHierarchyGraph2() {
+
// do fixed-point analysis
LinkedList<MethodDescriptor> descriptorListToAnalyze = ssjava.getSortedDescriptors();
Set<FlowNode> sourceNodeSet = new HashSet<FlowNode>();
if (originalSrcNode instanceof FlowReturnNode) {
FlowReturnNode rnode = (FlowReturnNode) originalSrcNode;
- Set<NTuple<Descriptor>> tupleSet = rnode.getTupleSet();
+ 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));
sourceNodeSet.add(originalSrcNode);
}
- System.out.println("---sourceNodeSet=" + sourceNodeSet + " from originalSrcNode="
- + originalSrcNode);
+ // System.out.println("---sourceNodeSet=" + sourceNodeSet + " from originalSrcNode="
+ // + originalSrcNode);
for (Iterator iterator3 = sourceNodeSet.iterator(); iterator3.hasNext();) {
FlowNode srcNode = (FlowNode) iterator3.next();
Set<FlowNode> dstNodeSet = new HashSet<FlowNode>();
if (originalDstNode instanceof FlowReturnNode) {
FlowReturnNode rnode = (FlowReturnNode) originalDstNode;
- System.out.println("\n-returnNode=" + rnode);
- Set<NTuple<Descriptor>> tupleSet = rnode.getTupleSet();
+ // System.out.println("\n-returnNode=" + rnode);
+ Set<NTuple<Descriptor>> tupleSet = rnode.getReturnTupleSet();
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));
}
} else {
dstNodeSet.add(originalDstNode);
}
- System.out.println("---dstNodeSet=" + dstNodeSet);
+ // System.out.println("---dstNodeSet=" + dstNodeSet);
for (Iterator iterator4 = dstNodeSet.iterator(); iterator4.hasNext();) {
FlowNode dstNode = (FlowNode) iterator4.next();
NTuple<Descriptor> srcCurTuple = srcNode.getCurrentDescTuple();
NTuple<Descriptor> dstCurTuple = dstNode.getCurrentDescTuple();
- System.out.println("-srcCurTuple=" + srcCurTuple + " dstCurTuple=" + dstCurTuple);
+ System.out.println("-srcCurTuple=" + srcCurTuple + " dstCurTuple=" + dstCurTuple
+ + " srcNode=" + srcNode + " dstNode=" + dstNode);
+
+ // srcCurTuple = translateBaseTuple(srcNode, srcCurTuple);
+ // dstCurTuple = translateBaseTuple(dstNode, dstCurTuple);
if ((srcCurTuple.size() > 1 && dstCurTuple.size() > 1)
&& srcCurTuple.get(0).equals(dstCurTuple.get(0))) {
}
+ private NTuple<Descriptor> translateBaseTuple(FlowNode flowNode, NTuple<Descriptor> inTuple) {
+
+ if (flowNode.getBaseTuple() != null) {
+
+ NTuple<Descriptor> translatedTuple = new NTuple<Descriptor>();
+
+ NTuple<Descriptor> baseTuple = flowNode.getBaseTuple();
+
+ for (int i = 0; i < baseTuple.size(); i++) {
+ translatedTuple.add(baseTuple.get(i));
+ }
+
+ for (int i = 1; i < inTuple.size(); i++) {
+ translatedTuple.add(inTuple.get(i));
+ }
+
+ System.out.println("------TRANSLATED " + inTuple + " -> " + translatedTuple);
+ return translatedTuple;
+
+ } else {
+ return inTuple;
+ }
+
+ }
+
private MethodSummary getMethodSummary(MethodDescriptor md) {
if (!mapDescToLocationSummary.containsKey(md)) {
mapDescToLocationSummary.put(md, new MethodSummary(md));
}
}
- rtr += "\")";
-
if (desc instanceof MethodDescriptor) {
System.out.println("#EXTRA LOC DECLARATION GEN=" + desc);
MethodDescriptor md = (MethodDescriptor) desc;
MethodSummary methodSummary = getMethodSummary(md);
+ TypeDescriptor returnType = ((MethodDescriptor) desc).getReturnType();
+ if (!ssjava.getMethodContainingSSJavaLoop().equals(desc) && returnType != null
+ && (!returnType.isVoid())) {
+ CompositeLocation returnLoc = methodSummary.getRETURNLoc();
+ if (returnLoc.getSize() == 1) {
+ String returnLocStr = generateLocationAnnoatation(methodSummary.getRETURNLoc());
+ if (rtr.indexOf(returnLocStr) == -1) {
+ rtr += "," + returnLocStr;
+ }
+ }
+ }
+ rtr += "\")";
+
if (!ssjava.getMethodContainingSSJavaLoop().equals(desc)) {
- TypeDescriptor returnType = ((MethodDescriptor) desc).getReturnType();
if (returnType != null && (!returnType.isVoid())) {
rtr +=
"\n@RETURNLOC(\"" + generateLocationAnnoatation(methodSummary.getRETURNLoc()) + "\")";
}
+
CompositeLocation pcLoc = methodSummary.getPCLoc();
if ((pcLoc != null) && (!pcLoc.get(0).isTop())) {
rtr += "\n@PCLOC(\"" + generateLocationAnnoatation(pcLoc) + "\")";
}
rtr += "\n@GLOBALLOC(\"" + methodSummary.getGlobalLocName() + "\")";
+ } else {
+ rtr += "\")";
}
return rtr;
if (mapDescToDefinitionLine.containsKey(localVarDesc)) {
int varLineNum = mapDescToDefinitionLine.get(localVarDesc);
String orgSourceLine = sourceVec.get(varLineNum);
+ System.out.println("varLineNum=" + varLineNum + " org src=" + orgSourceLine);
int idx =
orgSourceLine.indexOf(generateVarDeclaration((VarDescriptor) localVarDesc));
System.out.println("idx=" + idx
if (curPCLoc.get(0).isTop() || pcLocTuple.size() > curPCLoc.getSize()) {
methodSummary.setPCLoc(new CompositeLocation(pcLocTuple));
+ Set<FlowNode> flowNodeLowerthanPCLocSet = new HashSet<FlowNode>();
+ GlobalFlowGraph subGlobalFlowGraph = getSubGlobalFlowGraph(md);
// add ordering relations s.t. PCLOC is higher than all flow nodes except the set of
// parameters that do not have incoming flows
for (Iterator iterator = fg.getNodeSet().iterator(); iterator.hasNext();) {
FlowNode node = (FlowNode) iterator.next();
- if (!paramDescNOTHavingInFlowSet.contains(node.getCurrentDescTuple().get(0))) {
- fg.addValueFlowEdge(pcDescTuple, node.getDescTuple());
+ if (!(node instanceof FlowReturnNode)) {
+ if (!paramDescNOTHavingInFlowSet.contains(node.getCurrentDescTuple().get(0))) {
+ flowNodeLowerthanPCLocSet.add(node);
+ fg.addValueFlowEdge(pcDescTuple, node.getDescTuple());
+
+ subGlobalFlowGraph.addValueFlowEdge(pcLocTuple,
+ translateToLocTuple(md, node.getDescTuple()));
+ }
+ } else {
+ System.out.println("***SKIP PCLOC -> RETURNLOC=" + node);
}
+
}
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) {
+ NTuple<Location> lowerLocTuple = translateToLocTuple(md, lowerNode.getDescTuple());
+ CompositeLocation newComp =
+ calculateCompositeLocationFromSubGlobalGraph(md, lowerNode);
+ if (newComp != null) {
+ subGlobalFlowGraph.addMapLocationToInferCompositeLocation(lowerLocTuple.get(0),
+ newComp);
+ lowerNode.setCompositeLocation(newComp);
+ System.out.println("NEW COMP LOC=" + newComp + " to lowerNode=" + lowerNode);
+ }
+
+ }
+
+ }
+ }
+
}
}
// calculate a return location:
// the return location type is lower than all parameters and the location of return values
MethodSummary methodSummary = getMethodSummary(md);
- if (methodSummary.getRETURNLoc() != null) {
- return;
- }
+ // if (methodSummary.getRETURNLoc() != null) {
+ // System.out.println("$HERE?");
+ // return;
+ // }
+
FlowGraph fg = getFlowGraph(md);
Map<Integer, CompositeLocation> mapParamToLoc = methodSummary.getMapParamIdxToInferLoc();
Set<Integer> paramIdxSet = mapParamToLoc.keySet();
}
+ // makes sure that PCLOC is higher than RETURNLOC
+ CompositeLocation pcLoc = methodSummary.getPCLoc();
+ if (!pcLoc.get(0).isTop()) {
+ NTuple<Descriptor> pcLocDescTuple = translateToDescTuple(pcLoc.getTuple());
+ fg.addValueFlowEdge(pcLocDescTuple, returnDescTuple);
+ }
+
}
}
} else {
// all parameter is started with 'this', so PCLOC will be set relative to the composite
// location started with 'this'.
- for (int idx = 0; idx < minSize - 1; idx++) {
+ // for (int idx = 0; idx < minSize - 1; idx++) {
+ for (int idx = 0; idx < 1; idx++) {
Set<Descriptor> locDescSet = new HashSet<Descriptor>();
Location curLoc = null;
NTuple<Location> paramLocTuple = null;
// check if the callee propagates an ordering constraints through
// parameters
- Set<FlowNode> localReachSet = calleeFlowGraph.getLocalReachFlowNodeSetFrom(paramNode1);
+ // Set<FlowNode> localReachSet = calleeFlowGraph.getLocalReachFlowNodeSetFrom(paramNode1);
+ Set<FlowNode> localReachSet =
+ calleeFlowGraph.getReachableSetFrom(paramNode1.getDescTuple());
NTuple<Descriptor> paramDescTuple1 = paramNode1.getCurrentDescTuple();
NTuple<Descriptor> paramDescTuple2 = paramNode2.getCurrentDescTuple();
- System.out.println("-param1CurTuple=" + paramDescTuple1 + " param2CurTuple="
- + paramDescTuple2);
- System.out.println("-- localReachSet from param1=" + localReachSet);
+ // System.out.println("-param1CurTuple=" + paramDescTuple1 + " param2CurTuple="
+ // + paramDescTuple2);
+ // System.out.println("-- localReachSet from param1=" + localReachSet);
if (paramDescTuple1.get(0).equals(paramDescTuple2.get(0))) {
// if two parameters share the same prefix
continue;
}
- if (arg1Tuple.size() > 0 && arg2Tuple.size() > 0 && localReachSet.contains(paramNode2)) {
+ if (arg1Tuple.size() > 0 && arg2Tuple.size() > 0
+ && containsPrefix(paramNode2.getDescTuple().get(0), localReachSet)) {
// need to propagate an ordering relation s.t. arg1 is higher
// than arg2
- System.out.println("-param1=" + paramNode1 + " is higher than param2=" + paramNode2);
+ // System.out.println("-param1=" + paramNode1 + " is higher than param2=" + paramNode2);
// add a new flow between the corresponding arguments.
callerFlowGraph.addValueFlowEdge(arg1Tuple, arg2Tuple);
- System.out.println("arg1=" + arg1Tuple + " arg2=" + arg2Tuple);
+ // System.out.println("arg1=" + arg1Tuple + " arg2=" + arg2Tuple);
// System.out
// .println("-arg1Tuple=" + arg1Tuple + " is higher than arg2Tuple=" + arg2Tuple);
}
- System.out.println();
+ // System.out.println();
}
}
}
for (int idx = 0; idx < numParam; idx++) {
FlowNode paramNode = calleeFlowGraph.getParamFlowNode(idx);
CompositeLocation compLoc = paramNode.getCompositeLocation();
+ System.out.println("paramNode=" + paramNode + " compLoc=" + compLoc);
if (compLoc != null && compLoc.get(0).getLocDescriptor().equals(min.getMethod().getThis())) {
- System.out.println("$$$COMPLOC CASE=" + compLoc);
+ 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());
+
NTuple<Descriptor> translatedParamTuple =
translateCompositeLocationToCaller(idx, min, compLoc);
System.out.println("add a flow edge= " + argTuple + "->" + translatedParamTuple);
}
+ private boolean containsPrefix(Descriptor prefixDesc, Set<FlowNode> set) {
+
+ for (Iterator iterator = set.iterator(); iterator.hasNext();) {
+ FlowNode flowNode = (FlowNode) iterator.next();
+ if (flowNode.getDescTuple().startsWith(prefixDesc)) {
+ System.out.println("FOUND=" + flowNode);
+ return true;
+ }
+ }
+ return false;
+ }
+
private NTuple<Descriptor> translateCompositeLocationToCaller(int idx, MethodInvokeNode min,
CompositeLocation compLocForParam1) {
tuple.add(baseTuple.get(i));
}
- for (int i = baseTuple.size(); i < compLocForParam1.getSize(); i++) {
+ for (int i = 1; i < compLocForParam1.getSize(); i++) {
Location loc = compLocForParam1.get(i);
tuple.add(loc.getLocDescriptor());
}
} else if (curDescriptor instanceof NameDescriptor) {
// it is "GLOBAL LOC" case!
enclosingDescriptor = GLOBALDESC;
+ } else if (curDescriptor instanceof InterDescriptor) {
+ enclosingDescriptor = getFlowGraph(md).getEnclosingDescriptor(curDescriptor);
} else {
enclosingDescriptor = null;
}
Descriptor srcFieldDesc = srcCurTuple.get(idx);
Descriptor dstFieldDesc = dstCurTuple.get(idx);
+ System.out.println("srcFieldDesc=" + srcFieldDesc + " dstFieldDesc=" + dstFieldDesc
+ + " idx=" + idx);
if (!srcFieldDesc.equals(dstFieldDesc)) {
// add a new edge
+ System.out.println("-ADD EDGE");
+ getHierarchyGraph(cd).addEdge(srcFieldDesc, dstFieldDesc);
+ } else if (!isReference(srcFieldDesc) && !isReference(dstFieldDesc)) {
+ System.out.println("-ADD EDGE");
getHierarchyGraph(cd).addEdge(srcFieldDesc, dstFieldDesc);
}
for (Iterator iterator = calleeSet.iterator(); iterator.hasNext();) {
MethodDescriptor calleemd = (MethodDescriptor) iterator.next();
if ((!ssjava.isTrustMethod(calleemd))
- && (!ssjava.isSSJavaUtil(calleemd.getClassDesc()))) {
+ && (!ssjava.isSSJavaUtil(calleemd.getClassDesc()))
+ && (!calleemd.getModifiers().isNative())) {
if (!visited.contains(calleemd)) {
temp_toanalyzeMethodList.add(calleemd);
}
System.out.println("");
toanalyze_methodDescList = computeMethodList();
+ // hack... it seems that there is a problem with topological sorting.
+ // so String.toString(Object o) is appeared too higher in the call chain.
+ MethodDescriptor 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);
+ }
+
LinkedList<MethodDescriptor> methodDescList =
(LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
private void analyzeFlowIfStatementNode(MethodDescriptor md, SymbolTable nametable,
IfStatementNode isn, NodeTupleSet implicitFlowTupleSet) {
- // System.out.println("analyzeFlowIfStatementNode=" + isn.printNode(0));
+ System.out.println("analyzeFlowIfStatementNode=" + isn.printNode(0));
NodeTupleSet condTupleNode = new NodeTupleSet();
analyzeFlowExpressionNode(md, nametable, isn.getCondition(), condTupleNode, null,
fn.setDeclarationNode();
if (dn.getExpression() != null) {
+ System.out.println("-analyzeFlowDeclarationNode=" + dn.printNode(0));
NodeTupleSet nodeSetRHS = new NodeTupleSet();
analyzeFlowExpressionNode(md, nametable, dn.getExpression(), nodeSetRHS, null,
GlobalFlowGraph globalFlowGraph = getSubGlobalFlowGraph(md);
for (Iterator<NTuple<Location>> iterator = nodeSetRHS.globalIterator(); iterator.hasNext();) {
NTuple<Location> calleeReturnLocTuple = iterator.next();
+
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple, translateToLocTuple(md, tupleLHS));
}
+ for (Iterator<NTuple<Location>> iterator = implicitFlowTupleSet.globalIterator(); iterator
+ .hasNext();) {
+ NTuple<Location> implicitGlobalTuple = iterator.next();
+
+ globalFlowGraph.addValueFlowEdge(implicitGlobalTuple, translateToLocTuple(md, tupleLHS));
+ }
+
+ System.out.println("-nodeSetRHS=" + nodeSetRHS);
+ System.out.println("-implicitFlowTupleSet=" + implicitFlowTupleSet);
+
}
}
ExpressionNode en, NodeTupleSet nodeSet, NTuple<Descriptor> base,
NodeTupleSet implicitFlowTupleSet, boolean isLHS) {
+ // System.out.println("en=" + en.printNode(0) + " class=" + en.getClass());
+
// note that expression node can create more than one flow node
// nodeSet contains of flow nodes
// base is always assigned to null except the case of a name node!
NTuple<Descriptor> flowTuple;
switch (en.kind()) {
-
case Kind.AssignmentNode:
analyzeFlowAssignmentNode(md, nametable, (AssignmentNode) en, nodeSet, base,
implicitFlowTupleSet);
private void analyzeFlowTertiaryNode(MethodDescriptor md, SymbolTable nametable, TertiaryNode tn,
NodeTupleSet nodeSet, NodeTupleSet implicitFlowTupleSet) {
- System.out.println("analyzeFlowTertiaryNode=" + tn.printNode(0));
+ // System.out.println("analyzeFlowTertiaryNode=" + tn.printNode(0));
NodeTupleSet tertiaryTupleNode = new NodeTupleSet();
analyzeFlowExpressionNode(md, nametable, tn.getCond(), tertiaryTupleNode, null,
newImplicitTupleSet.addTupleSet(implicitFlowTupleSet);
newImplicitTupleSet.addTupleSet(tertiaryTupleNode);
- System.out.println("$$$GGGcondTupleNode=" + tertiaryTupleNode.getGlobalLocTupleSet());
- System.out.println("-tertiaryTupleNode=" + tertiaryTupleNode);
- System.out.println("-implicitFlowTupleSet=" + implicitFlowTupleSet);
- System.out.println("-newImplicitTupleSet=" + newImplicitTupleSet);
+ // System.out.println("$$$GGGcondTupleNode=" + tertiaryTupleNode.getGlobalLocTupleSet());
+ // System.out.println("-tertiaryTupleNode=" + tertiaryTupleNode);
+ // System.out.println("-implicitFlowTupleSet=" + implicitFlowTupleSet);
+ // System.out.println("-newImplicitTupleSet=" + newImplicitTupleSet);
if (needToGenerateInterLoc(newImplicitTupleSet)) {
System.out.println("15");
newImplicitTupleSet.addGlobalFlowTupleSet(tertiaryTupleNode.getGlobalLocTupleSet());
+ 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,
addMapCallerMethodDescToMethodInvokeNodeSet(mdCaller, min);
FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
- System.out.println("mdCallee=" + mdCallee);
+ System.out.println("mdCallee=" + mdCallee + " calleeFlowGraph=" + calleeFlowGraph);
Set<FlowNode> calleeReturnSet = calleeFlowGraph.getReturnNodeSet();
System.out.println("---calleeReturnSet=" + calleeReturnSet);
NodeTupleSet baseNodeSet = new NodeTupleSet();
analyzeFlowExpressionNode(mdCaller, nametable, min.getExpression(), baseNodeSet, null,
implicitFlowTupleSet, false);
+ System.out.println("baseNodeSet=" + baseNodeSet);
assert (baseNodeSet.size() == 1);
NTuple<Descriptor> baseTuple = baseNodeSet.iterator().next();
+ if (baseTuple.get(0) instanceof InterDescriptor) {
+ if (baseTuple.size() > 1) {
+ throw new Error();
+ }
+ FlowNode interNode = getFlowGraph(mdCaller).getFlowNode(baseTuple);
+ baseTuple = translateBaseTuple(interNode, baseTuple);
+ }
mapMethodInvokeNodeToBaseTuple.put(min, baseTuple);
if (!min.getMethod().isStatic()) {
// the location type of the return value is started with 'this'
// reference
NTuple<Descriptor> inFlowTuple = new NTuple<Descriptor>(baseTuple.getList());
+
+ if (inFlowTuple.get(0) instanceof InterDescriptor) {
+ // min.getExpression()
+ } else {
+
+ }
+
inFlowTuple.addAll(returnDescTuple.subList(1, returnDescTuple.size()));
// nodeSet.addTuple(inFlowTuple);
- tupleSet.addTuple(inFlowTuple);
+ System.out.println("1CREATE A NEW TUPLE=" + inFlowTuple + " from="
+ + mdCallee.getThis());
+ // tupleSet.addTuple(inFlowTuple);
+ tupleSet.addTuple(baseTuple);
} else {
// TODO
+ System.out.println("returnNode=" + returnNode);
Set<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());
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("argTupleSet=" + argTupleSet);
+ System.out.println("---arg idx=" + idx + " argTupleSet=" + argTupleSet);
NTuple<Descriptor> argTuple = generateArgTuple(mdCaller, argTupleSet);
// if an argument is literal value,
// that node if needed
if (argTuple.size() > 0
&& (argTuple.get(0).equals(GLOBALDESC) || argTuple.get(0).equals(LITERALDESC))) {
- System.out.println("***GLOBAL ARG TUPLE CASE=" + argTuple);
- System.out.println("8");
-
- NTuple<Descriptor> interTuple =
- getFlowGraph(mdCaller).createIntermediateNode().getDescTuple();
- ((InterDescriptor) interTuple.get(0)).setMethodArgIdxPair(min, idx);
- addFlowGraphEdge(mdCaller, argTuple, interTuple);
- argTuple = interTuple;
- addArgIdxMap(min, idx, argTuple);
- System.out.println("new min mapping i=" + idx + " ->" + argTuple);
+ /*
+ * System.out.println("***GLOBAL ARG TUPLE CASE=" + argTuple); System.out.println("8");
+ *
+ * NTuple<Descriptor> interTuple =
+ * getFlowGraph(mdCaller).createIntermediateNode().getDescTuple(); ((InterDescriptor)
+ * interTuple.get(0)).setMethodArgIdxPair(min, idx); addFlowGraphEdge(mdCaller,
+ * argTuple, interTuple); argTuple = interTuple; addArgIdxMap(min, idx, argTuple);
+ * System.out.println("new min mapping i=" + idx + " ->" + argTuple);
+ */
+ argTuple = new NTuple<Descriptor>();
}
addArgIdxMap(min, idx, argTuple);
// }
// }
+ System.out.println("paramNode=" + paramNode + " calleeReturnSet=" + calleeReturnSet);
if (hasInFlowTo(calleeFlowGraph, paramNode, calleeReturnSet)
|| mdCallee.getModifiers().isNative()) {
addParamNodeFlowingToReturnValue(mdCallee, paramNode);
// nodeSet.addTupleSet(argTupleSet);
+ System.out.println("3CREATE A NEW TUPLE=" + argTupleSet + " from=" + paramNode);
tupleSet.addTupleSet(argTupleSet);
}
}
}
if (mdCallee.getReturnType() != null && !mdCallee.getReturnType().isVoid()) {
- FlowReturnNode setNode = getFlowGraph(mdCaller).createReturnNode(min);
- setNode.addTupleSet(tupleSet);
- nodeSet.addTuple(setNode.getDescTuple());
+ FlowReturnNode returnHolderNode = getFlowGraph(mdCaller).createReturnNode(min);
+
+ if (needToGenerateInterLoc(tupleSet)) {
+ System.out.println("20");
+ FlowGraph fg = getFlowGraph(mdCaller);
+ FlowNode interNode = fg.createIntermediateNode();
+ interNode.setFormHolder(true);
+
+ NTuple<Descriptor> interTuple = interNode.getDescTuple();
+
+ for (Iterator iterator = tupleSet.iterator(); iterator.hasNext();) {
+ NTuple<Descriptor> tuple = (NTuple<Descriptor>) iterator.next();
+
+ Set<NTuple<Descriptor>> addSet = new HashSet<NTuple<Descriptor>>();
+ FlowNode node = fg.getFlowNode(tuple);
+ if (node instanceof FlowReturnNode) {
+ addSet.addAll(fg.getReturnTupleSet(((FlowReturnNode) node).getReturnTupleSet()));
+ } else {
+ addSet.add(tuple);
+ }
+ for (Iterator iterator2 = addSet.iterator(); iterator2.hasNext();) {
+ NTuple<Descriptor> higher = (NTuple<Descriptor>) iterator2.next();
+ addFlowGraphEdge(mdCaller, higher, interTuple);
+ }
+ }
+
+ returnHolderNode.addTuple(interTuple);
+
+ nodeSet.addTuple(interTuple);
+ System.out.println("ADD TUPLESET=" + interTuple + " to returnnode=" + returnHolderNode);
+
+ } else {
+ returnHolderNode.addTupleSet(tupleSet);
+ System.out.println("ADD TUPLESET=" + tupleSet + " to returnnode=" + returnHolderNode);
+ }
+ // setNode.addTupleSet(tupleSet);
+ // NodeTupleSet setFromReturnNode=new NodeTupleSet();
+ // setFromReturnNode.addTuple(tuple);
+
+ NodeTupleSet holderTupleSet =
+ getNodeTupleSetFromReturnNode(getFlowGraph(mdCaller), returnHolderNode);
+
+ System.out.println("HOLDER TUPLe SET=" + holderTupleSet);
+ nodeSet.addTupleSet(holderTupleSet);
+
+ nodeSet.addTuple(returnHolderNode.getDescTuple());
}
// propagateFlowsFromCallee(min, md, min.getMethod());
NTuple<Location> calleeReturnLocTuple =
translateToLocTuple(mdCallee, calleeReturnNode.getDescTuple());
System.out.println("calleeReturnLocTuple=" + calleeReturnLocTuple);
- nodeSet.addGlobalFlowTuple(translateToCallerLocTuple(min, mdCallee, mdCaller,
- calleeReturnLocTuple));
+ NTuple<Location> transaltedToCaller =
+ translateToCallerLocTuple(min, mdCallee, mdCaller, calleeReturnLocTuple);
+ // System.out.println("translateToCallerLocTuple="
+ // + translateToCallerLocTuple(min, mdCallee, mdCaller, calleeReturnLocTuple));
+ if (transaltedToCaller.size() > 0) {
+ nodeSet.addGlobalFlowTuple(translateToCallerLocTuple(min, mdCallee, mdCaller,
+ calleeReturnLocTuple));
+ }
}
System.out.println("min nodeSet=" + nodeSet);
}
+ private NodeTupleSet getNodeTupleSetFromReturnNode(FlowGraph fg, FlowReturnNode node) {
+ NodeTupleSet nts = new NodeTupleSet();
+
+ Set<NTuple<Descriptor>> returnSet = node.getReturnTupleSet();
+
+ for (Iterator iterator = returnSet.iterator(); iterator.hasNext();) {
+ NTuple<Descriptor> tuple = (NTuple<Descriptor>) iterator.next();
+ FlowNode flowNode = fg.getFlowNode(tuple);
+ if (flowNode instanceof FlowReturnNode) {
+ returnSet.addAll(recurGetNode(fg, (FlowReturnNode) flowNode));
+ } else {
+ returnSet.add(tuple);
+ }
+ }
+
+ for (Iterator iterator = returnSet.iterator(); iterator.hasNext();) {
+ NTuple<Descriptor> nTuple = (NTuple<Descriptor>) iterator.next();
+ nts.addTuple(nTuple);
+ }
+
+ return nts;
+
+ }
+
+ private Set<NTuple<Descriptor>> recurGetNode(FlowGraph fg, FlowReturnNode rnode) {
+
+ Set<NTuple<Descriptor>> tupleSet = new HashSet<NTuple<Descriptor>>();
+
+ Set<NTuple<Descriptor>> returnSet = rnode.getReturnTupleSet();
+ for (Iterator iterator = returnSet.iterator(); iterator.hasNext();) {
+ NTuple<Descriptor> tuple = (NTuple<Descriptor>) iterator.next();
+ FlowNode flowNode = fg.getFlowNode(tuple);
+ if (flowNode instanceof FlowReturnNode) {
+ tupleSet.addAll(recurGetNode(fg, (FlowReturnNode) flowNode));
+ }
+ tupleSet.add(tuple);
+ }
+
+ return tupleSet;
+ }
+
private NTuple<Descriptor> generateArgTuple(MethodDescriptor mdCaller, NodeTupleSet argTupleSet) {
int size = 0;
private boolean hasInFlowTo(FlowGraph fg, FlowNode inNode, Set<FlowNode> nodeSet) {
// return true if inNode has in-flows to nodeSet
+ if (nodeSet.contains(inNode)) {
+ // in this case, the method directly returns a parameter variable.
+ return true;
+ }
// Set<FlowNode> reachableSet = fg.getReachFlowNodeSetFrom(inNode);
Set<FlowNode> reachableSet = fg.getReachableSetFrom(inNode.getDescTuple());
// System.out.println("inNode=" + inNode + " reachalbeSet=" + reachableSet);
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);
+ nodeSet.setMethodInvokeBaseDescTuple(base);
NodeTupleSet idxNodeTupleSet = new NodeTupleSet();
analyzeFlowExpressionNode(md, nametable, aan.getIndex(), idxNodeTupleSet, isLHS);
NTuple<Location> calleeReturnLocTuple = iterator.next();
for (Iterator<NTuple<Descriptor>> arrIter = expNodeTupleSet.iterator(); arrIter.hasNext();) {
NTuple<Descriptor> arrTuple = arrIter.next();
+
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple, translateToLocTuple(md, arrTuple));
}
}
if (needToGenerateInterLoc(nodeSetArrayAccessExp)) {
System.out.println("1");
- NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+ FlowNode interNode = getFlowGraph(md).createIntermediateNode();
+ NTuple<Descriptor> interTuple = interNode.getDescTuple();
for (Iterator<NTuple<Descriptor>> iter = nodeSetArrayAccessExp.iterator(); iter.hasNext();) {
NTuple<Descriptor> higherTuple = iter.next();
}
nodeSetArrayAccessExp.clear();
nodeSetArrayAccessExp.addTuple(interTuple);
+ FlowGraph fg = getFlowGraph(md);
+
+ System.out.println("base=" + base);
+ if (base != null) {
+ fg.addMapInterLocNodeToEnclosingDescriptor(interTuple.get(0),
+ getClassTypeDescriptor(base.get(base.size() - 1)));
+ interNode.setBaseTuple(base);
+ }
}
}
NodeTupleSet leftOpSet = new NodeTupleSet();
NodeTupleSet rightOpSet = new NodeTupleSet();
+ System.out.println("analyzeFlowOpNode=" + on.printNode(0));
+
// left operand
analyzeFlowExpressionNode(md, nametable, on.getLeft(), leftOpSet, null, implicitFlowTupleSet,
false);
+ 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();
analyzeFlowExpressionNode(md, nametable, aan.getIndex(), idxNodeTupleSet, base,
implicitFlowTupleSet, isLHS);
- nodeSet.addTupleSet(idxNodeTupleSet);
}
base =
analyzeFlowExpressionNode(md, nametable, left, nodeSet, base, implicitFlowTupleSet, isLHS);
for (Iterator<NTuple<Location>> iterator = idxNodeTupleSet.globalIterator(); iterator
.hasNext();) {
NTuple<Location> calleeReturnLocTuple = iterator.next();
+
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
translateToLocTuple(md, flowFieldTuple));
}
} else {
+ nodeSet.addTupleSet(idxNodeTupleSet);
// if it is the array case and not the LHS case
if (isArrayCase) {
NTuple<Descriptor> higherTuple = iter.next();
addFlowGraphEdge(md, higherTuple, interTuple);
}
+
+ FlowGraph fg = getFlowGraph(md);
+ fg.addMapInterLocNodeToEnclosingDescriptor(interTuple.get(0),
+ getClassTypeDescriptor(base.get(base.size() - 1)));
+
nodeSet.clear();
flowFieldTuple = interTuple;
}
-
nodeSet.addGlobalFlowTupleSet(idxNodeTupleSet.getGlobalLocTupleSet());
}
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) {
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();
- globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
- translateToLocTuple(md, callerLHSTuple));
System.out.println("$$$ GLOBAL FLOW ADD=" + calleeReturnLocTuple + " -> "
+ translateToLocTuple(md, callerLHSTuple));
+
+ globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
+ translateToLocTuple(md, callerLHSTuple));
}
}
NTuple<Location> calleeReturnLocTuple = iterator.next();
for (Iterator<NTuple<Descriptor>> iter2 = nodeSetLHS.iterator(); iter2.hasNext();) {
NTuple<Descriptor> callerLHSTuple = iter2.next();
+
globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
translateToLocTuple(md, callerLHSTuple));
System.out.println("$$$ GLOBAL FLOW PCLOC ADD=" + calleeReturnLocTuple + " -> "
String highLocId = pair.getFirst();
String lowLocId = pair.getSecond();
- System.out.println("addedLocSet=" + addedLocSet);
if (!addedLocSet.contains(highLocId)) {
addedLocSet.add(highLocId);
drawNode(bw, locOrder, simpleHierarchyGraph, highLocId);
projects / IRC.git / blobdiff