// set of callees reachable from the method
private Map<MethodDescriptor, GlobalFlowGraph> mapMethodDescriptorToSubGlobalFlowGraph;
- public static final String GLOBALLOC = "GLOBALLOC";
+ private Map<MethodInvokeNode, Map<NTuple<Descriptor>, NTuple<Descriptor>>> mapMethodInvokeNodeToMapCallerArgToCalleeArg;
- public static final String TOPLOC = "TOPLOC";
+ public static final String GLOBALLOC = "GLOBALLOC";
public static final String INTERLOC = "INTERLOC";
+ public static final String PCLOC = "_PCLOC_";
+
+ public static final String RLOC = "_RLOC_";
+
public static final Descriptor GLOBALDESC = new NameDescriptor(GLOBALLOC);
- public static final Descriptor TOPDESC = new NameDescriptor(TOPLOC);
+ public static final Descriptor TOPDESC = new NameDescriptor(SSJavaAnalysis.TOP);
+
+ public static final Descriptor BOTTOMDESC = new NameDescriptor(SSJavaAnalysis.BOTTOM);
+
+ public static final Descriptor RETURNLOC = new NameDescriptor(RLOC);
+
+ public static final Descriptor LITERALDESC = new NameDescriptor("LITERAL");
+
+ public static final HNode TOPHNODE = new HNode(TOPDESC);
+
+ public static final HNode BOTTOMHNODE = new HNode(BOTTOMDESC);
public static String newline = System.getProperty("line.separator");
boolean debug = true;
- private static int locSeed = 0;
+ public static int locSeed = 0;
public LocationInference(SSJavaAnalysis ssjava, State state) {
this.ssjava = ssjava;
this.mapDescToLocationSummary = new HashMap<Descriptor, LocationSummary>();
- mapMethodDescriptorToSubGlobalFlowGraph = new HashMap<MethodDescriptor, GlobalFlowGraph>();
+ this.mapMethodDescriptorToSubGlobalFlowGraph = new HashMap<MethodDescriptor, GlobalFlowGraph>();
+
+ this.mapMethodInvokeNodeToMapCallerArgToCalleeArg =
+ new HashMap<MethodInvokeNode, Map<NTuple<Descriptor>, NTuple<Descriptor>>>();
}
public void inference() {
- // 1) construct value flow graph
+ ssjava.init();
+
+ // construct value flow graph
constructFlowGraph();
assignCompositeLocation();
- // constructGlobalFlowGraph();
+ updateFlowGraph();
- System.exit(0);
+ // calculate RETURNLOC,PCLOC
+ calculateExtraLocations();
+
+ _debug_writeFlowGraph();
+
+ // System.exit(0);
constructHierarchyGraph();
debug_writeLattices();
+ updateCompositeLocationAssignments();
+
generateMethodSummary();
+ generateAnnoatedCode();
+
System.exit(0);
- // 2) construct lattices
- inferLattices();
+ }
- // simplifyLattices();
+ private void updateFlowGraph() {
- // 3) check properties
- checkLattices();
+ LinkedList<MethodDescriptor> methodDescList =
+ (LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
- // calculate RETURNLOC,PCLOC
- calculateExtraLocations();
+ while (!methodDescList.isEmpty()) {
+ MethodDescriptor md = methodDescList.removeLast();
+ if (state.SSJAVADEBUG) {
+ System.out.println();
+ System.out.println("SSJAVA: Updating a flow graph: " + md);
+ propagateFlowsFromCalleesWithNoCompositeLocation(md);
+ }
+ }
+ }
- debug_writeLatticeDotFile();
+ public Map<NTuple<Descriptor>, NTuple<Descriptor>> getMapCallerArgToCalleeParam(
+ MethodInvokeNode min) {
- // 4) generate annotated source codes
- generateAnnoatedCode();
+ if (!mapMethodInvokeNodeToMapCallerArgToCalleeArg.containsKey(min)) {
+ mapMethodInvokeNodeToMapCallerArgToCalleeArg.put(min,
+ new HashMap<NTuple<Descriptor>, NTuple<Descriptor>>());
+ }
+
+ return mapMethodInvokeNodeToMapCallerArgToCalleeArg.get(min);
+ }
+ public void addMapCallerArgToCalleeParam(MethodInvokeNode min, NTuple<Descriptor> callerArg,
+ NTuple<Descriptor> calleeParam) {
+ getMapCallerArgToCalleeParam(min).put(callerArg, calleeParam);
}
private void assignCompositeLocation() {
}
private void translateCompositeLocationAssignmentToFlowGraph() {
-
+ System.out.println("\nSSJAVA: Translate composite location assignments to flow graphs:");
+ MethodDescriptor methodEventLoopDesc = ssjava.getMethodContainingSSJavaLoop();
+ translateCompositeLocationAssignmentToFlowGraph(methodEventLoopDesc);
}
- private void constructGlobalFlowGraph() {
+ private void updateCompositeLocationAssignments() {
- System.out.println("");
LinkedList<MethodDescriptor> methodDescList =
(LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
- System.out.println("@@@methodDescList=" + methodDescList);
- // System.exit(0);
-
while (!methodDescList.isEmpty()) {
MethodDescriptor md = methodDescList.removeLast();
- if (state.SSJAVADEBUG) {
- System.out.println();
- System.out.println("SSJAVA: Constructing a global flow graph: " + md);
- FlowGraph flowGraph = getFlowGraph(md);
- FlowGraph subGlobalFlowGraph = flowGraph.clone();
-
- // mapMethodDescriptorToSubGlobalFlowGraph.put(md, subGlobalFlowGraph);
+ System.out.println("\n#updateCompositeLocationAssignments=" + md);
- // addValueFlowsFromCalleeSubGlobalFlowGraph(md, subGlobalFlowGraph);
+ FlowGraph flowGraph = getFlowGraph(md);
- // try {
- // subGlobalFlowGraph.writeGraph("_SUBGLOBAL");
- // } catch (IOException e) {
- // e.printStackTrace();
- // }
- // FlowGraph fg = new FlowGraph(md, mapParamDescToIdx);
- // mapMethodDescriptorToFlowGraph.put(md, fg);
- // analyzeMethodBody(md.getClassDesc(), md);
+ MethodSummary methodSummary = getMethodSummary(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());
+ if (node.getCompositeLocation() != null) {
+ CompositeLocation compLoc = node.getCompositeLocation();
+ CompositeLocation updatedCompLoc = updateCompositeLocation(compLoc);
+ node.setCompositeLocation(updatedCompLoc);
+ System.out.println("---updatedCompLoc1=" + updatedCompLoc);
+ } else {
+ NTuple<Descriptor> descTuple = node.getDescTuple();
+ System.out.println("update desc=" + descTuple);
+ CompositeLocation compLoc = convertToCompositeLocation(md, descTuple);
+ compLoc = updateCompositeLocation(compLoc);
+ node.setCompositeLocation(compLoc);
+ System.out.println("---updatedCompLoc2=" + compLoc);
+ }
+
+ if (node.isDeclaratonNode()) {
+ Descriptor localVarDesc = node.getDescTuple().get(0);
+ CompositeLocation compLoc = updateCompositeLocation(node.getCompositeLocation());
+ methodSummary.addMapVarNameToInferCompLoc(localVarDesc, compLoc);
+ }
+ }
+
+ // update PCLOC and RETURNLOC if they have a composite location assignment
+ if (methodSummary.getRETURNLoc() != null) {
+ methodSummary.setRETURNLoc(updateCompositeLocation(methodSummary.getRETURNLoc()));
+ }
+ if (methodSummary.getPCLoc() != null) {
+ methodSummary.setPCLoc(updateCompositeLocation(methodSummary.getPCLoc()));
}
}
- // DEBUG: write a global flow graph
- MethodDescriptor mdContainingSSJavaLoop = ssjava.getMethodContainingSSJavaLoop();
- // FlowGraph globalFlowGraph = getSubGlobalFlowGraph(mdContainingSSJavaLoop);
- // System.out.println("GLOBAL NODE SET=" + globalFlowGraph.getNodeSet());
- // assignCompositeLocation(globalFlowGraph);
- // try {
- // globalFlowGraph.writeGraph("_GLOBAL");
- // } catch (IOException e) {
- // e.printStackTrace();
- // }
- // _debug_printGraph();
+ }
+
+ private CompositeLocation updateCompositeLocation(CompositeLocation compLoc) {
+ CompositeLocation updatedCompLoc = new CompositeLocation();
+ for (int i = 0; i < compLoc.getSize(); i++) {
+ Location loc = compLoc.get(i);
+ String nodeIdentifier = loc.getLocIdentifier();
+ Descriptor enclosingDesc = loc.getDescriptor();
+ String locName;
+ if (!enclosingDesc.equals(GLOBALDESC)) {
+ LocationSummary locSummary = getLocationSummary(enclosingDesc);
+ HierarchyGraph scGraph = getSkeletonCombinationHierarchyGraph(enclosingDesc);
+ if (scGraph != null) {
+ HNode curNode = scGraph.getCurrentHNode(nodeIdentifier);
+ if (curNode != null) {
+ nodeIdentifier = curNode.getName();
+ }
+ }
+ locName = locSummary.getLocationName(nodeIdentifier);
+ } else {
+ locName = nodeIdentifier;
+ }
+ Location updatedLoc = new Location(enclosingDesc, locName);
+ updatedCompLoc.addLocation(updatedLoc);
+ }
+
+ return updatedCompLoc;
+ }
+
+ private void translateCompositeLocationAssignmentToFlowGraph(MethodDescriptor mdCaller) {
+
+ // First, assign a composite location to a node in the flow graph
+ GlobalFlowGraph callerGlobalFlowGraph = getSubGlobalFlowGraph(mdCaller);
+
+ FlowGraph callerFlowGraph = getFlowGraph(mdCaller);
+ Map<Location, CompositeLocation> callerMapLocToCompLoc =
+ callerGlobalFlowGraph.getMapLocationToInferCompositeLocation();
+ Set<Location> methodLocSet = callerMapLocToCompLoc.keySet();
+ for (Iterator iterator = methodLocSet.iterator(); iterator.hasNext();) {
+ Location methodLoc = (Location) iterator.next();
+ if (methodLoc.getDescriptor().equals(mdCaller)) {
+ CompositeLocation inferCompLoc = callerMapLocToCompLoc.get(methodLoc);
+ assignCompositeLocationToFlowGraph(callerFlowGraph, methodLoc, inferCompLoc);
+ }
+ }
+
+ Set<MethodInvokeNode> minSet = mapMethodDescriptorToMethodInvokeNodeSet.get(mdCaller);
+
+ Set<MethodDescriptor> calleeSet = new HashSet<MethodDescriptor>();
+ for (Iterator iterator = minSet.iterator(); iterator.hasNext();) {
+ MethodInvokeNode min = (MethodInvokeNode) iterator.next();
+ // need to translate a composite location that is started with the base
+ // tuple of 'min'.
+ translateMapLocationToInferCompositeLocationToCalleeGraph(callerGlobalFlowGraph, min);
+ calleeSet.add(min.getMethod());
+ }
+
+ for (Iterator iterator = calleeSet.iterator(); iterator.hasNext();) {
+ MethodDescriptor callee = (MethodDescriptor) iterator.next();
+ translateCompositeLocationAssignmentToFlowGraph(callee);
+ }
+
+ }
+
+ public void assignCompositeLocationToFlowGraph(FlowGraph flowGraph, Location loc,
+ CompositeLocation inferCompLoc) {
+ Descriptor localDesc = loc.getLocDescriptor();
+
+ Set<FlowNode> nodeSet = flowGraph.getNodeSet();
+ for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
+ FlowNode node = (FlowNode) iterator.next();
+ if (node.getDescTuple().startsWith(localDesc)
+ && !node.getDescTuple().get(0).equals(LITERALDESC)) {
+ // need to assign the inferred composite location to this node
+ CompositeLocation newCompLoc = generateCompositeLocation(node.getDescTuple(), inferCompLoc);
+ node.setCompositeLocation(newCompLoc);
+ System.out.println("SET Node=" + node + " inferCompLoc=" + newCompLoc);
+ }
+ }
+ }
+
+ private CompositeLocation generateCompositeLocation(NTuple<Descriptor> nodeDescTuple,
+ CompositeLocation inferCompLoc) {
+
+ System.out.println("generateCompositeLocation=" + nodeDescTuple + " with inferCompLoc="
+ + inferCompLoc);
+
+ 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;
+ } else {
+ enclosingDescriptor = ((VarDescriptor) lastDescOfPrefix).getType().getClassDesc();
+ }
+
+ for (int i = 1; i < nodeDescTuple.size(); i++) {
+ Descriptor desc = nodeDescTuple.get(i);
+ Location locElement = new Location(enclosingDescriptor, desc);
+ newCompLoc.addLocation(locElement);
+
+ enclosingDescriptor = ((FieldDescriptor) desc).getClassDescriptor();
+ }
+
+ return newCompLoc;
+ }
+
+ private void translateMapLocationToInferCompositeLocationToCalleeGraph(
+ GlobalFlowGraph callerGraph, MethodInvokeNode min) {
+
+ MethodDescriptor mdCallee = min.getMethod();
+ MethodDescriptor mdCaller = callerGraph.getMethodDescriptor();
+ Map<Location, CompositeLocation> callerMapLocToCompLoc =
+ callerGraph.getMapLocationToInferCompositeLocation();
+
+ Map<Integer, NTuple<Descriptor>> mapIdxToArgTuple = mapMethodInvokeNodeToArgIdxMap.get(min);
+
+ FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
+ GlobalFlowGraph calleeGlobalGraph = getSubGlobalFlowGraph(mdCallee);
+
+ NTuple<Location> baseLocTuple = null;
+ if (mapMethodInvokeNodeToBaseTuple.containsKey(min)) {
+ 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);
+
+ Set<Location> keySet = callerMapLocToCompLoc.keySet();
+ for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+ Location key = (Location) iterator.next();
+ CompositeLocation callerCompLoc = callerMapLocToCompLoc.get(key);
+
+ if (!key.getDescriptor().equals(mdCaller)) {
+
+ CompositeLocation newCalleeCompLoc;
+ if (baseLocTuple != null && callerCompLoc.getTuple().startsWith(baseLocTuple)) {
+ // System.out.println("-----need to translate callerCompLoc=" + callerCompLoc
+ // + " with baseTuple=" + baseLocTuple);
+ newCalleeCompLoc =
+ translateCompositeLocationToCallee(callerCompLoc, baseLocTuple, mdCallee);
+
+ calleeGlobalGraph.addMapLocationToInferCompositeLocation(key, newCalleeCompLoc);
+ System.out.println("---key=" + key + " callerCompLoc=" + callerCompLoc
+ + " newCalleeCompLoc=" + newCalleeCompLoc);
+ System.out.println("-----baseLoctuple=" + baseLocTuple);
+ System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
+ } else {
+ System.out.println("2");
+ // check if it is the global access
+ Location compLocFirstElement = callerCompLoc.getTuple().get(0);
+ if (compLocFirstElement.getDescriptor().equals(mdCallee)
+ && compLocFirstElement.getLocDescriptor().equals(GLOBALDESC)) {
+
+ newCalleeCompLoc = new CompositeLocation();
+ Location newMethodLoc = new Location(mdCallee, GLOBALDESC);
+
+ newCalleeCompLoc.addLocation(newMethodLoc);
+ for (int i = 1; i < callerCompLoc.getSize(); i++) {
+ 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);
+
+ } else {
+ int paramIdx = getParamIdx(callerCompLoc, mapIdxToArgTuple);
+ if (paramIdx == -1) {
+ continue;
+ }
+ NTuple<Descriptor> argTuple = mapIdxToArgTuple.get(paramIdx);
+
+ FlowNode paramFlowNode = calleeFlowGraph.getParamFlowNode(paramIdx);
+ System.out.println("-----paramIdx=" + paramIdx + " paramFlowNode=" + paramFlowNode);
+ NTuple<Location> paramLocTuple =
+ translateToLocTuple(mdCallee, paramFlowNode.getDescTuple());
+ newCalleeCompLoc = new CompositeLocation();
+ for (int i = 0; i < paramLocTuple.size(); i++) {
+ newCalleeCompLoc.addLocation(paramLocTuple.get(i));
+ }
+ for (int i = argTuple.size(); i < callerCompLoc.getSize(); i++) {
+ newCalleeCompLoc.addLocation(callerCompLoc.get(i));
+ }
+ calleeGlobalGraph.addMapLocationToInferCompositeLocation(key, newCalleeCompLoc);
+ System.out.println("---key=" + key + " callerCompLoc=" + callerCompLoc
+ + " newCalleeCompLoc=" + newCalleeCompLoc);
+ System.out.println("------argTuple=" + argTuple);
+ System.out.println("-----caller=" + mdCaller + " callee=" + mdCallee);
+
+ }
+
+ }
+
+ }
+ }
+
+ // System.out.println("-----*AFTER TRANSLATING COMP LOC MAPPING, CALLEE MAPPING="
+ // + calleeGlobalGraph.getMapLocationToInferCompositeLocation());
+
+ // 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));
+ Set<Integer> idxSet = mapIdxToArgTuple.keySet();
+ for (Iterator iterator = idxSet.iterator(); iterator.hasNext();) {
+ Integer idx = (Integer) iterator.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 callerCompLoc = callerMapLocToCompLoc.get(argLocalLoc);
+ for (int i = 1; i < argLocTuple.size(); i++) {
+ callerCompLoc.addLocation(argLocTuple.get(i));
+ }
+
+ if (baseLocTuple != null && callerCompLoc.getTuple().startsWith(baseLocTuple)) {
+
+ FlowNode calleeParamFlowNode = calleeFlowGraph.getParamFlowNode(idx);
+ NTuple<Descriptor> calleeParamDescTuple = calleeParamFlowNode.getDescTuple();
+ NTuple<Location> calleeParamLocTuple =
+ 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);
+ }
+
+ }
+ }
+
+ }
+
+ }
+
+ private int getParamIdx(CompositeLocation compLoc,
+ Map<Integer, NTuple<Descriptor>> mapIdxToArgTuple) {
+
+ // if the composite location is started with the argument descriptor
+ // return the argument's index. o.t. return -1
+
+ Set<Integer> keySet = mapIdxToArgTuple.keySet();
+ for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+ Integer key = (Integer) iterator.next();
+ NTuple<Descriptor> argTuple = mapIdxToArgTuple.get(key);
+ if (translateToDescTuple(compLoc.getTuple()).startsWith(argTuple)) {
+ return key.intValue();
+ }
+ }
+
+ return -1;
+ }
+
+ private boolean isPrimitiveType(NTuple<Descriptor> argTuple) {
+
+ Descriptor lastDesc = argTuple.get(argTuple.size() - 1);
+
+ if (lastDesc instanceof FieldDescriptor) {
+ return ((FieldDescriptor) lastDesc).getType().isPrimitive();
+ } else if (lastDesc instanceof VarDescriptor) {
+ return ((VarDescriptor) lastDesc).getType().isPrimitive();
+ } else if (lastDesc instanceof InterDescriptor) {
+ return true;
+ }
+
+ return false;
+ }
+
+ private CompositeLocation translateCompositeLocationToCallee(CompositeLocation callerCompLoc,
+ NTuple<Location> baseLocTuple, MethodDescriptor mdCallee) {
+
+ CompositeLocation newCalleeCompLoc = new CompositeLocation();
+
+ Location calleeThisLoc = new Location(mdCallee, mdCallee.getThis());
+ newCalleeCompLoc.addLocation(calleeThisLoc);
+
+ // remove the base tuple from the caller
+ // ex; In the method invoation foo.bar.methodA(), the callee will have the composite location
+ // ,which is relative to the 'this' variable, <THIS,...>
+ for (int i = baseLocTuple.size(); i < callerCompLoc.getSize(); i++) {
+ newCalleeCompLoc.addLocation(callerCompLoc.get(i));
+ }
+
+ return newCalleeCompLoc;
}
System.out.println("SSJAVA: Calculate composite locations in the global value flow graph");
MethodDescriptor methodDescEventLoop = ssjava.getMethodContainingSSJavaLoop();
- GlobalFlowGraph graph = getSubGlobalFlowGraph(methodDescEventLoop);
+ GlobalFlowGraph globalFlowGraph = getSubGlobalFlowGraph(methodDescEventLoop);
- Set<NTuple<Location>> prefixSet = new HashSet<NTuple<Location>>();
+ Set<Location> calculatedPrefixSet = new HashSet<Location>();
- Set<GlobalFlowNode> nodeSet = graph.getNodeSet();
+ Set<GlobalFlowNode> nodeSet = globalFlowGraph.getNodeSet();
next: for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
GlobalFlowNode node = (GlobalFlowNode) iterator.next();
- Set<GlobalFlowNode> incomingNodeSet = graph.getIncomingNodeSet(node);
- List<NTuple<Location>> prefixList = calculatePrefixList(graph, node);
+ Location prefixLoc = node.getLocTuple().get(0);
+
+ if (calculatedPrefixSet.contains(prefixLoc)) {
+ // the prefix loc has been already assigned to a composite location
+ continue;
+ }
+
+ calculatedPrefixSet.add(prefixLoc);
- Set<GlobalFlowNode> reachNodeSet = graph.getReachableNodeSetFrom(node);
+ // Set<GlobalFlowNode> incomingNodeSet = globalFlowGraph.getIncomingNodeSet(node);
+ List<NTuple<Location>> prefixList = calculatePrefixList(globalFlowGraph, node);
- // System.out.println("node=" + node + " inNodeSet=" + incomingNodeSet
- // + " reachableNodeSet=" + reachNodeSet);
+ Set<GlobalFlowNode> reachableNodeSet =
+ globalFlowGraph.getReachableNodeSetByPrefix(node.getLocTuple().get(0));
+ // Set<GlobalFlowNode> reachNodeSet = globalFlowGraph.getReachableNodeSetFrom(node);
+
+ // System.out.println("node=" + node + " prefixList=" + prefixList + " reachableNodeSet="
+ // + reachableNodeSet);
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 = reachNodeSet.iterator(); iterator2.hasNext();) {
+ for (Iterator iterator2 = reachableNodeSet.iterator(); iterator2.hasNext();) {
GlobalFlowNode reachNode = (GlobalFlowNode) iterator2.next();
if (reachNode.getLocTuple().startsWith(curPrefix)) {
reachableCommonPrefixSet.add(reachNode.getLocTuple());
}
if (!reachableCommonPrefixSet.isEmpty()) {
- CompositeLocation newCompLoc = generateCompositeLocation(curPrefix);
- System.out.println("NEED TO ASSIGN COMP LOC TO " + node + " with prefix=" + curPrefix);
- System.out.println("- newCompLoc=" + newCompLoc);
- // flowNode.setCompositeLocation(newCompLoc);
- continue next;
+
+ MethodDescriptor curPrefixFirstElementMethodDesc =
+ (MethodDescriptor) curPrefix.get(0).getDescriptor();
+
+ MethodDescriptor nodePrefixLocFirstElementMethodDesc =
+ (MethodDescriptor) prefixLoc.getDescriptor();
+
+ if (curPrefixFirstElementMethodDesc.equals(nodePrefixLocFirstElementMethodDesc)
+ || isTransitivelyCalledFrom(nodePrefixLocFirstElementMethodDesc,
+ curPrefixFirstElementMethodDesc)) {
+
+ // TODO
+ // if (!node.getLocTuple().startsWith(curPrefix.get(0))) {
+
+ Location curPrefixLocalLoc = curPrefix.get(0);
+ if (globalFlowGraph.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);
+
+ continue next;
+ }
+
+ Location targetLocalLoc = node.getLocTuple().get(0);
+ // CompositeLocation curCompLoc = globalFlowGraph.getCompositeLocation(targetLocalLoc);
+ // if ((curPrefix.size() + 1) > curCompLoc.getSize()) {
+
+ CompositeLocation newCompLoc = generateCompositeLocation(curPrefix);
+ System.out.println("NEED TO ASSIGN COMP LOC TO " + node + " with prefix=" + curPrefix);
+ System.out.println("- newCompLoc=" + newCompLoc);
+ globalFlowGraph.addMapLocationToInferCompositeLocation(targetLocalLoc, newCompLoc);
+ // }
+
+ continue next;
+ // }
+
+ }
+
}
}
}
- // Set<GlobalFlowNode> inNodeSet = graph.getIncomingNodeSetWithPrefix(prefix);
+ // Set<GlobalFlowNode> inNodeSet =
+ // graph.getIncomingNodeSetWithPrefix(prefix);
// System.out.println("inNodeSet=" + inNodeSet + " from=" + node);
}
+ private void assignCompositeLocation(CompositeLocation compLocPrefix, GlobalFlowNode node) {
+ CompositeLocation newCompLoc = compLocPrefix.clone();
+ NTuple<Location> locTuple = node.getLocTuple();
+ for (int i = 1; i < locTuple.size(); i++) {
+ newCompLoc.addLocation(locTuple.get(i));
+ }
+ node.setInferCompositeLocation(newCompLoc);
+ }
+
private List<NTuple<Location>> calculatePrefixList(GlobalFlowGraph graph, GlobalFlowNode node) {
- System.out.println("\n##### calculatePrefixList=" + node);
+ System.out.println("\n##### calculatePrefixList node=" + node);
- Set<GlobalFlowNode> incomingNodeSet = graph.getIncomingNodeSet(node);
+ Set<GlobalFlowNode> incomingNodeSetPrefix =
+ graph.getIncomingNodeSetByPrefix(node.getLocTuple().get(0));
+ // System.out.println("incomingNodeSetPrefix=" + incomingNodeSetPrefix);
+ //
+ // Set<GlobalFlowNode> reachableNodeSetPrefix =
+ // graph.getReachableNodeSetByPrefix(node.getLocTuple().get(0));
+ // System.out.println("reachableNodeSetPrefix=" + reachableNodeSetPrefix);
List<NTuple<Location>> prefixList = new ArrayList<NTuple<Location>>();
- for (Iterator iterator = incomingNodeSet.iterator(); iterator.hasNext();) {
+ for (Iterator iterator = incomingNodeSetPrefix.iterator(); iterator.hasNext();) {
GlobalFlowNode inNode = (GlobalFlowNode) iterator.next();
NTuple<Location> inNodeTuple = inNode.getLocTuple();
}
}
});
+
+ // 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);
+ }
+ }
+
+ prefixList.removeAll(toberemoved);
+
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 (int i = 0; i < prefixLocTuple.size(); i++) {
+ Location loc = prefixLocTuple.get(i);
+ Descriptor locDesc = loc.getLocDescriptor();
+ if (locDesc != null) {
+ ClassDescriptor type = getClassTypeDescriptor(locDesc);
+ if (type != null && type.equals(cd)) {
+ return true;
+ }
+ }
+ }
+ return false;
}
private GlobalFlowGraph constructSubGlobalFlowGraph(FlowGraph flowGraph) {
NTuple<Descriptor> srcDescTuple = edge.getInitTuple();
NTuple<Descriptor> dstDescTuple = edge.getEndTuple();
- // here only keep the first element(method location) of the descriptor tuple
+ // 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 (flowGraph.isParamDesc(srcVarDesc) &&
+ // (!srcVarDesc.equals(md.getThis()))) {
// if (!srcVarDesc.equals(md.getThis())) {
// srcLocTuple = new NTuple<Location>();
// Location loc = new Location(md, srcVarDesc);
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);
private void propagateValueFlowsToCallerFromSubGlobalFlowGraph(MethodInvokeNode min,
MethodDescriptor mdCaller, MethodDescriptor possibleMdCallee) {
- NTuple<Descriptor> baseTuple = mapMethodInvokeNodeToBaseTuple.get(min);
-
- NTuple<Location> baseLocTuple = translateToLocTuple(mdCaller, baseTuple);
-
+ System.out.println("---propagate from " + min.printNode(0) + " to caller=" + mdCaller);
FlowGraph calleeFlowGraph = getFlowGraph(possibleMdCallee);
+ Map<Integer, NTuple<Descriptor>> mapIdxToArg = mapMethodInvokeNodeToArgIdxMap.get(min);
- GlobalFlowGraph callerSubGlobalGraph = getSubGlobalFlowGraph(mdCaller);
- GlobalFlowGraph calleeSubGlobalGraph = getSubGlobalFlowGraph(possibleMdCallee);
+ System.out.println("-----mapMethodInvokeNodeToArgIdxMap.get(min)="
+ + mapMethodInvokeNodeToArgIdxMap.get(min));
+ Set<Integer> keySet = mapIdxToArg.keySet();
+ for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+ Integer idx = (Integer) iterator.next();
+ NTuple<Descriptor> argDescTuple = mapIdxToArg.get(idx);
+ if (argDescTuple.size() > 0) {
+ NTuple<Location> argLocTuple = translateToLocTuple(mdCaller, argDescTuple);
+ NTuple<Descriptor> paramDescTuple = calleeFlowGraph.getParamFlowNode(idx).getDescTuple();
+ NTuple<Location> paramLocTuple = translateToLocTuple(possibleMdCallee, paramDescTuple);
+ addMapCallerArgToCalleeParam(min, argDescTuple, paramDescTuple);
+ }
+ }
+ NTuple<Descriptor> baseTuple = mapMethodInvokeNodeToBaseTuple.get(min);
+ GlobalFlowGraph calleeSubGlobalGraph = getSubGlobalFlowGraph(possibleMdCallee);
Set<GlobalFlowNode> calleeNodeSet = calleeSubGlobalGraph.getNodeSet();
for (Iterator iterator = calleeNodeSet.iterator(); iterator.hasNext();) {
GlobalFlowNode calleeNode = (GlobalFlowNode) iterator.next();
// NTuple<Location> paramLocTuple =
// translateToLocTuple(possibleMdCallee, paramNode.getCurrentDescTuple());
//
- // GlobalFlowNode globalParamNode = calleeSubGlobalGraph.getFlowNode(paramLocTuple);
+ // GlobalFlowNode globalParamNode =
+ // calleeSubGlobalGraph.getFlowNode(paramLocTuple);
//
- // NTuple<Descriptor> argTuple = mapMethodInvokeNodeToArgIdxMap.get(min).get(idx);
+ // NTuple<Descriptor> argTuple =
+ // mapMethodInvokeNodeToArgIdxMap.get(min).get(idx);
//
// NTuple<Location> argLocTuple = translateToLocTuple(mdCaller, argTuple);
//
- // System.out.println("argTupleSet=" + argLocTuple + " param=" + paramLocTuple);
- // // here, it adds all value flows reachable from the paramNode in the callee's flow graph
+ // System.out.println("argTupleSet=" + argLocTuple + " param=" +
+ // paramLocTuple);
+ // // here, it adds all value flows reachable from the paramNode in the
+ // callee's flow graph
//
- // addValueFlowsFromCalleeParam(mdCaller, argLocTuple, baseLocTuple, possibleMdCallee,
+ // addValueFlowsFromCalleeParam(mdCaller, argLocTuple, baseLocTuple,
+ // possibleMdCallee,
// globalParamNode);
// }
//
// // TODO
// // FlowGraph callerSubGlobalGraph = getSubGlobalFlowGraph(mdCaller);
- // // FlowGraph calleeSubGlobalGraph = getSubGlobalFlowGraph(possibleMdCallee);
+ // // FlowGraph calleeSubGlobalGraph =
+ // getSubGlobalFlowGraph(possibleMdCallee);
// //
// // int numParam = calleeSubGlobalGraph.getNumParameters();
// // for (int idx = 0; idx < numParam; idx++) {
// // FlowNode paramNode = calleeSubGlobalGraph.getParamFlowNode(idx);
- // // NTuple<Descriptor> argTuple = mapMethodInvokeNodeToArgIdxMap.get(min).get(idx);
- // // System.out.println("argTupleSet=" + argTuple + " param=" + paramNode);
- // // // here, it adds all value flows reachable from the paramNode in the callee's flow graph
- // // addValueFlowsFromCalleeParam(min, calleeSubGlobalGraph, paramNode, callerSubGlobalGraph,
+ // // NTuple<Descriptor> argTuple =
+ // mapMethodInvokeNodeToArgIdxMap.get(min).get(idx);
+ // // System.out.println("argTupleSet=" + argTuple + " param=" +
+ // paramNode);
+ // // // here, it adds all value flows reachable from the paramNode in the
+ // callee's flow graph
+ // // addValueFlowsFromCalleeParam(min, calleeSubGlobalGraph, paramNode,
+ // callerSubGlobalGraph,
// // argTuple, baseTuple);
// // }
GlobalFlowGraph calleeSubGlobalGraph = getSubGlobalFlowGraph(mdCallee);
GlobalFlowGraph callerSubGlobalGraph = getSubGlobalFlowGraph(mdCaller);
- NTuple<Location> srcNodeLocTuple =
+ NTuple<Location> callerSrcNodeLocTuple =
translateToCallerLocTuple(min, mdCallee, mdCaller, calleeSrcNode.getLocTuple());
- Set<GlobalFlowNode> outNodeSet = calleeSubGlobalGraph.getOutNodeSet(calleeSrcNode);
+ if (callerSrcNodeLocTuple != null) {
+ Set<GlobalFlowNode> outNodeSet = calleeSubGlobalGraph.getOutNodeSet(calleeSrcNode);
- for (Iterator iterator = outNodeSet.iterator(); iterator.hasNext();) {
- GlobalFlowNode outNode = (GlobalFlowNode) iterator.next();
- NTuple<Location> dstNodeLocTuple =
- translateToCallerLocTuple(min, mdCallee, mdCaller, outNode.getLocTuple());
- callerSubGlobalGraph.addValueFlowEdge(srcNodeLocTuple, dstNodeLocTuple);
+ for (Iterator iterator = outNodeSet.iterator(); iterator.hasNext();) {
+ GlobalFlowNode outNode = (GlobalFlowNode) iterator.next();
+ NTuple<Location> callerDstNodeLocTuple =
+ translateToCallerLocTuple(min, mdCallee, mdCaller, outNode.getLocTuple());
+ if (callerDstNodeLocTuple != null) {
+ callerSubGlobalGraph.addValueFlowEdge(callerSrcNodeLocTuple, callerDstNodeLocTuple);
+ }
+ }
}
}
private NTuple<Location> translateToCallerLocTuple(MethodInvokeNode min,
MethodDescriptor mdCallee, MethodDescriptor mdCaller, NTuple<Location> nodeLocTuple) {
+ // this method will return the same nodeLocTuple if the corresponding argument is literal
+ // value.
FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
NTuple<Descriptor> nodeDescTuple = translateToDescTuple(nodeLocTuple);
-
if (calleeFlowGraph.isParameter(nodeDescTuple)) {
int paramIdx = calleeFlowGraph.getParamIdx(nodeDescTuple);
NTuple<Descriptor> argDescTuple = mapMethodInvokeNodeToArgIdxMap.get(min).get(paramIdx);
+
+ if (isPrimitive(nodeLocTuple.get(0).getLocDescriptor())) {
+ // the type of argument is primitive.
+ return nodeLocTuple.clone();
+ }
NTuple<Location> argLocTuple = translateToLocTuple(mdCaller, argDescTuple);
NTuple<Location> callerLocTuple = new NTuple<Location>();
}
return callerLocTuple;
} else {
- return nodeLocTuple;
+ return nodeLocTuple.clone();
+ }
+
+ }
+
+ public static boolean isPrimitive(Descriptor desc) {
+
+ if (desc instanceof FieldDescriptor) {
+ return ((FieldDescriptor) desc).getType().isPrimitive();
+ } else if (desc instanceof VarDescriptor) {
+ return ((VarDescriptor) desc).getType().isPrimitive();
+ } else if (desc instanceof InterDescriptor) {
+ return true;
}
+ return false;
}
private NTuple<Descriptor> translateToDescTuple(NTuple<Location> locTuple) {
// curNodeLocTuple = translateToCaller(argLocTuple, curNodeLocTuple);
// }
//
- // Set<GlobalFlowNode> outNodeSet = calleeSubGlobalGraph.getOutNodeSet(calleeCurNode);
+ // Set<GlobalFlowNode> outNodeSet =
+ // calleeSubGlobalGraph.getOutNodeSet(calleeCurNode);
// for (Iterator iterator = outNodeSet.iterator(); iterator.hasNext();) {
// GlobalFlowNode outNode = (GlobalFlowNode) iterator.next();
//
// // destination node is started with 'parameter'
// // need to translate it in terms of the caller's a node
// srcDescTuple =
- // translateToCaller(min, calleeSubGlobalGraph.getParamIdx(srcDescTuple), srcDescTuple);
+ // translateToCaller(min, calleeSubGlobalGraph.getParamIdx(srcDescTuple),
+ // srcDescTuple);
// }
//
// }
//
- // Set<FlowEdge> edgeSet = calleeSubGlobalGraph.getOutEdgeSetStartingFrom(calleeSrcNode);
+ // Set<FlowEdge> edgeSet =
+ // calleeSubGlobalGraph.getOutEdgeSetStartingFrom(calleeSrcNode);
// for (Iterator iterator = edgeSet.iterator(); iterator.hasNext();) {
// FlowEdge flowEdge = (FlowEdge) iterator.next();
//
// // destination node is started with 'parameter'
// // need to translate it in terms of the caller's a node
// srcDescTuple =
- // translateToCaller(min, calleeSubGlobalGraph.getParamIdx(srcDescTuple), srcDescTuple);
+ // translateToCaller(min, calleeSubGlobalGraph.getParamIdx(srcDescTuple),
+ // srcDescTuple);
// }
//
// if (calleeSubGlobalGraph.isParameter(dstDescTuple)) {
// // destination node is started with 'parameter'
// // need to translate it in terms of the caller's a node
// dstDescTuple =
- // translateToCaller(min, calleeSubGlobalGraph.getParamIdx(dstDescTuple), dstDescTuple);
+ // translateToCaller(min, calleeSubGlobalGraph.getParamIdx(dstDescTuple),
+ // dstDescTuple);
// }
//
// callerSubGlobalGraph.addValueFlowEdge(srcDescTuple, dstDescTuple);
//
// if (!visited.contains(dstNode)) {
// visited.add(dstNode);
- // recurAddValueFlowsFromCalleeParam(min, calleeSubGlobalGraph, dstNode, callerSubGlobalGraph,
+ // recurAddValueFlowsFromCalleeParam(min, calleeSubGlobalGraph, dstNode,
+ // callerSubGlobalGraph,
// dstDescTuple, visited, baseTuple);
// }
//
MethodDescriptor mdCallee = calleeSubGlobalGraph.getMethodDescriptor();
- // Set<FlowEdge> edgeSet = calleeSubGlobalGraph.getOutEdgeSet(calleeSrcNode);
+ // Set<FlowEdge> edgeSet =
+ // calleeSubGlobalGraph.getOutEdgeSet(calleeSrcNode);
Set<FlowEdge> edgeSet = calleeSubGlobalGraph.getOutEdgeSetStartingFrom(calleeSrcNode);
for (Iterator iterator = edgeSet.iterator(); iterator.hasNext();) {
FlowEdge flowEdge = (FlowEdge) iterator.next();
FlowGraph flowGraph = getFlowGraph(md);
MethodSummary methodSummary = getMethodSummary(md);
- // construct a parameter mapping that maps a parameter descriptor to an inferred composite
- // location
+ HierarchyGraph scGraph = getSkeletonCombinationHierarchyGraph(md);
- for (int paramIdx = 0; paramIdx < flowGraph.getNumParameters(); paramIdx++) {
- FlowNode flowNode = flowGraph.getParamFlowNode(paramIdx);
- NTuple<Descriptor> descTuple = flowNode.getDescTuple();
+ // set the 'this' reference location
+ if (!md.isStatic()) {
+ System.out.println("setThisLocName=" + scGraph.getHNode(md.getThis()).getName());
+ methodSummary.setThisLocName(scGraph.getHNode(md.getThis()).getName());
+ }
- 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);
- methodSummary.addMapParamIdxToInferLoc(paramIdx, inferredCompLoc);
+ // set the 'global' reference location if needed
+ if (methodSummary.hasGlobalAccess()) {
+ methodSummary.setGlobalLocName(scGraph.getHNode(GLOBALDESC).getName());
}
- }
+ // construct a parameter mapping that maps a parameter descriptor to an
+ // inferred composite location
+ for (int paramIdx = 0; paramIdx < flowGraph.getNumParameters(); paramIdx++) {
+ 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());
+
+ Descriptor localVarDesc = flowNode.getDescTuple().get(0);
+ methodSummary.addMapVarNameToInferCompLoc(localVarDesc, inferredCompLoc);
+ methodSummary.addMapParamIdxToInferLoc(paramIdx, inferredCompLoc);
+ }
+
+ }
+
+ }
+
+ private boolean hasOrderingRelation(NTuple<Location> locTuple1, NTuple<Location> locTuple2) {
+
+ int size = locTuple1.size() >= locTuple2.size() ? locTuple2.size() : locTuple1.size();
+
+ for (int idx = 0; idx < size; idx++) {
+ Location loc1 = locTuple1.get(idx);
+ Location loc2 = locTuple2.get(idx);
+
+ Descriptor desc1 = loc1.getDescriptor();
+ Descriptor desc2 = loc2.getDescriptor();
+
+ if (!desc1.equals(desc2)) {
+ throw new Error("Fail to compare " + locTuple1 + " and " + locTuple2);
+ }
+
+ Descriptor locDesc1 = loc1.getLocDescriptor();
+ Descriptor locDesc2 = loc2.getLocDescriptor();
+
+ HierarchyGraph hierarchyGraph = getHierarchyGraph(desc1);
+
+ HNode node1 = hierarchyGraph.getHNode(locDesc1);
+ HNode node2 = hierarchyGraph.getHNode(locDesc2);
+
+ System.out.println("---node1=" + node1 + " node2=" + node2);
+ System.out.println("---hierarchyGraph.getIncomingNodeSet(node2)="
+ + hierarchyGraph.getIncomingNodeSet(node2));
+
+ if (locDesc1.equals(locDesc2)) {
+ continue;
+ } else if (!hierarchyGraph.getIncomingNodeSet(node2).contains(node1)
+ && !hierarchyGraph.getIncomingNodeSet(node1).contains(node2)) {
+ return false;
+ } else {
+ return true;
+ }
+
+ }
+
+ return false;
+
+ }
+
+ private boolean isHigherThan(NTuple<Location> locTuple1, NTuple<Location> locTuple2) {
+
+ int size = locTuple1.size() >= locTuple2.size() ? locTuple2.size() : locTuple1.size();
+
+ for (int idx = 0; idx < size; idx++) {
+ Location loc1 = locTuple1.get(idx);
+ Location loc2 = locTuple2.get(idx);
+
+ Descriptor desc1 = loc1.getDescriptor();
+ Descriptor desc2 = loc2.getDescriptor();
+
+ if (!desc1.equals(desc2)) {
+ throw new Error("Fail to compare " + locTuple1 + " and " + locTuple2);
+ }
+
+ Descriptor locDesc1 = loc1.getLocDescriptor();
+ Descriptor locDesc2 = loc2.getLocDescriptor();
+ HierarchyGraph hierarchyGraph = getHierarchyGraph(desc1);
+
+ HNode node1 = hierarchyGraph.getHNode(locDesc1);
+ HNode node2 = hierarchyGraph.getHNode(locDesc2);
+
+ System.out.println("---node1=" + node1 + " node2=" + node2);
+ System.out.println("---hierarchyGraph.getIncomingNodeSet(node2)="
+ + hierarchyGraph.getIncomingNodeSet(node2));
+
+ if (locDesc1.equals(locDesc2)) {
+ continue;
+ } else if (hierarchyGraph.getIncomingNodeSet(node2).contains(node1)) {
+ return true;
+ } else {
+ return false;
+ }
+
+ }
+
+ return false;
}
private CompositeLocation translateCompositeLocation(CompositeLocation compLoc) {
addMapDescToSimpleLattice(desc, simpleLattice);
HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(desc);
- System.out.println("## insertIntermediateNodesToStraightLine:"
+ System.out.println("\n## insertIntermediateNodesToStraightLine:"
+ simpleHierarchyGraph.getName());
SSJavaLattice<String> lattice =
buildLattice.insertIntermediateNodesToStraightLine(desc, simpleLattice);
// System.out.println("\nSSJAVA: Insering Combination Nodes:" + desc);
// HierarchyGraph skeletonGraph = getSkeletonHierarchyGraph(desc);
- // HierarchyGraph skeletonGraphWithCombinationNode = skeletonGraph.clone();
+ // HierarchyGraph skeletonGraphWithCombinationNode =
+ // skeletonGraph.clone();
// skeletonGraphWithCombinationNode.setName(desc + "_SC");
//
// HierarchyGraph simpleHierarchyGraph = getSimpleHierarchyGraph(desc);
// System.out.println("Identifying Combination Nodes:");
// skeletonGraphWithCombinationNode.insertCombinationNodesToGraph(simpleHierarchyGraph);
// skeletonGraphWithCombinationNode.simplifySkeletonCombinationHierarchyGraph();
- // mapDescriptorToCombineSkeletonHierarchyGraph.put(desc, skeletonGraphWithCombinationNode);
+ // mapDescriptorToCombineSkeletonHierarchyGraph.put(desc,
+ // skeletonGraphWithCombinationNode);
}
}
Set<Descriptor> keySet = mapDescriptorToHierarchyGraph.keySet();
for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
Descriptor desc = (Descriptor) iterator.next();
+ System.out.println("SSJAVA: remove redundant edges: " + desc);
HierarchyGraph simpleHierarchyGraph = getHierarchyGraph(desc).clone();
simpleHierarchyGraph.setName(desc + "_SIMPLE");
simpleHierarchyGraph.removeRedundantEdges();
- // simpleHierarchyGraph.simplifyHierarchyGraph();
mapDescriptorToSimpleHierarchyGraph.put(desc, simpleHierarchyGraph);
}
}
Set<Descriptor> keySet = mapDescriptorToHierarchyGraph.keySet();
for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
Descriptor desc = (Descriptor) iterator.next();
+ System.out.println("SSJAVA: Constructing Skeleton Hierarchy Graph: " + desc);
HierarchyGraph simpleGraph = getSimpleHierarchyGraph(desc);
HierarchyGraph skeletonGraph = simpleGraph.generateSkeletonGraph();
skeletonGraph.setMapDescToHNode(simpleGraph.getMapDescToHNode());
// do fixed-point analysis
- ssjava.init();
LinkedList<MethodDescriptor> descriptorListToAnalyze = ssjava.getSortedDescriptors();
// Collections.sort(descriptorListToAnalyze, new
}
+ 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 HierarchyGraph getHierarchyGraph(Descriptor d) {
// 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 srcNode = (FlowNode) iterator.next();
+ // if the srcNode is started with the global descriptor
+ // need to set as a skeleton node
+ if (!hasGlobalAccess && srcNode.getDescTuple().startsWith(GLOBALDESC)) {
+ hasGlobalAccess = true;
+ }
+
Set<FlowEdge> outEdgeSet = fg.getOutEdgeSet(srcNode);
for (Iterator iterator2 = outEdgeSet.iterator(); iterator2.hasNext();) {
FlowEdge outEdge = (FlowEdge) iterator2.next();
}
}
+ // If the method accesses static fields
+ // set hasGloabalAccess true in the method summary.
+ if (hasGlobalAccess) {
+ getMethodSummary(md).setHasGlobalAccess();
+ }
+ methodGraph.getHNode(GLOBALDESC).setSkeleton(true);
+
+ if (ssjava.getMethodContainingSSJavaLoop().equals(md)) {
+ // if the current method contains the event loop
+ // we need to set all nodes of the hierarchy graph as a skeleton node
+ Set<HNode> hnodeSet = methodGraph.getNodeSet();
+ for (Iterator iterator = hnodeSet.iterator(); iterator.hasNext();) {
+ HNode hnode = (HNode) iterator.next();
+ hnode.setSkeleton(true);
+ }
+ }
+
}
private MethodSummary getMethodSummary(MethodDescriptor md) {
rtr += "\")";
if (desc instanceof MethodDescriptor) {
- TypeDescriptor returnType = ((MethodDescriptor) desc).getReturnType();
+ System.out.println("#EXTRA LOC DECLARATION GEN=" + desc);
- MethodLocationInfo methodLocInfo = getMethodLocationInfo((MethodDescriptor) desc);
+ MethodDescriptor md = (MethodDescriptor) desc;
+ MethodSummary methodSummary = getMethodSummary(md);
- if (returnType != null && (!returnType.isVoid())) {
- rtr +=
- "\n@RETURNLOC(\"" + generateLocationAnnoatation(methodLocInfo.getReturnLoc()) + "\")";
+ 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@THISLOC(\"this\")";
- rtr += "\n@GLOBALLOC(\"GLOBALLOC\")";
-
- CompositeLocation pcLoc = methodLocInfo.getPCLoc();
- if ((pcLoc != null) && (!pcLoc.get(0).isTop())) {
- rtr += "\n@PCLOC(\"" + generateLocationAnnoatation(pcLoc) + "\")";
+ if (!md.isStatic()) {
+ rtr += "\n@THISLOC(\"" + methodSummary.getThisLocName() + "\")";
}
+ rtr += "\n@GLOBALLOC(\"" + methodSummary.getGlobalLocName() + "\")";
}
setupToAnalazeMethod(cd);
- LocationInfo locInfo = mapClassToLocationInfo.get(cd);
String sourceFileName = cd.getSourceFileName();
if (cd.isInterface()) {
int classDefLine = mapDescToDefinitionLine.get(cd);
Vector<String> sourceVec = mapFileNameToLineVector.get(sourceFileName);
- if (locInfo == null) {
- locInfo = getLocationInfo(cd);
- }
-
- for (Iterator iter = cd.getFields(); iter.hasNext();) {
- FieldDescriptor fieldDesc = (FieldDescriptor) iter.next();
- if (!(fieldDesc.isStatic() && fieldDesc.isFinal())) {
- String locIdentifier = locInfo.getFieldInferLocation(fieldDesc).getLocIdentifier();
- if (!getLattice(cd).getElementSet().contains(locIdentifier)) {
- getLattice(cd).put(locIdentifier);
- }
- }
- }
+ LocationSummary fieldLocSummary = getLocationSummary(cd);
String fieldLatticeDefStr = generateLatticeDefinition(cd);
String annoatedSrc = fieldLatticeDefStr + newline + sourceVec.get(classDefLine);
sourceVec.set(classDefLine, annoatedSrc);
// generate annotations for field declarations
- LocationInfo fieldLocInfo = getLocationInfo(cd);
- Map<Descriptor, CompositeLocation> inferLocMap = fieldLocInfo.getMapDescToInferLocation();
+ // Map<Descriptor, CompositeLocation> inferLocMap = fieldLocInfo.getMapDescToInferLocation();
+ Map<String, String> mapFieldNameToLocName = fieldLocSummary.getMapHNodeNameToLocationName();
for (Iterator iter = cd.getFields(); iter.hasNext();) {
FieldDescriptor fd = (FieldDescriptor) iter.next();
String locAnnotationStr;
- CompositeLocation inferLoc = inferLocMap.get(fd);
+ // CompositeLocation inferLoc = inferLocMap.get(fd);
+ String locName = mapFieldNameToLocName.get(fd.getSymbol());
- if (inferLoc != null) {
+ if (locName != null) {
// infer loc is null if the corresponding field is static and final
- locAnnotationStr = "@LOC(\"" + generateLocationAnnoatation(inferLoc) + "\")";
+ // locAnnotationStr = "@LOC(\"" + generateLocationAnnoatation(inferLoc) + "\")";
+ locAnnotationStr = "@LOC(\"" + locName + "\")";
int fdLineNum = fd.getLineNum();
String orgFieldDeclarationStr = sourceVec.get(fdLineNum);
String fieldDeclaration = fd.toString();
int methodDefLine = md.getLineNum();
- MethodLocationInfo methodLocInfo = getMethodLocationInfo(md);
+ // MethodLocationInfo methodLocInfo = getMethodLocationInfo(md);
+ // Map<Descriptor, CompositeLocation> methodInferLocMap =
+ // methodLocInfo.getMapDescToInferLocation();
+
+ MethodSummary methodSummary = getMethodSummary(md);
+
+ Map<Descriptor, CompositeLocation> mapVarDescToInferLoc =
+ methodSummary.getMapVarDescToInferCompositeLocation();
+ System.out.println("-----md=" + md);
+ System.out.println("-----mapVarDescToInferLoc=" + mapVarDescToInferLoc);
- Map<Descriptor, CompositeLocation> methodInferLocMap =
- methodLocInfo.getMapDescToInferLocation();
- Set<Descriptor> localVarDescSet = methodInferLocMap.keySet();
+ Set<Descriptor> localVarDescSet = mapVarDescToInferLoc.keySet();
Set<String> localLocElementSet = methodLattice.getElementSet();
for (Iterator iterator = localVarDescSet.iterator(); iterator.hasNext();) {
Descriptor localVarDesc = (Descriptor) iterator.next();
- CompositeLocation inferLoc = methodInferLocMap.get(localVarDesc);
+ System.out.println("-------localVarDesc=" + localVarDesc);
+ CompositeLocation inferLoc = mapVarDescToInferLoc.get(localVarDesc);
String localLocIdentifier = inferLoc.get(0).getLocIdentifier();
if (!localLocElementSet.contains(localLocIdentifier)) {
int idx =
getParamLocation(methodDefStr,
generateVarDeclaration((VarDescriptor) localVarDesc));
-
+ System.out.println("methodDefStr=" + methodDefStr + " localVarDesc=" + localVarDesc
+ + " idx=" + idx);
assert (idx != -1);
String annoatedStr =
// reference...
// boolean needToAddthisRef = hasThisReference(md);
- if (localLocElementSet.contains("this")) {
- methodLattice.put("this");
- }
+ // if (localLocElementSet.contains("this")) {
+ // methodLattice.put("this");
+ // }
String methodLatticeDefStr = generateLatticeDefinition(md);
String annoatedStr = methodLatticeDefStr + newline + sourceVec.get(methodDefLine);
}
private String generateLocationAnnoatation(CompositeLocation loc) {
+ System.out.println("loc=" + loc);
String rtr = "";
// method location
Location methodLoc = loc.get(0);
Set<MethodDescriptor> methodDescriptorToVistSet = new HashSet<MethodDescriptor>();
methodDescriptorToVistSet.addAll(descriptorListToAnalyze);
- while (!descriptorListToAnalyze.isEmpty()) {
- MethodDescriptor md = descriptorListToAnalyze.removeFirst();
- checkLatticesOfVirtualMethods(md);
+ while (!descriptorListToAnalyze.isEmpty()) {
+ MethodDescriptor md = descriptorListToAnalyze.removeFirst();
+ checkLatticesOfVirtualMethods(md);
+ }
+
+ }
+
+ private void debug_writeLatticeDotFile() {
+ // generate lattice dot file
+
+ setupToAnalyze();
+
+ while (!toAnalyzeIsEmpty()) {
+ ClassDescriptor cd = toAnalyzeNext();
+
+ setupToAnalazeMethod(cd);
+
+ SSJavaLattice<String> classLattice = cd2lattice.get(cd);
+ if (classLattice != null) {
+ ssjava.writeLatticeDotFile(cd, null, classLattice);
+ debug_printDescriptorToLocNameMapping(cd);
+ }
+
+ while (!toAnalyzeMethodIsEmpty()) {
+ MethodDescriptor md = toAnalyzeMethodNext();
+ SSJavaLattice<String> methodLattice = md2lattice.get(md);
+ if (methodLattice != null) {
+ ssjava.writeLatticeDotFile(cd, md, methodLattice);
+ debug_printDescriptorToLocNameMapping(md);
+ }
+ }
+ }
+
+ }
+
+ private void debug_printDescriptorToLocNameMapping(Descriptor desc) {
+
+ LocationInfo info = getLocationInfo(desc);
+ System.out.println("## " + desc + " ##");
+ System.out.println(info.getMapDescToInferLocation());
+ LocationInfo locInfo = getLocationInfo(desc);
+ System.out.println("mapping=" + locInfo.getMapLocSymbolToDescSet());
+ System.out.println("###################");
+
+ }
+
+ private void calculateExtraLocations() {
+
+ LinkedList<MethodDescriptor> methodDescList = ssjava.getSortedDescriptors();
+ for (Iterator iterator = methodDescList.iterator(); iterator.hasNext();) {
+ MethodDescriptor md = (MethodDescriptor) iterator.next();
+ if (!ssjava.getMethodContainingSSJavaLoop().equals(md)) {
+ calculateExtraLocations(md);
+ }
+ }
+
+ }
+
+ private void checkLatticesOfVirtualMethods(MethodDescriptor md) {
+
+ if (!md.isStatic()) {
+ Set<MethodDescriptor> setPossibleCallees = new HashSet<MethodDescriptor>();
+ setPossibleCallees.addAll(ssjava.getCallGraph().getMethods(md));
+
+ for (Iterator iterator = setPossibleCallees.iterator(); iterator.hasNext();) {
+ MethodDescriptor mdCallee = (MethodDescriptor) iterator.next();
+ if (!md.equals(mdCallee)) {
+ checkConsistency(md, mdCallee);
+ }
+ }
+
+ }
+
+ }
+
+ private void checkConsistency(MethodDescriptor md1, MethodDescriptor md2) {
+
+ // check that two lattice have the same relations between parameters(+PC
+ // LOC, GLOBAL_LOC RETURN LOC)
+
+ List<CompositeLocation> list1 = new ArrayList<CompositeLocation>();
+ List<CompositeLocation> list2 = new ArrayList<CompositeLocation>();
+
+ MethodLocationInfo locInfo1 = getMethodLocationInfo(md1);
+ MethodLocationInfo locInfo2 = getMethodLocationInfo(md2);
+
+ Map<Integer, CompositeLocation> paramMap1 = locInfo1.getMapParamIdxToInferLoc();
+ Map<Integer, CompositeLocation> paramMap2 = locInfo2.getMapParamIdxToInferLoc();
+
+ int numParam = locInfo1.getMapParamIdxToInferLoc().keySet().size();
+
+ // add location types of paramters
+ for (int idx = 0; idx < numParam; idx++) {
+ list1.add(paramMap1.get(Integer.valueOf(idx)));
+ list2.add(paramMap2.get(Integer.valueOf(idx)));
+ }
+
+ // add program counter location
+ list1.add(locInfo1.getPCLoc());
+ list2.add(locInfo2.getPCLoc());
+
+ if (!md1.getReturnType().isVoid()) {
+ // add return value location
+ CompositeLocation rtrLoc1 = getMethodLocationInfo(md1).getReturnLoc();
+ CompositeLocation rtrLoc2 = getMethodLocationInfo(md2).getReturnLoc();
+ list1.add(rtrLoc1);
+ list2.add(rtrLoc2);
+ }
+
+ // add global location type
+ if (md1.isStatic()) {
+ CompositeLocation globalLoc1 =
+ new CompositeLocation(new Location(md1, locInfo1.getGlobalLocName()));
+ CompositeLocation globalLoc2 =
+ new CompositeLocation(new Location(md2, locInfo2.getGlobalLocName()));
+ list1.add(globalLoc1);
+ list2.add(globalLoc2);
+ }
+
+ for (int i = 0; i < list1.size(); i++) {
+ CompositeLocation locA1 = list1.get(i);
+ CompositeLocation locA2 = list2.get(i);
+ for (int k = 0; k < list1.size(); k++) {
+ if (i != k) {
+ CompositeLocation locB1 = list1.get(k);
+ CompositeLocation locB2 = list2.get(k);
+ boolean r1 = isGreaterThan(getLattice(md1), locA1, locB1);
+
+ boolean r2 = isGreaterThan(getLattice(md1), locA2, locB2);
+
+ if (r1 != r2) {
+ throw new Error("The method " + md1 + " is not consistent with the method " + md2
+ + ".:: They have a different ordering relation between locations (" + locA1 + ","
+ + locB1 + ") and (" + locA2 + "," + locB2 + ").");
+ }
+ }
+ }
+ }
+
+ }
+
+ private String getSymbol(int idx, FlowNode node) {
+ Descriptor desc = node.getDescTuple().get(idx);
+ return desc.getSymbol();
+ }
+
+ private Descriptor getDescriptor(int idx, FlowNode node) {
+ Descriptor desc = node.getDescTuple().get(idx);
+ return desc;
+ }
+
+ private void calculatePCLOC(MethodDescriptor md) {
+
+ System.out.println("#CalculatePCLOC");
+ MethodSummary methodSummary = getMethodSummary(md);
+ FlowGraph fg = getFlowGraph(md);
+ Map<Integer, CompositeLocation> mapParamToLoc = methodSummary.getMapParamIdxToInferLoc();
+
+ // calculate the initial program counter location
+ // PC location is higher than location types of parameters which has incoming flows.
+
+ Set<NTuple<Location>> paramLocTupleHavingInFlowSet = new HashSet<NTuple<Location>>();
+ Set<Descriptor> paramDescNOTHavingInFlowSet = new HashSet<Descriptor>();
+ // Set<FlowNode> paramNodeNOThavingInFlowSet = new HashSet<FlowNode>();
+
+ int numParams = fg.getNumParameters();
+ for (int i = 0; i < numParams; i++) {
+ FlowNode paramFlowNode = fg.getParamFlowNode(i);
+ Descriptor prefix = paramFlowNode.getDescTuple().get(0);
+ NTuple<Descriptor> paramDescTuple = paramFlowNode.getCurrentDescTuple();
+ NTuple<Location> paramLocTuple = translateToLocTuple(md, paramDescTuple);
+
+ Set<FlowNode> inNodeToParamSet = fg.getIncomingNodeSetByPrefix(prefix);
+ if (inNodeToParamSet.size() > 0) {
+ // parameter has in-value flows
+
+ for (Iterator iterator = inNodeToParamSet.iterator(); iterator.hasNext();) {
+ FlowNode inNode = (FlowNode) iterator.next();
+ Set<FlowEdge> outEdgeSet = fg.getOutEdgeSet(inNode);
+ for (Iterator iterator2 = outEdgeSet.iterator(); iterator2.hasNext();) {
+ FlowEdge flowEdge = (FlowEdge) iterator2.next();
+ if (flowEdge.getEndTuple().startsWith(prefix)) {
+ NTuple<Location> paramLocTupleWithIncomingFlow =
+ translateToLocTuple(md, flowEdge.getEndTuple());
+ paramLocTupleHavingInFlowSet.add(paramLocTupleWithIncomingFlow);
+ }
+ }
+ }
+
+ // paramLocTupleHavingInFlowSet.add(paramLocTuple);
+ } else {
+ // paramNodeNOThavingInFlowSet.add(fg.getFlowNode(paramDescTuple));
+ paramDescNOTHavingInFlowSet.add(prefix);
+ }
+ }
+
+ System.out.println("paramLocTupleHavingInFlowSet=" + paramLocTupleHavingInFlowSet);
+
+ if (paramLocTupleHavingInFlowSet.size() > 0
+ /* && !coversAllParamters(md, fg, paramLocTupleHavingInFlowSet) */) {
+
+ // Here, generates a location in the method lattice that is higher than the
+ // paramLocTupleHavingInFlowSet
+ NTuple<Location> pcLocTuple =
+ generateLocTupleRelativeTo(md, paramLocTupleHavingInFlowSet, PCLOC);
+
+ NTuple<Descriptor> pcDescTuple = translateToDescTuple(pcLocTuple);
+
+ // 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());
+ }
+ }
+
+ System.out.println("pcLoc=" + pcLocTuple);
+
+ methodSummary.setPCLoc(new CompositeLocation(pcLocTuple));
+ }
+ }
+
+ private boolean coversAllParamters(MethodDescriptor md, FlowGraph fg,
+ Set<NTuple<Location>> paramLocTupleHavingInFlowSet) {
+
+ int numParam = fg.getNumParameters();
+ int size = paramLocTupleHavingInFlowSet.size();
+
+ if (!md.isStatic()) {
+
+ // if the method is not static && there is a parameter composite location &&
+ // it is started with 'this',
+ // paramLocTupleHavingInFlowSet need to have 'this' parameter.
+
+ FlowNode thisParamNode = fg.getParamFlowNode(0);
+ NTuple<Location> thisParamLocTuple =
+ translateToLocTuple(md, thisParamNode.getCurrentDescTuple());
+
+ if (!paramLocTupleHavingInFlowSet.contains(thisParamLocTuple)) {
+
+ for (Iterator iterator = paramLocTupleHavingInFlowSet.iterator(); iterator.hasNext();) {
+ NTuple<Location> paramTuple = (NTuple<Location>) iterator.next();
+ if (paramTuple.size() > 1 && paramTuple.get(0).getLocDescriptor().equals(md.getThis())) {
+ // paramLocTupleHavingInFlowSet.add(thisParamLocTuple);
+ // break;
+ size++;
+ }
+ }
+
+ }
+ }
+
+ if (size == numParam) {
+ return true;
+ } else {
+ return false;
+ }
+
+ }
+
+ private void calculateRETURNLOC(MethodDescriptor md) {
+
+ System.out.println("#calculateRETURNLOC= " + md);
+ // calculate a return location:
+ // the return location type is lower than all parameters and the location of return values
+ MethodSummary methodSummary = getMethodSummary(md);
+ FlowGraph fg = getFlowGraph(md);
+ Map<Integer, CompositeLocation> mapParamToLoc = methodSummary.getMapParamIdxToInferLoc();
+ Set<Integer> paramIdxSet = mapParamToLoc.keySet();
+
+ if (!md.getReturnType().isVoid()) {
+ // first, generate the set of return value location types that starts
+ // with 'this' reference
+
+ Set<FlowNode> paramFlowNodeFlowingToReturnValueSet = getParamNodeFlowingToReturnValue(md);
+ System.out.println("paramFlowNodeFlowingToReturnValueSet="
+ + paramFlowNodeFlowingToReturnValueSet);
+
+ Set<NTuple<Location>> tupleToBeHigherThanReturnLocSet = new HashSet<NTuple<Location>>();
+ for (Iterator iterator = paramFlowNodeFlowingToReturnValueSet.iterator(); iterator.hasNext();) {
+ FlowNode fn = (FlowNode) iterator.next();
+ NTuple<Descriptor> paramDescTuple = fn.getCurrentDescTuple();
+ tupleToBeHigherThanReturnLocSet.add(translateToLocTuple(md, paramDescTuple));
+ }
+
+ Set<FlowNode> returnNodeSet = fg.getReturnNodeSet();
+ for (Iterator iterator = returnNodeSet.iterator(); iterator.hasNext();) {
+ FlowNode returnNode = (FlowNode) iterator.next();
+ NTuple<Descriptor> returnDescTuple = returnNode.getCurrentDescTuple();
+ tupleToBeHigherThanReturnLocSet.add(translateToLocTuple(md, returnDescTuple));
+ }
+ System.out.println("-flow graph's returnNodeSet=" + returnNodeSet);
+ System.out.println("tupleSetToBeHigherThanReturnLoc=" + tupleToBeHigherThanReturnLocSet);
+
+ // Here, generates a return location in the method lattice that is lower than the
+ // locFlowingToReturnValueSet
+ NTuple<Location> returnLocTuple =
+ generateLocTupleRelativeTo(md, tupleToBeHigherThanReturnLocSet, RLOC);
+
+ System.out.println("returnLocTuple=" + returnLocTuple);
+
+ NTuple<Descriptor> returnDescTuple = translateToDescTuple(returnLocTuple);
+ for (Iterator iterator = tupleToBeHigherThanReturnLocSet.iterator(); iterator.hasNext();) {
+ NTuple<Location> higherTuple = (NTuple<Location>) iterator.next();
+ fg.addValueFlowEdge(translateToDescTuple(higherTuple), returnDescTuple);
+ }
+
+ fg.getFlowNode(returnDescTuple).setSkeleton(true);
+ System.out.println("fg node set=" + fg.getNodeSet());
+
+ methodSummary.setRETURNLoc(new CompositeLocation(returnLocTuple));
+
+ // skip: for (Iterator iterator = returnNodeSet.iterator(); iterator.hasNext();) {
+ // FlowNode returnNode = (FlowNode) iterator.next();
+ //
+ // NTuple<Descriptor> returnDescTuple = returnNode.getCurrentDescTuple();
+ // NTuple<Location> returnLocTuple = translateToLocTuple(md, returnDescTuple);
+ //
+ // if (returnLocTuple.get(0).getLocDescriptor().equals(md.getThis())) {
+ // // if the location type of the return value matches "this" reference
+ // // then, check whether this return value is equal to/lower than all
+ // // of parameters that possibly flow into the return values
+ // for (Iterator iterator2 = inferParamLocSet.iterator(); iterator2.hasNext();) {
+ // CompositeLocation paramInferLoc = (CompositeLocation) iterator2.next();
+ //
+ // if ((!paramInferLoc.equals(returnLocTuple))
+ // && !isGreaterThan(methodLattice, paramInferLoc, inferReturnLoc)) {
+ // continue skip;
+ // }
+ // }
+ // inferFieldReturnLocSet.add(returnLocTuple);
+ //
+ // }
+ // }
+
+ // if (inferFieldReturnLocSet.size() > 0) {
+ //
+ // // CompositeLocation returnLoc = getLowest(methodLattice, inferFieldReturnLocSet);
+ // CompositeLocation returnLoc = null;
+ // if (returnLoc == null) {
+ // // in this case, assign <'this',bottom> to the RETURNLOC
+ // returnLoc = new CompositeLocation(new Location(md, md.getThis().getSymbol()));
+ // returnLoc.addLocation(new Location(md.getClassDesc(), getLattice(md.getClassDesc())
+ // .getBottomItem()));
+ // }
+ // methodInfo.setReturnLoc(returnLoc);
+ //
+ // } else {
+ // String returnLocSymbol = "RETURNLOC";
+ // CompositeLocation returnLocInferLoc =
+ // new CompositeLocation(new Location(md, returnLocSymbol));
+ // methodInfo.setReturnLoc(returnLocInferLoc);
+ //
+ // for (Iterator iterator = paramIdxSet.iterator(); iterator.hasNext();) {
+ // Integer paramIdx = (Integer) iterator.next();
+ // CompositeLocation inferLoc = mapParamToLoc.get(paramIdx);
+ // String paramLocLocalSymbol = inferLoc.get(0).getLocIdentifier();
+ // if (!methodLattice.isGreaterThan(paramLocLocalSymbol, returnLocSymbol)) {
+ // // TODO
+ // // addRelationHigherToLower(methodLattice, methodInfo,
+ // // paramLocLocalSymbol,
+ // // returnLocSymbol);
+ // }
+ // }
+ //
+ // for (Iterator iterator = returnNodeSet.iterator(); iterator.hasNext();) {
+ // FlowNode returnNode = (FlowNode) iterator.next();
+ // CompositeLocation inferLoc =
+ // generateInferredCompositeLocation(methodInfo, fg.getLocationTuple(returnNode));
+ // if (!isGreaterThan(methodLattice, inferLoc, returnLocInferLoc)) {
+ // // TODO
+ // // addRelation(methodLattice, methodInfo, inferLoc,
+ // // returnLocInferLoc);
+ // }
+ // }
+ //
+ // }
+
}
-
}
- private void debug_writeLatticeDotFile() {
- // generate lattice dot file
-
- setupToAnalyze();
-
- while (!toAnalyzeIsEmpty()) {
- ClassDescriptor cd = toAnalyzeNext();
-
- setupToAnalazeMethod(cd);
+ private void calculateExtraLocations(MethodDescriptor md) {
+ // calcualte pcloc, returnloc,...
- SSJavaLattice<String> classLattice = cd2lattice.get(cd);
- if (classLattice != null) {
- ssjava.writeLatticeDotFile(cd, null, classLattice);
- debug_printDescriptorToLocNameMapping(cd);
- }
+ System.out.println("\nSSJAVA:Calculate PCLOC/RETURNLOC locations: " + md);
- while (!toAnalyzeMethodIsEmpty()) {
- MethodDescriptor md = toAnalyzeMethodNext();
- SSJavaLattice<String> methodLattice = md2lattice.get(md);
- if (methodLattice != null) {
- ssjava.writeLatticeDotFile(cd, md, methodLattice);
- debug_printDescriptorToLocNameMapping(md);
- }
- }
- }
+ calculatePCLOC(md);
+ calculateRETURNLOC(md);
}
- private void debug_printDescriptorToLocNameMapping(Descriptor desc) {
+ private NTuple<Location> generateLocTupleRelativeTo(MethodDescriptor md,
+ Set<NTuple<Location>> paramLocTupleHavingInFlowSet, String locNamePrefix) {
- LocationInfo info = getLocationInfo(desc);
- System.out.println("## " + desc + " ##");
- System.out.println(info.getMapDescToInferLocation());
- LocationInfo locInfo = getLocationInfo(desc);
- System.out.println("mapping=" + locInfo.getMapLocSymbolToDescSet());
- System.out.println("###################");
+ System.out.println("-generateLocTupleRelativeTo=" + paramLocTupleHavingInFlowSet);
- }
+ NTuple<Location> higherLocTuple = new NTuple<Location>();
- private void inferLattices() {
- }
+ VarDescriptor thisVarDesc = md.getThis();
+ // check if all paramter loc tuple is started with 'this' reference
+ boolean hasParamNotStartedWithThisRef = false;
- private void calculateExtraLocations() {
- LinkedList<MethodDescriptor> descriptorListToAnalyze = ssjava.getSortedDescriptors();
- for (Iterator iterator = descriptorListToAnalyze.iterator(); iterator.hasNext();) {
- MethodDescriptor md = (MethodDescriptor) iterator.next();
- calculateExtraLocations(md);
- }
- }
+ int minSize = 0;
- private void setMethodLocInfo(MethodDescriptor md, MethodLocationInfo methodInfo) {
- mapMethodDescToMethodLocationInfo.put(md, methodInfo);
- }
+ Set<NTuple<Location>> paramLocTupleStartedWithThis = new HashSet<NTuple<Location>>();
- private void checkLatticesOfVirtualMethods(MethodDescriptor md) {
+ next: for (Iterator iterator = paramLocTupleHavingInFlowSet.iterator(); iterator.hasNext();) {
+ NTuple<Location> paramLocTuple = (NTuple<Location>) iterator.next();
+ Descriptor paramLocalDesc = paramLocTuple.get(0).getLocDescriptor();
+ if (!paramLocalDesc.equals(thisVarDesc)) {
- if (!md.isStatic()) {
- Set<MethodDescriptor> setPossibleCallees = new HashSet<MethodDescriptor>();
- setPossibleCallees.addAll(ssjava.getCallGraph().getMethods(md));
+ Set<FlowNode> inNodeSet = getFlowGraph(md).getIncomingNodeSetByPrefix(paramLocalDesc);
+ for (Iterator iterator2 = inNodeSet.iterator(); iterator2.hasNext();) {
+ FlowNode flowNode = (FlowNode) iterator2.next();
+ if (flowNode.getDescTuple().startsWith(thisVarDesc)) {
+ System.out.println("paramLocTuple=" + paramLocTuple + " is lower than THIS");
+ continue next;
+ }
+ }
+ hasParamNotStartedWithThisRef = true;
- for (Iterator iterator = setPossibleCallees.iterator(); iterator.hasNext();) {
- MethodDescriptor mdCallee = (MethodDescriptor) iterator.next();
- if (!md.equals(mdCallee)) {
- checkConsistency(md, mdCallee);
+ } else if (paramLocTuple.size() > 1) {
+ paramLocTupleStartedWithThis.add(paramLocTuple);
+ if (minSize == 0 || minSize > paramLocTuple.size()) {
+ minSize = paramLocTuple.size();
+ }
+ }
+ }
+
+ System.out.println("---paramLocTupleStartedWithThis=" + paramLocTupleStartedWithThis);
+ Descriptor enclosingDesc = md;
+ if (hasParamNotStartedWithThisRef) {
+ // in this case, PCLOC will be the local location
+ } 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++) {
+ Set<Descriptor> locDescSet = new HashSet<Descriptor>();
+ Location curLoc = null;
+ NTuple<Location> paramLocTuple = null;
+ for (Iterator iterator = paramLocTupleStartedWithThis.iterator(); iterator.hasNext();) {
+ paramLocTuple = (NTuple<Location>) iterator.next();
+ System.out.println("-----paramLocTuple=" + paramLocTuple + " idx=" + idx);
+ curLoc = paramLocTuple.get(idx);
+ Descriptor locDesc = curLoc.getLocDescriptor();
+ locDescSet.add(locDesc);
+ }
+ System.out.println("-----locDescSet=" + locDescSet + " idx=" + idx);
+ if (locDescSet.size() != 1) {
+ break;
}
+ Location newLocElement = new Location(curLoc.getDescriptor(), curLoc.getLocDescriptor());
+ higherLocTuple.add(newLocElement);
+ enclosingDesc = getClassTypeDescriptor(curLoc.getLocDescriptor());
}
}
+ String pcLocIdentifier = locNamePrefix + (locSeed++);
+ NameDescriptor pcLocDesc = new NameDescriptor(pcLocIdentifier);
+ Location newLoc = new Location(enclosingDesc, pcLocDesc);
+ higherLocTuple.add(newLoc);
+
+ System.out.println("---new loc tuple=" + higherLocTuple);
+
+ return higherLocTuple;
+
}
- private void checkConsistency(MethodDescriptor md1, MethodDescriptor md2) {
+ public ClassDescriptor getClassTypeDescriptor(Descriptor in) {
- // check that two lattice have the same relations between parameters(+PC
- // LOC, GLOBAL_LOC RETURN LOC)
+ if (in instanceof VarDescriptor) {
+ return ((VarDescriptor) in).getType().getClassDesc();
+ } else if (in instanceof FieldDescriptor) {
+ return ((FieldDescriptor) in).getType().getClassDesc();
+ }
+ // else if (in instanceof LocationDescriptor) {
+ // // here is the case that the descriptor 'in' is the last element of the assigned composite
+ // // location
+ // return ((VarDescriptor) locTuple.get(0).getLocDescriptor()).getType().getClassDesc();
+ // }
+ else {
+ return null;
+ }
- List<CompositeLocation> list1 = new ArrayList<CompositeLocation>();
- List<CompositeLocation> list2 = new ArrayList<CompositeLocation>();
+ }
- MethodLocationInfo locInfo1 = getMethodLocationInfo(md1);
- MethodLocationInfo locInfo2 = getMethodLocationInfo(md2);
+ private Set<NTuple<Location>> calculateHighestLocTupleSet(
+ Set<NTuple<Location>> paramLocTupleHavingInFlowSet) {
- Map<Integer, CompositeLocation> paramMap1 = locInfo1.getMapParamIdxToInferLoc();
- Map<Integer, CompositeLocation> paramMap2 = locInfo2.getMapParamIdxToInferLoc();
+ Set<NTuple<Location>> highestSet = new HashSet<NTuple<Location>>();
- int numParam = locInfo1.getMapParamIdxToInferLoc().keySet().size();
+ Iterator<NTuple<Location>> iterator = paramLocTupleHavingInFlowSet.iterator();
+ NTuple<Location> highest = iterator.next();
- // add location types of paramters
- for (int idx = 0; idx < numParam; idx++) {
- list1.add(paramMap1.get(Integer.valueOf(idx)));
- list2.add(paramMap2.get(Integer.valueOf(idx)));
+ for (; iterator.hasNext();) {
+ NTuple<Location> curLocTuple = (NTuple<Location>) iterator.next();
+ if (isHigherThan(curLocTuple, highest)) {
+ System.out.println(curLocTuple + " is greater than " + highest);
+ highest = curLocTuple;
+ }
}
- // add program counter location
- list1.add(locInfo1.getPCLoc());
- list2.add(locInfo2.getPCLoc());
+ highestSet.add(highest);
- if (!md1.getReturnType().isVoid()) {
- // add return value location
- CompositeLocation rtrLoc1 = getMethodLocationInfo(md1).getReturnLoc();
- CompositeLocation rtrLoc2 = getMethodLocationInfo(md2).getReturnLoc();
- list1.add(rtrLoc1);
- list2.add(rtrLoc2);
- }
+ MethodDescriptor md = (MethodDescriptor) highest.get(0).getDescriptor();
+ VarDescriptor thisVarDesc = md.getThis();
- // add global location type
- if (md1.isStatic()) {
- CompositeLocation globalLoc1 =
- new CompositeLocation(new Location(md1, locInfo1.getGlobalLocName()));
- CompositeLocation globalLoc2 =
- new CompositeLocation(new Location(md2, locInfo2.getGlobalLocName()));
- list1.add(globalLoc1);
- list2.add(globalLoc2);
- }
+ System.out.println("highest=" + highest);
- for (int i = 0; i < list1.size(); i++) {
- CompositeLocation locA1 = list1.get(i);
- CompositeLocation locA2 = list2.get(i);
- for (int k = 0; k < list1.size(); k++) {
- if (i != k) {
- CompositeLocation locB1 = list1.get(k);
- CompositeLocation locB2 = list2.get(k);
- boolean r1 = isGreaterThan(getLattice(md1), locA1, locB1);
+ for (Iterator<NTuple<Location>> iter = paramLocTupleHavingInFlowSet.iterator(); iter.hasNext();) {
+ NTuple<Location> curLocTuple = iter.next();
- boolean r2 = isGreaterThan(getLattice(md1), locA2, locB2);
+ if (!curLocTuple.equals(highest) && !hasOrderingRelation(highest, curLocTuple)) {
+
+ System.out.println("add it to the highest set=" + curLocTuple);
+ highestSet.add(curLocTuple);
- if (r1 != r2) {
- throw new Error("The method " + md1 + " is not consistent with the method " + md2
- + ".:: They have a different ordering relation between locations (" + locA1 + ","
- + locB1 + ") and (" + locA2 + "," + locB2 + ").");
- }
- }
}
}
- }
-
- private String getSymbol(int idx, FlowNode node) {
- Descriptor desc = node.getDescTuple().get(idx);
- return desc.getSymbol();
- }
+ return highestSet;
- private Descriptor getDescriptor(int idx, FlowNode node) {
- Descriptor desc = node.getDescTuple().get(idx);
- return desc;
}
- private void calculateExtraLocations(MethodDescriptor md) {
+ private void calculateExtraLocations2(MethodDescriptor md) {
// calcualte pcloc, returnloc,...
SSJavaLattice<String> methodLattice = getMethodLattice(md);
String paramLocLocalSymbol = inferLoc.get(0).getLocIdentifier();
if (!methodLattice.isGreaterThan(paramLocLocalSymbol, returnLocSymbol)) {
// TODO
- // addRelationHigherToLower(methodLattice, methodInfo, paramLocLocalSymbol,
+ // addRelationHigherToLower(methodLattice, methodInfo,
+ // paramLocLocalSymbol,
// returnLocSymbol);
}
}
generateInferredCompositeLocation(methodInfo, fg.getLocationTuple(returnNode));
if (!isGreaterThan(methodLattice, inferLoc, returnLocInferLoc)) {
// TODO
- // addRelation(methodLattice, methodInfo, inferLoc, returnLocInferLoc);
+ // addRelation(methodLattice, methodInfo, inferLoc,
+ // returnLocInferLoc);
}
}
private void propagateFlowsToCallerWithNoCompositeLocation(MethodInvokeNode min,
MethodDescriptor mdCaller, MethodDescriptor mdCallee) {
- System.out.println("\n##PROPAGATE callee=" + mdCallee + "TO caller=" + mdCaller);
-
// if the parameter A reaches to the parameter B
// then, add an edge the argument A -> the argument B to the caller's flow
// graph
// parameters
Set<FlowNode> localReachSet = calleeFlowGraph.getLocalReachFlowNodeSetFrom(paramNode1);
+ System.out.println("-param1=" + paramNode1 + " is higher than param2=" + paramNode2);
+ // System.out.println("-- localReachSet from param1=" + localReachSet);
+
+ NTuple<Descriptor> paramDescTuple1 = paramNode1.getCurrentDescTuple();
+ NTuple<Descriptor> paramDescTuple2 = paramNode2.getCurrentDescTuple();
+
+ System.out.println("-param1CurTuple=" + paramDescTuple1 + " param2CurTuple="
+ + paramDescTuple2);
+ 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;
+ }
- if (localReachSet.contains(paramNode2)) {
+ if (arg1Tuple.size() > 0 && arg2Tuple.size() > 0 && localReachSet.contains(paramNode2)) {
// 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("-arg1Tuple=" + arg1Tuple + " is higher than arg2Tuple=" + arg2Tuple);
-
- // otherwise, flows between method/field locations...
+ // 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();
}
}
}
- System.out.println("##\n");
+
+ // if a parameter has a composite location and the first element of the parameter location
+ // matches the callee's 'this'
+ // we have a more specific constraint: the caller's corresponding argument is higher than the
+ // parameter location which is translated into the caller
+
+ for (int idx = 0; idx < numParam; idx++) {
+ FlowNode paramNode = calleeFlowGraph.getParamFlowNode(idx);
+ CompositeLocation compLoc = paramNode.getCompositeLocation();
+ if (compLoc != null) {
+ System.out.println("$$$COMPLOC CASE=" + compLoc);
+ NTuple<Descriptor> argTuple = getNodeTupleByArgIdx(min, idx);
+ NTuple<Descriptor> translatedParamTuple = translateCompositeLocationToCaller(min, compLoc);
+ System.out.println("add a flow edge= " + argTuple + "->" + translatedParamTuple);
+ callerFlowGraph.addValueFlowEdge(argTuple, translatedParamTuple);
+ }
+ }
}
// graph
// TODO
- // also if a parameter is a composite location and is started with "this" reference,
- // need to make sure that the corresponding argument is higher than the translated location of
+ // also if a parameter is a composite location and is started with "this"
+ // reference,
+ // need to make sure that the corresponding argument is higher than the
+ // translated location of
// the parameter.
FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
// calculate the prefix of the argument
if (arg2Tuple.size() == 1 && arg2Tuple.get(0).equals(baseRef)) {
- // in this case, the callee flow causes a caller flow to the object whose method
+ // in this case, the callee flow causes a caller flow to the
+ // object whose method
// is invoked.
if (!paramNode1.getCurrentDescTuple().startsWith(mdCallee.getThis())) {
paramNode1);
if (param1Prefix != null && param1Prefix.startsWith(mdCallee.getThis())) {
- // in this case, we need to create a new edge 'this.FIELD'->'this'
- // but we couldn't... instead we assign a new composite location started
+ // in this case, we need to create a new edge
+ // 'this.FIELD'->'this'
+ // but we couldn't... instead we assign a new composite
+ // location started
// with 'this' reference to the corresponding parameter
CompositeLocation compLocForParam1 =
.println("set comp loc=" + compLocForParam1 + " to " + paramNode1);
paramNode1.setCompositeLocation(compLocForParam1);
- // then, we need to make sure that the corresponding argument in the caller
- // is required to be higher than or equal to the translated parameter
+ // then, we need to make sure that the corresponding
+ // argument in the caller
+ // is required to be higher than or equal to the
+ // translated parameter
// location
NTuple<Descriptor> translatedParamTuple =
}
} else if (arg1Tuple.size() == 1 && arg1Tuple.get(0).equals(baseRef)) {
- // in this case, the callee flow causes a caller flow originated from the object
+ // in this case, the callee flow causes a caller flow
+ // originated from the object
// whose
// method is invoked.
if (param2Prefix != null && param2Prefix.startsWith(mdCallee.getThis())) {
// in this case, we need to create a new edge 'this' ->
- // 'this.FIELD' but we couldn't... instead we assign the corresponding
- // parameter a new composite location started with 'this' reference
+ // 'this.FIELD' but we couldn't... instead we assign the
+ // corresponding
+ // parameter a new composite location started with
+ // 'this' reference
CompositeLocation compLocForParam2 =
generateCompositeLocation(mdCallee, param2Prefix);
tuple.add(baseTuple.get(i));
}
- for (int i = 1; i < compLocForParam1.getSize(); i++) {
+ for (int i = baseTuple.size(); i < compLocForParam1.getSize(); i++) {
Location loc = compLocForParam1.get(i);
tuple.add(loc.getLocDescriptor());
}
if (lastDescOfPrefix instanceof FieldDescriptor) {
enclosingDescriptor = ((FieldDescriptor) lastDescOfPrefix).getType().getClassDesc();
// System.out.println("enclosingDescriptor0=" + enclosingDescriptor);
+ } else if (lastDescOfPrefix.equals(GLOBALDESC)) {
+ MethodDescriptor currentMethodDesc = (MethodDescriptor) prefixLocTuple.get(0).getDescriptor();
+ enclosingDescriptor = currentMethodDesc.getClassDesc();
} else {
// var descriptor case
enclosingDescriptor = ((VarDescriptor) lastDescOfPrefix).getType().getClassDesc();
if (curDescriptor instanceof VarDescriptor) {
enclosingDescriptor = md.getClassDesc();
+ } else if (curDescriptor instanceof FieldDescriptor) {
+ enclosingDescriptor = ((FieldDescriptor) curDescriptor).getClassDescriptor();
} else if (curDescriptor instanceof NameDescriptor) {
// it is "GLOBAL LOC" case!
enclosingDescriptor = GLOBALDESC;
} else {
- enclosingDescriptor = ((FieldDescriptor) curDescriptor).getClassDescriptor();
+ enclosingDescriptor = null;
}
}
- System.out.println("-convertToCompositeLocation from=" + tuple + " to " + compLoc);
-
return compLoc;
}
return false;
}
- public boolean isPrimitiveLocalVariable(FlowNode node) {
- VarDescriptor varDesc = (VarDescriptor) node.getDescTuple().get(0);
- return varDesc.getType().isPrimitive();
- }
-
private SSJavaLattice<String> getLattice(Descriptor d) {
if (d instanceof MethodDescriptor) {
return getMethodLattice((MethodDescriptor) d);
if (idx == 0) {
classDesc = ((VarDescriptor) desc).getType().getClassDesc();
} else {
- classDesc = ((FieldDescriptor) desc).getType().getClassDesc();
+ if (desc instanceof FieldDescriptor) {
+ classDesc = ((FieldDescriptor) desc).getType().getClassDesc();
+ } else {
+ // this case is that the local variable has a composite location assignment
+ // the following element after the composite location to the local variable
+ // has the enclosing descriptor of the local variable
+ Descriptor localDesc = srcNode.getDescTuple().get(0);
+ classDesc = ((VarDescriptor) localDesc).getType().getClassDesc();
+ }
}
-
extractFlowsBetweenFields(classDesc, srcNode, dstNode, idx + 1);
} else {
}
+ public boolean isTransitivelyCalledFrom(MethodDescriptor callee, MethodDescriptor caller) {
+ // if the callee is transitively invoked from the caller
+ // return true;
+
+ int callerIdx = toanalyze_methodDescList.indexOf(caller);
+ int calleeIdx = toanalyze_methodDescList.indexOf(callee);
+
+ if (callerIdx < calleeIdx) {
+ return true;
+ }
+
+ return false;
+
+ }
+
public void constructFlowGraph() {
System.out.println("");
analyzeMethodBody(md.getClassDesc(), md);
- System.out.println("##constructSubGlobalFlowGraph");
- GlobalFlowGraph subGlobalFlowGraph = constructSubGlobalFlowGraph(fg);
+ // System.out.println("##constructSubGlobalFlowGraph");
+ // GlobalFlowGraph subGlobalFlowGraph = constructSubGlobalFlowGraph(fg);
+ // mapMethodDescriptorToSubGlobalFlowGraph.put(md, subGlobalFlowGraph);
+ //
+ // // TODO
+ // System.out.println("##addValueFlowsFromCalleeSubGlobalFlowGraph");
+ // addValueFlowsFromCalleeSubGlobalFlowGraph(md, subGlobalFlowGraph);
+ // subGlobalFlowGraph.writeGraph("_SUBGLOBAL");
+ //
+ // propagateFlowsFromCalleesWithNoCompositeLocation(md);
+
+ }
+ }
+ // _debug_printGraph();
+
+ methodDescList = (LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
+
+ while (!methodDescList.isEmpty()) {
+ MethodDescriptor md = methodDescList.removeLast();
+ if (state.SSJAVADEBUG) {
+ System.out.println();
+ System.out.println("SSJAVA: Constructing a sub global flow graph: " + md);
+
+ GlobalFlowGraph subGlobalFlowGraph = constructSubGlobalFlowGraph(getFlowGraph(md));
mapMethodDescriptorToSubGlobalFlowGraph.put(md, subGlobalFlowGraph);
-
+
// TODO
- System.out.println("##addValueFlowsFromCalleeSubGlobalFlowGraph");
+ System.out.println("-add Value Flows From CalleeSubGlobalFlowGraph");
addValueFlowsFromCalleeSubGlobalFlowGraph(md, subGlobalFlowGraph);
subGlobalFlowGraph.writeGraph("_SUBGLOBAL");
- propagateFlowsFromCalleesWithNoCompositeLocation(md);
- // assignCompositeLocation(md);
+ // System.out.println("-propagate Flows From Callees With No CompositeLocation");
+ // propagateFlowsFromCalleesWithNoCompositeLocation(md);
}
}
- _debug_printGraph();
}
newImplicitTupleSet.addTupleSet(implicitFlowTupleSet);
newImplicitTupleSet.addTupleSet(condTupleNode);
- if (newImplicitTupleSet.size() > 1) {
- // need to create an intermediate node for the GLB of conditional locations & implicit flows
+ if (needToGenerateInterLoc(newImplicitTupleSet)) {
+ // 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();
private void analyzeFlowReturnNode(MethodDescriptor md, SymbolTable nametable, ReturnNode rn,
NodeTupleSet implicitFlowTupleSet) {
+ System.out.println("-analyzeFlowReturnNode=" + rn.printNode(0));
ExpressionNode returnExp = rn.getReturnExpression();
if (returnExp != null) {
FlowGraph fg = getFlowGraph(md);
// if (implicitFlowTupleSet.size() == 1
- // && fg.getFlowNode(implicitFlowTupleSet.iterator().next()).isIntermediate()) {
+ // &&
+ // fg.getFlowNode(implicitFlowTupleSet.iterator().next()).isIntermediate())
+ // {
//
- // // since there is already an intermediate node for the GLB of implicit flows
+ // // since there is already an intermediate node for the GLB of implicit
+ // flows
// // we don't need to create another intermediate node.
// // just re-use the intermediate node for implicit flows.
//
- // FlowNode meetNode = fg.getFlowNode(implicitFlowTupleSet.iterator().next());
+ // FlowNode meetNode =
+ // fg.getFlowNode(implicitFlowTupleSet.iterator().next());
//
// for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
- // NTuple<Descriptor> returnNodeTuple = (NTuple<Descriptor>) iterator.next();
+ // NTuple<Descriptor> returnNodeTuple = (NTuple<Descriptor>)
+ // iterator.next();
// fg.addValueFlowEdge(returnNodeTuple, meetNode.getDescTuple());
// }
//
// add tuples corresponding to the current implicit flows
currentFlowTupleSet.addTupleSet(implicitFlowTupleSet);
- if (currentFlowTupleSet.size() > 1) {
+ System.out.println("---currentFlowTupleSet=" + currentFlowTupleSet);
+
+ if (needToGenerateInterLoc(currentFlowTupleSet)) {
+ System.out.println("8");
FlowNode meetNode = fg.createIntermediateNode();
for (Iterator iterator = currentFlowTupleSet.iterator(); iterator.hasNext();) {
NTuple<Descriptor> currentFlowTuple = (NTuple<Descriptor>) iterator.next();
fg.addValueFlowEdge(currentFlowTuple, meetNode.getDescTuple());
}
fg.addReturnFlowNode(meetNode.getDescTuple());
- } else if (currentFlowTupleSet.size() == 1) {
- NTuple<Descriptor> tuple = currentFlowTupleSet.iterator().next();
- fg.addReturnFlowNode(tuple);
+ } else {
+ // currentFlowTupleSet = removeLiteralTuple(currentFlowTupleSet);
+ for (Iterator iterator = currentFlowTupleSet.iterator(); iterator.hasNext();) {
+ NTuple<Descriptor> currentFlowTuple = (NTuple<Descriptor>) iterator.next();
+ fg.addReturnFlowNode(currentFlowTuple);
+ }
}
}
}
+ private NodeTupleSet removeLiteralTuple(NodeTupleSet inSet) {
+ NodeTupleSet tupleSet = new NodeTupleSet();
+ for (Iterator<NTuple<Descriptor>> iter = inSet.iterator(); iter.hasNext();) {
+ NTuple<Descriptor> tuple = iter.next();
+ if (!tuple.get(0).equals(LITERALDESC)) {
+ tupleSet.addTuple(tuple);
+ }
+ }
+ return tupleSet;
+ }
+
+ private boolean needToGenerateInterLoc(NodeTupleSet tupleSet) {
+ int size = 0;
+ for (Iterator<NTuple<Descriptor>> iter = tupleSet.iterator(); iter.hasNext();) {
+ NTuple<Descriptor> descTuple = iter.next();
+ if (!descTuple.get(0).equals(LITERALDESC)) {
+ size++;
+ }
+ }
+ if (size > 1) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
private void analyzeFlowLoopNode(MethodDescriptor md, SymbolTable nametable, LoopNode ln,
NodeTupleSet implicitFlowTupleSet) {
newImplicitTupleSet.addTupleSet(implicitFlowTupleSet);
newImplicitTupleSet.addTupleSet(condTupleNode);
- if (newImplicitTupleSet.size() > 1) {
- // need to create an intermediate node for the GLB of conditional locations & implicit flows
+ if (needToGenerateInterLoc(newImplicitTupleSet)) {
+ // 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();) {
// ///////////
// System.out.println("condTupleNode="+condTupleNode);
- // NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+ // NTuple<Descriptor> interTuple =
+ // getFlowGraph(md).createIntermediateNode().getDescTuple();
//
- // for (Iterator<NTuple<Descriptor>> idxIter = condTupleNode.iterator(); idxIter.hasNext();) {
+ // for (Iterator<NTuple<Descriptor>> idxIter = condTupleNode.iterator();
+ // idxIter.hasNext();) {
// NTuple<Descriptor> tuple = idxIter.next();
// addFlowGraphEdge(md, tuple, interTuple);
// }
- // for (Iterator<NTuple<Descriptor>> idxIter = implicitFlowTupleSet.iterator(); idxIter
+ // for (Iterator<NTuple<Descriptor>> idxIter =
+ // implicitFlowTupleSet.iterator(); idxIter
// .hasNext();) {
// NTuple<Descriptor> tuple = idxIter.next();
// addFlowGraphEdge(md, tuple, interTuple);
analyzeFlowExpressionNode(md, bn.getVarTable(), ln.getCondition(), condTupleNode, null,
implicitFlowTupleSet, false);
- // ///////////
- NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+ NodeTupleSet newImplicitTupleSet = new NodeTupleSet();
+ newImplicitTupleSet.addTupleSet(implicitFlowTupleSet);
+ newImplicitTupleSet.addTupleSet(condTupleNode);
- for (Iterator<NTuple<Descriptor>> idxIter = condTupleNode.iterator(); idxIter.hasNext();) {
- NTuple<Descriptor> tuple = idxIter.next();
- addFlowGraphEdge(md, tuple, interTuple);
- }
+ if (needToGenerateInterLoc(newImplicitTupleSet)) {
+ // 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);
- for (Iterator<NTuple<Descriptor>> idxIter = implicitFlowTupleSet.iterator(); idxIter
- .hasNext();) {
- NTuple<Descriptor> tuple = idxIter.next();
- addFlowGraphEdge(md, tuple, interTuple);
}
- NodeTupleSet newImplicitSet = new NodeTupleSet();
- newImplicitSet.addTuple(interTuple);
- analyzeFlowBlockNode(md, bn.getVarTable(), ln.getUpdate(), newImplicitSet);
- analyzeFlowBlockNode(md, bn.getVarTable(), ln.getBody(), newImplicitSet);
+ // ///////////
+ // NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+ //
+ // for (Iterator<NTuple<Descriptor>> idxIter = condTupleNode.iterator(); idxIter.hasNext();) {
+ // NTuple<Descriptor> tuple = idxIter.next();
+ // addFlowGraphEdge(md, tuple, interTuple);
+ // }
+ //
+ // for (Iterator<NTuple<Descriptor>> idxIter = implicitFlowTupleSet.iterator(); idxIter
+ // .hasNext();) {
+ // NTuple<Descriptor> tuple = idxIter.next();
+ // addFlowGraphEdge(md, tuple, interTuple);
+ // }
+ //
+ // NodeTupleSet newImplicitSet = new NodeTupleSet();
+ // newImplicitSet.addTuple(interTuple);
+ analyzeFlowBlockNode(md, bn.getVarTable(), ln.getUpdate(), newImplicitTupleSet);
+ analyzeFlowBlockNode(md, bn.getVarTable(), ln.getBody(), newImplicitTupleSet);
// ///////////
// condTupleNode.addTupleSet(implicitFlowTupleSet);
newImplicitTupleSet.addTupleSet(implicitFlowTupleSet);
newImplicitTupleSet.addTupleSet(condTupleNode);
- System.out.println("condTupleNode=" + condTupleNode);
- System.out.println("implicitFlowTupleSet=" + implicitFlowTupleSet);
- System.out.println("newImplicitTupleSet=" + newImplicitTupleSet);
+ // System.out.println("-condTupleNode=" + condTupleNode);
+ // System.out.println("-implicitFlowTupleSet=" + implicitFlowTupleSet);
+ // System.out.println("-newImplicitTupleSet=" + newImplicitTupleSet);
- if (newImplicitTupleSet.size() > 1) {
+ if (needToGenerateInterLoc(newImplicitTupleSet)) {
// need to create an intermediate node for the GLB of conditional locations & implicit flows
NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
// creates edges from RHS to LHS
NTuple<Descriptor> interTuple = null;
- if (nodeSetRHS.size() > 1) {
+ if (needToGenerateInterLoc(nodeSetRHS)) {
+
interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
}
break;
case Kind.LiteralNode:
- analyzeLiteralNode(md, nametable, (LiteralNode) en);
+ analyzeFlowLiteralNode(md, nametable, (LiteralNode) en, nodeSet);
break;
case Kind.MethodInvokeNode:
}
private Set<FlowNode> getParamNodeFlowingToReturnValue(MethodDescriptor md) {
+
+ if (!mapMethodDescToParamNodeFlowsToReturnValue.containsKey(md)) {
+ mapMethodDescToParamNodeFlowsToReturnValue.put(md, new HashSet<FlowNode>());
+ }
+
return mapMethodDescToParamNodeFlowsToReturnValue.get(md);
}
private void analyzeFlowMethodInvokeNode(MethodDescriptor md, SymbolTable nametable,
MethodInvokeNode min, NodeTupleSet nodeSet, NodeTupleSet implicitFlowTupleSet) {
- System.out.println("analyzeFlowMethodInvokeNode=" + min.printNode(0));
+ mapMethodInvokeNodeToArgIdxMap.put(min, new HashMap<Integer, NTuple<Descriptor>>());
if (nodeSet == null) {
nodeSet = new NodeTupleSet();
FlowGraph calleeFlowGraph = getFlowGraph(calleeMethodDesc);
Set<FlowNode> calleeReturnSet = calleeFlowGraph.getReturnNodeSet();
- System.out.println("#calleeReturnSet=" + calleeReturnSet);
+ // System.out.println("-calleeReturnSet=" + calleeReturnSet);
if (min.getExpression() != null) {
} else {
// TODO
Set<FlowNode> inFlowSet = calleeFlowGraph.getIncomingFlowNodeSet(returnNode);
- System.out.println("inFlowSet=" + inFlowSet + " from retrunNode=" + 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(calleeMethodDesc.getThis())) {
}
}
-
// analyze parameter flows
if (min.numArgs() > 0) {
// if argument is liternal node, argTuple is set to NULL
NTuple<Descriptor> argTuple = new NTuple<Descriptor>();
- System.out.println("-argTupleSet=" + argTupleSet + " from en=" + en.printNode(0));
- if (argTupleSet.size() > 1) {
+ if (needToGenerateInterLoc(argTupleSet)) {
NTuple<Descriptor> interTuple =
getFlowGraph(md).createIntermediateNode().getDescTuple();
for (Iterator<NTuple<Descriptor>> idxIter = argTupleSet.iterator(); idxIter.hasNext();) {
addFlowGraphEdge(md, tuple, interTuple);
}
argTuple = interTuple;
- } else {
+ } else if (argTupleSet.size() == 1) {
argTuple = argTupleSet.iterator().next();
+ } else {
+ argTuple = new NTuple<Descriptor>();
}
addArgIdxMap(min, idx, argTuple);
+
FlowNode paramNode = calleeFlowGraph.getParamFlowNode(idx);
+
+ // check whether a param node in the callee graph has incoming flows
+ // if it has incoming flows, the corresponding arg should be lower than the current PC
+ // Descriptor prefix = paramNode.getDescTuple().get(0);
+ // if (calleeFlowGraph.getIncomingNodeSetByPrefix(prefix).size() > 0) {
+ // for (Iterator<NTuple<Descriptor>> iterator = implicitFlowTupleSet.iterator(); iterator
+ // .hasNext();) {
+ // NTuple<Descriptor> pcTuple = iterator.next();
+ // System.out.println("add edge pcTuple =" + pcTuple + " -> " + argTuple);
+ // addFlowGraphEdge(md, pcTuple, argTuple);
+ // }
+ // }
+
if (hasInFlowTo(calleeFlowGraph, paramNode, calleeReturnSet)
|| calleeMethodDesc.getModifiers().isNative()) {
addParamNodeFlowingToReturnValue(calleeMethodDesc, paramNode);
// 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();
mapIdxToTuple.put(new Integer(idx), argTuple);
}
- private void analyzeLiteralNode(MethodDescriptor md, SymbolTable nametable, LiteralNode en) {
-
+ private void analyzeFlowLiteralNode(MethodDescriptor md, SymbolTable nametable, LiteralNode en,
+ NodeTupleSet nodeSet) {
+ NTuple<Descriptor> tuple = new NTuple<Descriptor>();
+ tuple.add(LITERALDESC);
+ nodeSet.addTuple(tuple);
}
private void analyzeFlowArrayAccessNode(MethodDescriptor md, SymbolTable nametable,
nodeSet.addTupleSet(expNodeTupleSet);
} else {
- nodeSet.addTupleSet(expNodeTupleSet);
- nodeSet.addTupleSet(idxNodeTupleSet);
+
+ NodeTupleSet nodeSetArrayAccessExp = new NodeTupleSet();
+
+ nodeSetArrayAccessExp.addTupleSet(expNodeTupleSet);
+ nodeSetArrayAccessExp.addTupleSet(idxNodeTupleSet);
+
+ if (needToGenerateInterLoc(nodeSetArrayAccessExp)) {
+ NTuple<Descriptor> interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
+
+ for (Iterator<NTuple<Descriptor>> iter = nodeSetArrayAccessExp.iterator(); iter.hasNext();) {
+ NTuple<Descriptor> higherTuple = iter.next();
+ addFlowGraphEdge(md, higherTuple, interTuple);
+ }
+ nodeSetArrayAccessExp.clear();
+ nodeSetArrayAccessExp.addTuple(interTuple);
+ }
+
+ nodeSet.addTupleSet(nodeSetArrayAccessExp);
}
}
private NTuple<Descriptor> analyzeFlowNameNode(MethodDescriptor md, SymbolTable nametable,
NameNode nn, NodeTupleSet nodeSet, NTuple<Descriptor> base, NodeTupleSet implicitFlowTupleSet) {
- // System.out.println("analyzeFlowNameNode=" + nn.printNode(0));
-
if (base == null) {
base = new NTuple<Descriptor>();
}
if (fd.isFinal()) {
// if it is 'static final', no need to have flow node for the TOP
// location
+ System.out.println("STATIC FINAL");
return null;
} else {
// if 'static', assign the default GLOBAL LOCATION to the first
// creates edges from RHS to LHS
NTuple<Descriptor> interTuple = null;
- if (nodeSetRHS.size() > 1) {
+ if (needToGenerateInterLoc(nodeSetRHS)) {
interTuple = getFlowGraph(md).createIntermediateNode().getDescTuple();
}
String fileName = "lattice_";
if (md != null) {
fileName +=
- cd.getSymbol().replaceAll("[\\W_]", "") + "_" + md.toString().replaceAll("[\\W_]", "");
+ /* cd.getSymbol().replaceAll("[\\W_]", "") + "_" + */md.toString().replaceAll("[\\W_]", "");
} else {
fileName += cd.getSymbol().replaceAll("[\\W_]", "");
}
bw.write(locName + " [label=\"" + prettyStr + "\"]" + ";\n");
}
- public void _debug_printGraph() {
+ public void _debug_writeFlowGraph() {
Set<MethodDescriptor> keySet = mapMethodDescriptorToFlowGraph.keySet();
for (Iterator<MethodDescriptor> iterator = keySet.iterator(); iterator.hasNext();) {
projects / IRC.git / blobdiff