constructGlobalFlowGraph();
- // addReturnNodesToGlobalFlowGraph();
+ checkReturnNodes();
assignCompositeLocation();
updateFlowGraph();
debug_writeHierarchyDotFiles();
+ // System.exit(0);
+
simplifyHierarchyGraph();
debug_writeSimpleHierarchyDotFiles();
}
- private void addReturnNodesToGlobalFlowGraph() {
+ private void checkReturnNodes() {
LinkedList<MethodDescriptor> methodDescList =
(LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
translateCompositeLocationAssignmentToFlowGraph(methodEventLoopDesc);
}
+ private void translateCompositeLocationAssignmentToFlowGraph2() {
+ System.out.println("\nSSJAVA: Translate composite location assignments to flow graphs:");
+ MethodDescriptor methodEventLoopDesc = ssjava.getMethodContainingSSJavaLoop();
+ translateCompositeLocationAssignmentToFlowGraph(methodEventLoopDesc);
+ }
+
private void addAdditionalOrderingConstraints() {
System.out.println("\nSSJAVA: Add addtional ordering constriants:");
MethodDescriptor methodEventLoopDesc = ssjava.getMethodContainingSSJavaLoop();
Map<Location, CompositeLocation> callerMapLocToCompLoc =
callerGlobalFlowGraph.getMapLocationToInferCompositeLocation();
-
Set<Location> methodLocSet = callerMapLocToCompLoc.keySet();
for (Iterator iterator = methodLocSet.iterator(); iterator.hasNext();) {
Location methodLoc = (Location) iterator.next();
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,
//
// 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("###NEW RETURN TUPLE FOR CALLER=" + newReturnTuple);
callerFlowGraph.getFlowReturnNode(min).setNewTuple(newReturnTuple);
+ } 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)) {
translateCompositeLocationToCallee(callerCompLoc, baseLocTuple, mdCallee);
calleeGlobalGraph.addMapLocationToInferCompositeLocation(key, newCalleeCompLoc);
- // System.out.println("---key=" + key + " callerCompLoc=" + callerCompLoc
- // + " newCalleeCompLoc=" + newCalleeCompLoc);
+ System.out.println("1---key=" + key + " callerCompLoc=" + callerCompLoc
+ + " newCalleeCompLoc=" + newCalleeCompLoc);
+ System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
+ if (!newCalleeCompLoc.get(0).getDescriptor().equals(mdCallee)) {
+ System.exit(0);
+ }
+
// System.out.println("-----baseLoctuple=" + baseLocTuple);
- // System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
} 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
- // + " newCalleeCompLoc=" + newCalleeCompLoc);
- // System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
+ System.out.println("2---key=" + key + " callerCompLoc=" + callerCompLoc
+ + " newCalleeCompLoc=" + newCalleeCompLoc);
+ System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
} else {
int paramIdx = getParamIdx(callerCompLoc, mapIdxToArgTuple);
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
+ System.out.println("4---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("-----caller=" + mdCaller + " callee=" + mdCallee);
+
+ // System.out.println("-----argTuple=" + argTuple + " caller=" + mdCaller +
+ // " callee="
+ // + mdCallee);
+ // System.out.println("-----paramIdx=" + paramIdx + " paramFlowNode=" + paramFlowNode);
}
// System.out.println("-----*AFTER TRANSLATING COMP LOC MAPPING, CALLEE MAPPING="
// + calleeGlobalGraph.getMapLocationToInferCompositeLocation());
- System.out.println("#ASSIGN COMP LOC TO CALLEE PARAMS: callee=" + mdCallee);
+ 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();
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="
+ + calleeParamFlowNode.getCompositeLocation());
+
// }
}
}
+ 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);
+ // System.out.println("prefixList=" + prefixList);
+ // System.out.println("reachableNodeSet=" + reachableNodeSet);
+ 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();) {
if (!needToGenerateCompositeLocation(node, 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 next;
+ // System.out.println("prefixList=" + prefixList);
+ // System.out.println("reachableNodeSet=" + reachableNodeSet);
+ continue nextprefix;
}
Location targetLocalLoc = node.getLocTuple().get(0);
}
if (count == returnNodeSet.size()) {
- mapMethodDescriptorToCompositeReturnCase.put(md, Boolean.TRUE);
-
- NameDescriptor returnLocDesc = new NameDescriptor("RLOC" + (locSeed++));
- NTuple<Descriptor> rDescTuple = new NTuple<Descriptor>();
- rDescTuple.add(md.getThis());
- rDescTuple.add(returnLocDesc);
+ // in this case, all return nodes in the method returns values coming from a location that
+ // starts with "this"
- for (Iterator iterator = returnNodeSet.iterator(); iterator.hasNext();) {
- FlowNode rnode = (FlowNode) iterator.next();
- flowGraph.addValueFlowEdge(rnode.getDescTuple(), rDescTuple);
- }
+ System.out.println("$$$SET RETURN LOC TRUE=" + md);
+ mapMethodDescriptorToCompositeReturnCase.put(md, Boolean.TRUE);
- getMethodSummary(md).setRETURNLoc(new CompositeLocation(translateToLocTuple(md, rDescTuple)));
+ // NameDescriptor returnLocDesc = new NameDescriptor("RLOC" + (locSeed++));
+ // NTuple<Descriptor> rDescTuple = new NTuple<Descriptor>();
+ // rDescTuple.add(md.getThis());
+ // rDescTuple.add(returnLocDesc);
+ //
+ // for (Iterator iterator = returnNodeSet.iterator(); iterator.hasNext();) {
+ // FlowNode rnode = (FlowNode) iterator.next();
+ // flowGraph.addValueFlowEdge(rnode.getDescTuple(), rDescTuple);
+ // }
+ //
+ // getMethodSummary(md).setRETURNLoc(new CompositeLocation(translateToLocTuple(md,
+ // rDescTuple)));
} else {
mapMethodDescriptorToCompositeReturnCase.put(md, Boolean.FALSE);
// 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);
+
Location targetLocalLoc = node.getLocTuple().get(0);
- if (targetLocalLoc.getLocDescriptor() instanceof InterDescriptor) {
- if (((InterDescriptor) targetLocalLoc.getLocDescriptor()).isHolder()) {
+ 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()))) {
+ System.out.println("here1?!");
return true;
}
}
- MethodDescriptor md = (MethodDescriptor) targetLocalLoc.getDescriptor();
- GlobalFlowGraph globalFlowGraph = getSubGlobalFlowGraph(md);
- FlowGraph flowGraph = getFlowGraph(md);
+ if (targetLocalLoc.getLocDescriptor() instanceof InterDescriptor) {
+ Pair<MethodInvokeNode, Integer> pair =
+ ((InterDescriptor) targetLocalLoc.getLocDescriptor()).getMethodArgIdxPair();
+
+ if (pair != null) {
+ System.out.println("$$$TARGETLOCALLOC HOLDER=" + targetLocalLoc);
+
+ MethodInvokeNode min = pair.getFirst();
+ Integer paramIdx = pair.getSecond();
+ MethodDescriptor mdCallee = min.getMethod();
+
+ FlowNode paramNode = getFlowGraph(mdCallee).getParamFlowNode(paramIdx);
+ if (checkNodeReachToReturnNode(mdCallee, paramNode)) {
+ System.out.println("here2?!");
+ return true;
+ }
+
+ }
+
+ }
+
+ GlobalFlowGraph subGlobalFlowGraph = getSubGlobalFlowGraph(md);
+ Set<GlobalFlowNode> subGlobalReachableSet = subGlobalFlowGraph.getReachableNodeSetFrom(node);
+
+ 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)) {
+ System.out.println("here3?!");
+ return true;
+ }
+ }
+ }
+
+ for (Iterator iterator3 = subGlobalReachableSet.iterator(); iterator3.hasNext();) {
+ GlobalFlowNode subGlobalReachalbeNode = (GlobalFlowNode) iterator3.next();
+ if (subGlobalReachalbeNode.getLocTuple().get(0).getLocDescriptor().equals(md.getThis())) {
+ System.out.println("PREFIX FOUND=" + subGlobalReachalbeNode);
+ System.out.println("here4?!");
+ 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()));
+ // + flowGraph.getFlowNode(node.getDescTuple()));reachableSet
// if (flowGraph.contains(node.getDescTuple())
// && flowGraph.getReturnNodeSet().contains(flowGraph.getFlowNode(node.getDescTuple()))) {
// // return checkFlowNodeReturnThisField(flowGraph);
// }
- FlowNode flowNode = flowGraph.getFlowNode(node.getDescTuple());
- Set<FlowNode> reachableSet = flowGraph.getReachFlowNodeSetFrom(flowNode);
Location lastLocationOfPrefix = curPrefix.get(curPrefix.size() - 1);
- 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();
+ // check whether prefix appears in the list of parameters
+ Set<MethodInvokeNode> minSet = mapMethodDescToMethodInvokeNodeSet.get(md);
+ found: for (Iterator iterator = minSet.iterator(); iterator.hasNext();) {
+ 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));
+
+ for (Iterator iterator2 = keySet.iterator(); iterator2.hasNext();) {
+ Integer argIdx = (Integer) iterator2.next();
+ NTuple<Descriptor> argTuple = map.get(argIdx);
+
+ 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);
+ System.out.println("here5?!");
+
+ return true;
+ }
+ }
+ }
+ }
+ }
+ }
}
- System.out.println("-----class descriptor=" + cd);
- System.out.println("-----reachableSet from=" + reachableSet);
+ // ClassDescriptor cd;
+ // if (lastLocationOfPrefix.getLocDescriptor() instanceof VarDescriptor) {
+ // cd = ((VarDescriptor) lastLocationOfPrefix.getLocDescriptor()).getType().getClassDesc();
+ // } else {
+ // // it is a field descriptor
+ // cd = ((FieldDescriptor) lastLocationOfPrefix.getLocDescriptor()).getType().getClassDesc();
+ // }
+ //
+ // GlobalFlowGraph subGlobalFlowGraph = getSubGlobalFlowGraph(md);
+ // Set<GlobalFlowNode> subGlobalReachableSet = subGlobalFlowGraph.getReachableNodeSetFrom(node);
+ //
+ // System.out.println("TRY TO FIND lastLocationOfPrefix=" + lastLocationOfPrefix);
+ // for (Iterator iterator2 = subGlobalReachableSet.iterator(); iterator2.hasNext();) {
+ // GlobalFlowNode subGlobalReachalbeNode = (GlobalFlowNode) iterator2.next();
+ // // NTuple<Location> locTuple = translateToLocTuple(md, reachalbeNode.getDescTuple());
+ // NTuple<Location> locTuple = subGlobalReachalbeNode.getLocTuple();
+ //
+ // for (int i = 0; i < locTuple.size(); i++) {
+ // if (locTuple.get(i).equals(lastLocationOfPrefix)) {
+ // return true;
+ // }
+ // }
+ //
+ // Location lastLoc = locTuple.get(locTuple.size() - 1);
+ // Descriptor enclosingDescriptor = lastLoc.getDescriptor();
+ //
+ // if (enclosingDescriptor != null && enclosingDescriptor.equals(cd)) {
+ // System.out.println("# WHY HERE?");
+ // System.out.println("subGlobalReachalbeNode=" + subGlobalReachalbeNode);
+ // return true;
+ // }
+ // }
+
+ return false;
+ }
- for (Iterator iterator2 = reachableSet.iterator(); iterator2.hasNext();) {
- FlowNode reachalbeNode = (FlowNode) iterator2.next();
- NTuple<Location> locTuple = translateToLocTuple(md, reachalbeNode.getDescTuple());
- Location lastLoc = locTuple.get(locTuple.size() - 1);
- Descriptor enclosingDescriptor = lastLoc.getDescriptor();
+ private boolean checkNodeReachToReturnNode(MethodDescriptor md, FlowNode node) {
- if (enclosingDescriptor != null && enclosingDescriptor.equals(cd)) {
- return true;
+ FlowGraph flowGraph = getFlowGraph(md);
+ Set<FlowNode> reachableSet = flowGraph.getReachFlowNodeSetFrom(node);
+ if (mapMethodDescriptorToCompositeReturnCase.containsKey(md)) {
+ boolean hasCompReturnLocWithThis =
+ mapMethodDescriptorToCompositeReturnCase.get(md).booleanValue();
+
+ if (hasCompReturnLocWithThis) {
+ for (Iterator iterator = flowGraph.getReturnNodeSet().iterator(); iterator.hasNext();) {
+ FlowNode returnFlowNode = (FlowNode) iterator.next();
+ if (reachableSet.contains(returnFlowNode)) {
+ 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>>();
return prefixList;
- // 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);
- // }
- // }
- // }
- //
- // 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) {
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);
}
- 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) {
// // the type of argument is primitive.
// return nodeLocTuple.clone();
// }
+ // System.out.println("paramIdx=" + paramIdx + " argDescTuple=" + argDescTuple);
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 false;
+ } else {
+ return type.isPtr();
+ }
+
+ } else if (desc instanceof VarDescriptor) {
+ TypeDescriptor type = ((VarDescriptor) desc).getType();
+ if (type.isArray()) {
+ return false;
+ } else {
+ return type.isPtr();
+ }
+ }
+
+ return false;
+ }
+
private NTuple<Descriptor> translateToDescTuple(NTuple<Location> locTuple) {
NTuple<Descriptor> descTuple = new NTuple<Descriptor>();
// visit each node of method flow graph
FlowGraph fg = getFlowGraph(md);
- Set<FlowNode> nodeSet = fg.getNodeSet();
+ // Set<FlowNode> nodeSet = fg.getNodeSet();
+
+ Set<FlowEdge> edgeSet = fg.getEdgeSet();
Set<Descriptor> paramDescSet = fg.getMapParamDescToIdx().keySet();
for (Iterator iterator = paramDescSet.iterator(); iterator.hasNext();) {
// for the method lattice, we need to look at the first element of
// NTuple<Descriptor>
boolean hasGlobalAccess = false;
- for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
- FlowNode originalSrcNode = (FlowNode) iterator.next();
+ // for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
+ // FlowNode originalSrcNode = (FlowNode) iterator.next();
+ for (Iterator iterator = edgeSet.iterator(); iterator.hasNext();) {
+ FlowEdge edge = (FlowEdge) iterator.next();
+ FlowNode originalSrcNode = fg.getFlowNode(edge.getInitTuple());
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);
+ // System.out.println("---sourceNodeSet=" + sourceNodeSet + " from originalSrcNode="
+ // + originalSrcNode);
+
for (Iterator iterator3 = sourceNodeSet.iterator(); iterator3.hasNext();) {
FlowNode srcNode = (FlowNode) iterator3.next();
NTuple<Descriptor> srcNodeTuple = srcNode.getDescTuple();
Descriptor srcLocalDesc = srcNodeTuple.get(0);
-
- if (srcLocalDesc instanceof InterDescriptor && ((InterDescriptor) srcLocalDesc).isHolder()) {
+ if (srcLocalDesc instanceof InterDescriptor
+ && ((InterDescriptor) srcLocalDesc).getMethodArgIdxPair() != null) {
if (srcNode.getCompositeLocation() == null) {
continue;
hasGlobalAccess = true;
}
- Set<FlowEdge> outEdgeSet = fg.getOutEdgeSet(originalSrcNode);
- for (Iterator iterator2 = outEdgeSet.iterator(); iterator2.hasNext();) {
- FlowEdge outEdge = (FlowEdge) iterator2.next();
- FlowNode originalDstNode = outEdge.getDst();
-
- Set<FlowNode> dstNodeSet = new HashSet<FlowNode>();
- if (originalDstNode instanceof FlowReturnNode) {
- FlowReturnNode rnode = (FlowReturnNode) originalDstNode;
- Set<NTuple<Descriptor>> tupleSet = rnode.getTupleSet();
- for (Iterator iterator4 = tupleSet.iterator(); iterator4.hasNext();) {
- NTuple<Descriptor> nTuple = (NTuple<Descriptor>) iterator4.next();
- dstNodeSet.add(fg.getFlowNode(nTuple));
- }
- } else {
- dstNodeSet.add(originalDstNode);
+ // Set<FlowEdge> outEdgeSet = fg.getOutEdgeSet(originalSrcNode);
+ // for (Iterator iterator2 = outEdgeSet.iterator(); iterator2.hasNext();) {
+ // FlowEdge outEdge = (FlowEdge) iterator2.next();
+ // FlowNode originalDstNode = outEdge.getDst();
+ FlowNode originalDstNode = fg.getFlowNode(edge.getEndTuple());
+
+ 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.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));
}
- System.out.println("---dstNodeSet=" + dstNodeSet);
- for (Iterator iterator4 = dstNodeSet.iterator(); iterator4.hasNext();) {
- FlowNode dstNode = (FlowNode) iterator4.next();
-
- NTuple<Descriptor> dstNodeTuple = dstNode.getDescTuple();
- Descriptor dstLocalDesc = dstNodeTuple.get(0);
-
- if (dstLocalDesc instanceof InterDescriptor
- && ((InterDescriptor) dstLocalDesc).isHolder()) {
- if (dstNode.getCompositeLocation() == null) {
- System.out.println("%%%%%%%%%%%%%SKIP=" + dstNode);
- continue;
- }
+ } else {
+ dstNodeSet.add(originalDstNode);
+ }
+ // System.out.println("---dstNodeSet=" + dstNodeSet);
+ for (Iterator iterator4 = dstNodeSet.iterator(); iterator4.hasNext();) {
+ FlowNode dstNode = (FlowNode) iterator4.next();
+
+ NTuple<Descriptor> dstNodeTuple = dstNode.getDescTuple();
+ Descriptor dstLocalDesc = dstNodeTuple.get(0);
+
+ if (dstLocalDesc instanceof InterDescriptor
+ && ((InterDescriptor) dstLocalDesc).getMethodArgIdxPair() != null) {
+ if (dstNode.getCompositeLocation() == null) {
+ System.out.println("%%%%%%%%%%%%%SKIP=" + dstNode);
+ continue;
}
+ }
- // if (outEdge.getInitTuple().equals(srcNodeTuple)
- // && outEdge.getEndTuple().equals(dstNodeTuple)) {
+ // if (outEdge.getInitTuple().equals(srcNodeTuple)
+ // && outEdge.getEndTuple().equals(dstNodeTuple)) {
- NTuple<Descriptor> srcCurTuple = srcNode.getCurrentDescTuple();
- NTuple<Descriptor> dstCurTuple = dstNode.getCurrentDescTuple();
+ 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);
- if ((srcCurTuple.size() > 1 && dstCurTuple.size() > 1)
- && srcCurTuple.get(0).equals(dstCurTuple.get(0))) {
+ if ((srcCurTuple.size() > 1 && dstCurTuple.size() > 1)
+ && srcCurTuple.get(0).equals(dstCurTuple.get(0))) {
- // value flows between fields
- Descriptor desc = srcCurTuple.get(0);
- ClassDescriptor classDesc;
+ // value flows between fields
+ Descriptor desc = srcCurTuple.get(0);
+ ClassDescriptor classDesc;
- if (desc.equals(GLOBALDESC)) {
- classDesc = md.getClassDesc();
- } else {
- VarDescriptor varDesc = (VarDescriptor) srcCurTuple.get(0);
- classDesc = varDesc.getType().getClassDesc();
- }
- extractFlowsBetweenFields(classDesc, srcNode, dstNode, 1);
+ if (desc.equals(GLOBALDESC)) {
+ classDesc = md.getClassDesc();
+ } else {
+ VarDescriptor varDesc = (VarDescriptor) srcCurTuple.get(0);
+ classDesc = varDesc.getType().getClassDesc();
+ }
+ extractFlowsBetweenFields(classDesc, srcNode, dstNode, 1);
- } else if (!srcCurTuple.get(0).equals(dstCurTuple.get(0))) {
- // value flow between local var - local var or local var - field
+ } else if ((srcCurTuple.size() == 1 && dstCurTuple.size() == 1)
+ || ((srcCurTuple.size() > 1 || dstCurTuple.size() > 1) && !srcCurTuple.get(0).equals(
+ dstCurTuple.get(0)))) {
- Descriptor srcDesc = srcCurTuple.get(0);
- Descriptor dstDesc = dstCurTuple.get(0);
+ // value flow between a primitive local var - a primitive local var or local var -
+ // field
- methodGraph.addEdge(srcDesc, dstDesc);
+ Descriptor srcDesc = srcCurTuple.get(0);
+ Descriptor dstDesc = dstCurTuple.get(0);
- if (fg.isParamDesc(srcDesc)) {
- methodGraph.setParamHNode(srcDesc);
- }
- if (fg.isParamDesc(dstDesc)) {
- methodGraph.setParamHNode(dstDesc);
- }
+ methodGraph.addEdge(srcDesc, dstDesc);
+ if (fg.isParamDesc(srcDesc)) {
+ methodGraph.setParamHNode(srcDesc);
+ }
+ if (fg.isParamDesc(dstDesc)) {
+ methodGraph.setParamHNode(dstDesc);
}
- // }
}
+ // }
+ // }
+
}
}
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.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());
}
Descriptor srcFieldDesc = srcCurTuple.get(idx);
Descriptor dstFieldDesc = dstCurTuple.get(idx);
- // add a new edge
- getHierarchyGraph(cd).addEdge(srcFieldDesc, dstFieldDesc);
+ 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);
}
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();) {
NTuple<Descriptor> currentFlowTuple = (NTuple<Descriptor>) iterator.next();
}
}
if (size > 1) {
+ 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();
for (Iterator<NTuple<Descriptor>> idxIter = newImplicitTupleSet.iterator(); idxIter.hasNext();) {
// 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);
addFlowGraphEdge(md, fromTuple, interTuple, tupleLHS);
}
private void analyzeFlowTertiaryNode(MethodDescriptor md, SymbolTable nametable, TertiaryNode tn,
NodeTupleSet nodeSet, NodeTupleSet implicitFlowTupleSet) {
+ System.out.println("analyzeFlowTertiaryNode=" + tn.printNode(0));
+
NodeTupleSet tertiaryTupleNode = new NodeTupleSet();
analyzeFlowExpressionNode(md, nametable, tn.getCond(), tertiaryTupleNode, null,
implicitFlowTupleSet, false);
+ NodeTupleSet newImplicitTupleSet = new NodeTupleSet();
+ 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);
+
+ 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();) {
+ NTuple<Descriptor> tuple = idxIter.next();
+ addFlowGraphEdge(md, tuple, interTuple);
+ }
+ newImplicitTupleSet.clear();
+ newImplicitTupleSet.addTuple(interTuple);
+ }
+
+ newImplicitTupleSet.addGlobalFlowTupleSet(tertiaryTupleNode.getGlobalLocTupleSet());
+
+ System.out.println("---------newImplicitTupleSet=" + newImplicitTupleSet);
// add edges from tertiaryTupleNode to all nodes of conditional nodes
- tertiaryTupleNode.addTupleSet(implicitFlowTupleSet);
+ // tertiaryTupleNode.addTupleSet(implicitFlowTupleSet);
analyzeFlowExpressionNode(md, nametable, tn.getTrueExpr(), tertiaryTupleNode, null,
- implicitFlowTupleSet, false);
+ newImplicitTupleSet, false);
analyzeFlowExpressionNode(md, nametable, tn.getFalseExpr(), tertiaryTupleNode, null,
- implicitFlowTupleSet, false);
+ newImplicitTupleSet, false);
+ nodeSet.addGlobalFlowTupleSet(tertiaryTupleNode.getGlobalLocTupleSet());
nodeSet.addTupleSet(tertiaryTupleNode);
+ System.out.println("#tertiary node set=" + nodeSet);
}
private void addMapCallerMethodDescToMethodInvokeNodeSet(MethodDescriptor caller,
System.out.println("---calleeReturnSet=" + calleeReturnSet);
- // when generating the global flow graph,
- // we need to add ordering relations from the set of callee return loc tuple to LHS of the
- // caller assignment
- for (Iterator iterator = calleeReturnSet.iterator(); iterator.hasNext();) {
- FlowNode calleeReturnNode = (FlowNode) iterator.next();
- NTuple<Location> calleeReturnLocTuple =
- translateToLocTuple(mdCallee, calleeReturnNode.getDescTuple());
- nodeSet.addGlobalFlowTuple(calleeReturnLocTuple);
- }
-
NodeTupleSet tupleSet = new NodeTupleSet();
if (min.getExpression() != null) {
// 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);
- NTuple<Descriptor> interTuple =
- getFlowGraph(mdCaller).createIntermediateNode().getDescTuple();
- ((InterDescriptor) interTuple.get(0)).setHolder(true);
- 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);
if (mdCallee.getReturnType() != null && !mdCallee.getReturnType().isVoid()) {
FlowReturnNode setNode = getFlowGraph(mdCaller).createReturnNode(min);
+ System.out.println("ADD TUPLESET=" + tupleSet + " to returnnode=" + setNode);
setNode.addTupleSet(tupleSet);
nodeSet.addTuple(setNode.getDescTuple());
}
// propagateFlowsFromCallee(min, md, min.getMethod());
+ // when generating the global flow graph,
+ // we need to add ordering relations from the set of callee return loc tuple to LHS of the
+ // caller assignment
+ for (Iterator iterator = calleeReturnSet.iterator(); iterator.hasNext();) {
+ FlowNode calleeReturnNode = (FlowNode) iterator.next();
+ NTuple<Location> calleeReturnLocTuple =
+ translateToLocTuple(mdCallee, calleeReturnNode.getDescTuple());
+ System.out.println("calleeReturnLocTuple=" + calleeReturnLocTuple);
+ nodeSet.addGlobalFlowTuple(translateToCallerLocTuple(min, mdCallee, mdCaller,
+ calleeReturnLocTuple));
+ }
+
System.out.println("min nodeSet=" + nodeSet);
+
}
}
}
if (argTupleSetNonLiteral.size() > 1) {
+ System.out.println("11");
+
NTuple<Descriptor> interTuple =
getFlowGraph(mdCaller).createIntermediateNode().getDescTuple();
for (Iterator<NTuple<Descriptor>> idxIter = argTupleSet.iterator(); idxIter.hasNext();) {
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);
+ System.out.println("inNode=" + inNode + " reachalbeSet=" + reachableSet);
for (Iterator iterator = reachableSet.iterator(); iterator.hasNext();) {
FlowNode fn = (FlowNode) iterator.next();
|| !arrayAccessNodeStack.peek().startsWith(currentArrayAccessNodeExpStr)) {
if (needToGenerateInterLoc(nodeSetArrayAccessExp)) {
+ System.out.println("1");
NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
for (Iterator<NTuple<Descriptor>> iter = nodeSetArrayAccessExp.iterator(); iter.hasNext();) {
analyzeFlowExpressionNode(md, nametable, aan.getIndex(), idxNodeTupleSet, base,
implicitFlowTupleSet, isLHS);
- nodeSet.addTupleSet(idxNodeTupleSet);
}
base =
analyzeFlowExpressionNode(md, nametable, left, nodeSet, base, implicitFlowTupleSet, isLHS);
}
} else {
+ nodeSet.addTupleSet(idxNodeTupleSet);
// if it is the array case and not the LHS case
if (isArrayCase) {
nodeSetArrayAccessExp.addTuple(flowFieldTuple);
nodeSetArrayAccessExp.addTupleSet(idxNodeTupleSet);
+ nodeSetArrayAccessExp.addTupleSet(nodeSet);
if (needToGenerateInterLoc(nodeSetArrayAccessExp)) {
+ System.out.println("4");
+ System.out.println("nodeSetArrayAccessExp=" + nodeSetArrayAccessExp);
+ // System.out.println("idxNodeTupleSet.getGlobalLocTupleSet()="
+ // + idxNodeTupleSet.getGlobalLocTupleSet());
+
NTuple<Descriptor> interTuple =
getFlowGraph(md).createIntermediateNode().getDescTuple();
NTuple<Descriptor> higherTuple = iter.next();
addFlowGraphEdge(md, higherTuple, interTuple);
}
+ nodeSet.clear();
flowFieldTuple = interTuple;
}
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();
}
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);
}
String highLocId = pair.getFirst();
String lowLocId = pair.getSecond();
-
if (!addedLocSet.contains(highLocId)) {
addedLocSet.add(highLocId);
drawNode(bw, locOrder, simpleHierarchyGraph, highLocId);
private void drawNode(BufferedWriter bw, SSJavaLattice<String> lattice, HierarchyGraph graph,
String locName) throws IOException {
- HNode node = graph.getHNode(locName);
-
- if (node == null) {
- return;
- }
-
String prettyStr;
if (lattice.isSharedLoc(locName)) {
prettyStr = locName + "*";
} else {
prettyStr = locName;
}
-
- if (node.isMergeNode()) {
- Set<HNode> mergeSet = graph.getMapHNodetoMergeSet().get(node);
- prettyStr += ":" + convertMergeSetToString(graph, mergeSet);
- }
+ // HNode node = graph.getHNode(locName);
+ // if (node != null && node.isMergeNode()) {
+ // Set<HNode> mergeSet = graph.getMapHNodetoMergeSet().get(node);
+ // prettyStr += ":" + convertMergeSetToString(graph, mergeSet);
+ // }
bw.write(locName + " [label=\"" + prettyStr + "\"]" + ";\n");
}
class InterDescriptor extends Descriptor {
- boolean isHolder;
+ Pair<MethodInvokeNode, Integer> minArgIdxPair;
public InterDescriptor(String name) {
super(name);
- isHolder = false;
}
- public boolean isHolder() {
- return isHolder;
+ public void setMethodArgIdxPair(MethodInvokeNode min, int idx) {
+ minArgIdxPair = new Pair<MethodInvokeNode, Integer>(min, new Integer(idx));
}
- public void setHolder(boolean in) {
- isHolder = in;
+ public Pair<MethodInvokeNode, Integer> getMethodArgIdxPair() {
+ return minArgIdxPair;
}
}
projects / IRC.git / blobdiff