//
// update return flow nodes in the caller
CompositeLocation returnLoc = getMethodSummary(mdCallee).getRETURNLoc();
-
System.out.println("### min=" + min.printNode(0) + " returnLoc=" + returnLoc);
if (returnLoc != null && returnLoc.get(0).getLocDescriptor().equals(mdCallee.getThis())
&& returnLoc.getSize() > 1) {
}
System.out.println("###NEW RETURN TUPLE FOR CALLER=" + newReturnTuple);
callerFlowGraph.getFlowReturnNode(min).setNewTuple(newReturnTuple);
+ } else {
+ // if the return loc set was empty and later pcloc was connected to the return loc
+ // need to make sure that return loc reflects to this changes.
+ FlowReturnNode flowReturnNode = callerFlowGraph.getFlowReturnNode(min);
+ if (flowReturnNode != null && flowReturnNode.getReturnTupleSet().isEmpty()) {
+
+ if (needToUpdateReturnLocHolder(min.getMethod(), flowReturnNode)) {
+ NTuple<Descriptor> baseTuple = mapMethodInvokeNodeToBaseTuple.get(min);
+ NTuple<Descriptor> newReturnTuple = baseTuple.clone();
+ flowReturnNode.addTuple(newReturnTuple);
+ }
+
+ }
+
}
}
}
+ private boolean needToUpdateReturnLocHolder(MethodDescriptor mdCallee,
+ FlowReturnNode flowReturnNode) {
+ FlowGraph fg = getFlowGraph(mdCallee);
+ MethodSummary summary = getMethodSummary(mdCallee);
+ CompositeLocation returnCompLoc = summary.getRETURNLoc();
+ NTuple<Descriptor> returnDescTuple = translateToDescTuple(returnCompLoc.getTuple());
+ Set<FlowNode> incomingNodeToReturnNode =
+ fg.getIncomingFlowNodeSet(fg.getFlowNode(returnDescTuple));
+ for (Iterator iterator = incomingNodeToReturnNode.iterator(); iterator.hasNext();) {
+ FlowNode inNode = (FlowNode) iterator.next();
+ if (inNode.getDescTuple().get(0).equals(mdCallee.getThis())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private void addMapMethodDescToMethodInvokeNodeSet(MethodInvokeNode min) {
MethodDescriptor md = min.getMethod();
if (!mapMethodDescToMethodInvokeNodeSet.containsKey(md)) {
System.out.println("generateCompositeLocation=" + nodeDescTuple + " with inferCompLoc="
+ inferCompLoc);
+ MethodDescriptor md = (MethodDescriptor) inferCompLoc.get(0).getDescriptor();
+
CompositeLocation newCompLoc = new CompositeLocation();
for (int i = 0; i < inferCompLoc.getSize(); i++) {
newCompLoc.addLocation(inferCompLoc.get(i));
Descriptor lastDescOfPrefix = nodeDescTuple.get(0);
Descriptor enclosingDescriptor;
if (lastDescOfPrefix instanceof InterDescriptor) {
- enclosingDescriptor = null;
+ enclosingDescriptor = getFlowGraph(md).getEnclosingDescriptor(lastDescOfPrefix);
} else {
enclosingDescriptor = ((VarDescriptor) lastDescOfPrefix).getType().getClassDesc();
}
NTuple<Location> locTuple = new NTuple<Location>();
Descriptor enclosingDesc = md;
- // System.out.println("md=" + md + " descTuple=" + descTuple);
+ System.out.println("md=" + md + " descTuple=" + descTuple);
for (int i = 0; i < descTuple.size(); i++) {
Descriptor desc = descTuple.get(i);
// this method will return the same nodeLocTuple if the corresponding argument is literal
// value.
- FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
+ // System.out.println("translateToCallerLocTuple=" + nodeLocTuple);
+ FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
NTuple<Descriptor> nodeDescTuple = translateToDescTuple(nodeLocTuple);
if (calleeFlowGraph.isParameter(nodeDescTuple)) {
int paramIdx = calleeFlowGraph.getParamIdx(nodeDescTuple);
// // the type of argument is primitive.
// return nodeLocTuple.clone();
// }
- // System.out.println("paramIdx=" + paramIdx + " argDescTuple=" + argDescTuple);
+ // System.out.println("paramIdx=" + paramIdx + " argDescTuple=" + argDescTuple + " from min="
+ // + min.printNode(0));
NTuple<Location> argLocTuple = translateToLocTuple(mdCaller, argDescTuple);
NTuple<Location> callerLocTuple = new NTuple<Location>();
}
}
- rtr += "\")";
-
if (desc instanceof MethodDescriptor) {
System.out.println("#EXTRA LOC DECLARATION GEN=" + desc);
MethodDescriptor md = (MethodDescriptor) desc;
MethodSummary methodSummary = getMethodSummary(md);
+ TypeDescriptor returnType = ((MethodDescriptor) desc).getReturnType();
+ if (!ssjava.getMethodContainingSSJavaLoop().equals(desc) && returnType != null
+ && (!returnType.isVoid())) {
+ CompositeLocation returnLoc = methodSummary.getRETURNLoc();
+ if (returnLoc.getSize() == 1) {
+ String returnLocStr = generateLocationAnnoatation(methodSummary.getRETURNLoc());
+ if (rtr.indexOf(returnLocStr) == -1) {
+ rtr += "," + returnLocStr;
+ }
+ }
+ }
+ rtr += "\")";
+
if (!ssjava.getMethodContainingSSJavaLoop().equals(desc)) {
- TypeDescriptor returnType = ((MethodDescriptor) desc).getReturnType();
if (returnType != null && (!returnType.isVoid())) {
rtr +=
"\n@RETURNLOC(\"" + generateLocationAnnoatation(methodSummary.getRETURNLoc()) + "\")";
}
+
CompositeLocation pcLoc = methodSummary.getPCLoc();
if ((pcLoc != null) && (!pcLoc.get(0).isTop())) {
rtr += "\n@PCLOC(\"" + generateLocationAnnoatation(pcLoc) + "\")";
}
rtr += "\n@GLOBALLOC(\"" + methodSummary.getGlobalLocName() + "\")";
+ } else {
+ rtr += "\")";
}
return rtr;
if (mapDescToDefinitionLine.containsKey(localVarDesc)) {
int varLineNum = mapDescToDefinitionLine.get(localVarDesc);
String orgSourceLine = sourceVec.get(varLineNum);
+ System.out.println("varLineNum=" + varLineNum + " org src=" + orgSourceLine);
int idx =
orgSourceLine.indexOf(generateVarDeclaration((VarDescriptor) localVarDesc));
System.out.println("idx=" + idx
// calculate a return location:
// the return location type is lower than all parameters and the location of return values
MethodSummary methodSummary = getMethodSummary(md);
- if (methodSummary.getRETURNLoc() != null) {
- return;
- }
+ // if (methodSummary.getRETURNLoc() != null) {
+ // System.out.println("$HERE?");
+ // return;
+ // }
+
FlowGraph fg = getFlowGraph(md);
Map<Integer, CompositeLocation> mapParamToLoc = methodSummary.getMapParamIdxToInferLoc();
Set<Integer> paramIdxSet = mapParamToLoc.keySet();
}
+ // makes sure that PCLOC is higher than RETURNLOC
+ CompositeLocation pcLoc = methodSummary.getPCLoc();
+ if (!pcLoc.get(0).isTop()) {
+ NTuple<Descriptor> pcLocDescTuple = translateToDescTuple(pcLoc.getTuple());
+ fg.addValueFlowEdge(pcLocDescTuple, returnDescTuple);
+ }
+
}
}
} else if (curDescriptor instanceof NameDescriptor) {
// it is "GLOBAL LOC" case!
enclosingDescriptor = GLOBALDESC;
+ } else if (curDescriptor instanceof InterDescriptor) {
+ enclosingDescriptor = getFlowGraph(md).getEnclosingDescriptor(curDescriptor);
} else {
enclosingDescriptor = null;
}
System.out.println("");
toanalyze_methodDescList = computeMethodList();
+ // hack... it seems that there is a problem with topological sorting.
+ // so String.toString(Object o) is appeared too higher in the call chain.
+ MethodDescriptor mdToString = null;
+ for (Iterator iterator = toanalyze_methodDescList.iterator(); iterator.hasNext();) {
+ MethodDescriptor md = (MethodDescriptor) iterator.next();
+ if (md.toString().equals("public static String String.valueOf(Object o)")) {
+ mdToString = md;
+ break;
+ }
+ }
+ if (mdToString != null) {
+ toanalyze_methodDescList.remove(mdToString);
+ toanalyze_methodDescList.addLast(mdToString);
+ }
+
LinkedList<MethodDescriptor> methodDescList =
(LinkedList<MethodDescriptor>) toanalyze_methodDescList.clone();
newImplicitTupleSet.addTupleSet(implicitFlowTupleSet);
newImplicitTupleSet.addTupleSet(condTupleNode);
+ System.out.println("A5");
newImplicitTupleSet.addGlobalFlowTupleSet(implicitFlowTupleSet.getGlobalLocTupleSet());
newImplicitTupleSet.addGlobalFlowTupleSet(condTupleNode.getGlobalLocTupleSet());
private void analyzeFlowIfStatementNode(MethodDescriptor md, SymbolTable nametable,
IfStatementNode isn, NodeTupleSet implicitFlowTupleSet) {
- // System.out.println("analyzeFlowIfStatementNode=" + isn.printNode(0));
+ System.out.println("analyzeFlowIfStatementNode=" + isn.printNode(0));
NodeTupleSet condTupleNode = new NodeTupleSet();
analyzeFlowExpressionNode(md, nametable, isn.getCondition(), condTupleNode, null,
// translateToLocTuple(md, callerImplicitTuple));
// }
// }
+ System.out.println("A4");
newImplicitTupleSet.addGlobalFlowTupleSet(condTupleNode.getGlobalLocTupleSet());
analyzeFlowBlockNode(md, nametable, isn.getTrueBlock(), newImplicitTupleSet);
ExpressionNode en, NodeTupleSet nodeSet, NTuple<Descriptor> base,
NodeTupleSet implicitFlowTupleSet, boolean isLHS) {
+ // System.out.println("en=" + en.printNode(0) + " class=" + en.getClass());
+
// note that expression node can create more than one flow node
// nodeSet contains of flow nodes
// base is always assigned to null except the case of a name node!
NTuple<Descriptor> flowTuple;
switch (en.kind()) {
-
case Kind.AssignmentNode:
analyzeFlowAssignmentNode(md, nametable, (AssignmentNode) en, nodeSet, base,
implicitFlowTupleSet);
newImplicitTupleSet.addTuple(interTuple);
}
+ System.out.println("A7");
newImplicitTupleSet.addGlobalFlowTupleSet(tertiaryTupleNode.getGlobalLocTupleSet());
System.out.println("---------newImplicitTupleSet=" + newImplicitTupleSet);
analyzeFlowExpressionNode(md, nametable, tn.getFalseExpr(), tertiaryTupleNode, null,
newImplicitTupleSet, false);
+ System.out.println("A8");
nodeSet.addGlobalFlowTupleSet(tertiaryTupleNode.getGlobalLocTupleSet());
nodeSet.addTupleSet(tertiaryTupleNode);
addMapCallerMethodDescToMethodInvokeNodeSet(mdCaller, min);
FlowGraph calleeFlowGraph = getFlowGraph(mdCallee);
- System.out.println("mdCallee=" + mdCallee);
+ System.out.println("mdCallee=" + mdCallee + " calleeFlowGraph=" + calleeFlowGraph);
Set<FlowNode> calleeReturnSet = calleeFlowGraph.getReturnNodeSet();
System.out.println("---calleeReturnSet=" + calleeReturnSet);
NodeTupleSet baseNodeSet = new NodeTupleSet();
analyzeFlowExpressionNode(mdCaller, nametable, min.getExpression(), baseNodeSet, null,
implicitFlowTupleSet, false);
+ System.out.println("baseNodeSet=" + baseNodeSet);
assert (baseNodeSet.size() == 1);
NTuple<Descriptor> baseTuple = baseNodeSet.iterator().next();
// the location type of the return value is started with 'this'
// reference
NTuple<Descriptor> inFlowTuple = new NTuple<Descriptor>(baseTuple.getList());
+
+ if (inFlowTuple.get(0) instanceof InterDescriptor) {
+ // min.getExpression()
+ } else {
+
+ }
+
inFlowTuple.addAll(returnDescTuple.subList(1, returnDescTuple.size()));
// nodeSet.addTuple(inFlowTuple);
+ System.out.println("1CREATE A NEW TUPLE=" + inFlowTuple + " from="
+ + mdCallee.getThis());
tupleSet.addTuple(inFlowTuple);
} else {
// TODO
+ System.out.println("returnNode=" + returnNode);
Set<FlowNode> inFlowSet = calleeFlowGraph.getIncomingFlowNodeSet(returnNode);
// System.out.println("inFlowSet=" + inFlowSet + " from retrunNode=" + returnNode);
for (Iterator iterator2 = inFlowSet.iterator(); iterator2.hasNext();) {
FlowNode inFlowNode = (FlowNode) iterator2.next();
if (inFlowNode.getDescTuple().startsWith(mdCallee.getThis())) {
// nodeSet.addTupleSet(baseNodeSet);
+ System.out.println("2CREATE A NEW TUPLE=" + baseNodeSet + " from="
+ + mdCallee.getThis());
tupleSet.addTupleSet(baseNodeSet);
-
}
}
}
NodeTupleSet argTupleSet = new NodeTupleSet();
analyzeFlowExpressionNode(mdCaller, nametable, en, argTupleSet, false);
// if argument is liternal node, argTuple is set to NULL
- System.out.println("argTupleSet=" + argTupleSet);
+ System.out.println("---arg idx=" + idx + " argTupleSet=" + argTupleSet);
NTuple<Descriptor> argTuple = generateArgTuple(mdCaller, argTupleSet);
// if an argument is literal value,
|| mdCallee.getModifiers().isNative()) {
addParamNodeFlowingToReturnValue(mdCallee, paramNode);
// nodeSet.addTupleSet(argTupleSet);
+ System.out.println("3CREATE A NEW TUPLE=" + argTupleSet + " from=" + paramNode);
tupleSet.addTupleSet(argTupleSet);
}
}
if (mdCallee.getReturnType() != null && !mdCallee.getReturnType().isVoid()) {
FlowReturnNode setNode = getFlowGraph(mdCaller).createReturnNode(min);
System.out.println("ADD TUPLESET=" + tupleSet + " to returnnode=" + setNode);
- setNode.addTupleSet(tupleSet);
+
+ if (needToGenerateInterLoc(tupleSet)) {
+ System.out.println("20");
+ FlowGraph fg = getFlowGraph(mdCaller);
+ NTuple<Descriptor> interTuple = fg.createIntermediateNode().getDescTuple();
+
+ for (Iterator iterator = tupleSet.iterator(); iterator.hasNext();) {
+ NTuple<Descriptor> tuple = (NTuple<Descriptor>) iterator.next();
+
+ Set<NTuple<Descriptor>> addSet = new HashSet<NTuple<Descriptor>>();
+ FlowNode node = fg.getFlowNode(tuple);
+ if (node instanceof FlowReturnNode) {
+ addSet.addAll(fg.getReturnTupleSet(((FlowReturnNode) node).getReturnTupleSet()));
+ } else {
+ addSet.add(tuple);
+ }
+ for (Iterator iterator2 = addSet.iterator(); iterator2.hasNext();) {
+ NTuple<Descriptor> higher = (NTuple<Descriptor>) iterator2.next();
+ addFlowGraphEdge(mdCaller, higher, interTuple);
+ }
+ }
+
+ setNode.addTuple(interTuple);
+ } else {
+ setNode.addTupleSet(tupleSet);
+ }
+
nodeSet.addTuple(setNode.getDescTuple());
+
}
// propagateFlowsFromCallee(min, md, min.getMethod());
NTuple<Location> calleeReturnLocTuple =
translateToLocTuple(mdCallee, calleeReturnNode.getDescTuple());
System.out.println("calleeReturnLocTuple=" + calleeReturnLocTuple);
- nodeSet.addGlobalFlowTuple(translateToCallerLocTuple(min, mdCallee, mdCaller,
- calleeReturnLocTuple));
+ NTuple<Location> transaltedToCaller =
+ translateToCallerLocTuple(min, mdCallee, mdCaller, calleeReturnLocTuple);
+ // System.out.println("translateToCallerLocTuple="
+ // + translateToCallerLocTuple(min, mdCallee, mdCaller, calleeReturnLocTuple));
+ if (transaltedToCaller.size() > 0) {
+ nodeSet.addGlobalFlowTuple(translateToCallerLocTuple(min, mdCallee, mdCaller,
+ calleeReturnLocTuple));
+ }
}
System.out.println("min nodeSet=" + nodeSet);
private void analyzeFlowArrayAccessNode(MethodDescriptor md, SymbolTable nametable,
ArrayAccessNode aan, NodeTupleSet nodeSet, boolean isLHS) {
- // System.out.println("analyzeFlowArrayAccessNode aan=" + aan.printNode(0));
+ System.out.println("analyzeFlowArrayAccessNode aan=" + aan.printNode(0));
String currentArrayAccessNodeExpStr = aan.printNode(0);
arrayAccessNodeStack.push(aan.printNode(0));
NodeTupleSet expNodeTupleSet = new NodeTupleSet();
NTuple<Descriptor> base =
analyzeFlowExpressionNode(md, nametable, aan.getExpression(), expNodeTupleSet, isLHS);
+ System.out.println("-base=" + base);
+ nodeSet.setMethodInvokeBaseDescTuple(base);
NodeTupleSet idxNodeTupleSet = new NodeTupleSet();
analyzeFlowExpressionNode(md, nametable, aan.getIndex(), idxNodeTupleSet, isLHS);
}
nodeSetArrayAccessExp.clear();
nodeSetArrayAccessExp.addTuple(interTuple);
+ FlowGraph fg = getFlowGraph(md);
+
+ System.out.println("base=" + base);
+ if (base != null) {
+ fg.addMapInterLocNodeToEnclosingDescriptor(interTuple.get(0),
+ getClassTypeDescriptor(base.get(base.size() - 1)));
+ }
}
}
+ System.out.println("A1");
nodeSet.addGlobalFlowTupleSet(idxNodeTupleSet.getGlobalLocTupleSet());
nodeSet.addTupleSet(nodeSetArrayAccessExp);
NodeTupleSet leftOpSet = new NodeTupleSet();
NodeTupleSet rightOpSet = new NodeTupleSet();
+ System.out.println("analyzeFlowOpNode=" + on.printNode(0));
+
// left operand
analyzeFlowExpressionNode(md, nametable, on.getLeft(), leftOpSet, null, implicitFlowTupleSet,
false);
+ System.out.println("--leftOpSet=" + leftOpSet);
if (on.getRight() != null) {
// right operand
analyzeFlowExpressionNode(md, nametable, on.getRight(), rightOpSet, null,
implicitFlowTupleSet, false);
}
+ System.out.println("--rightOpSet=" + rightOpSet);
Operation op = on.getOp();
nodeSet.addTupleSet(leftOpSet);
nodeSet.addTupleSet(rightOpSet);
+ System.out.println("A6");
nodeSet.addGlobalFlowTupleSet(leftOpSet.getGlobalLocTupleSet());
nodeSet.addGlobalFlowTupleSet(rightOpSet.getGlobalLocTupleSet());
NTuple<Descriptor> higherTuple = iter.next();
addFlowGraphEdge(md, higherTuple, interTuple);
}
+
+ FlowGraph fg = getFlowGraph(md);
+ fg.addMapInterLocNodeToEnclosingDescriptor(interTuple.get(0),
+ getClassTypeDescriptor(base.get(base.size() - 1)));
+
nodeSet.clear();
flowFieldTuple = interTuple;
}
-
+ System.out.println("A3");
nodeSet.addGlobalFlowTupleSet(idxNodeTupleSet.getGlobalLocTupleSet());
}
NTuple<Location> calleeReturnLocTuple = iterator.next();
for (Iterator<NTuple<Descriptor>> iter2 = nodeSetLHS.iterator(); iter2.hasNext();) {
NTuple<Descriptor> callerLHSTuple = iter2.next();
- globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
- translateToLocTuple(md, callerLHSTuple));
System.out.println("$$$ GLOBAL FLOW ADD=" + calleeReturnLocTuple + " -> "
+ translateToLocTuple(md, callerLHSTuple));
+ globalFlowGraph.addValueFlowEdge(calleeReturnLocTuple,
+ translateToLocTuple(md, callerLHSTuple));
}
}
if (nodeSet != null) {
nodeSet.addTupleSet(nodeSetLHS);
+ System.out.println("A2");
nodeSet.addGlobalFlowTupleSet(nodeSetLHS.getGlobalLocTupleSet());
}
}
projects / IRC.git / blobdiff