DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make dynamic and static analysis more consistent

This commit is contained in:
Julian Dolby 2015-07-24 22:42:34 -04:00
parent b721a3ceb0
commit 364fe7fa99
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java
View File

@ -35,7 +35,9 @@ import com.ibm.wala.ipa.callgraph.AnalysisOptions;
import com.ibm.wala.ipa.callgraph.CGNode;
import com.ibm.wala.ipa.callgraph.ContextKey;
import com.ibm.wala.ipa.callgraph.ContextSelector;
import com.ibm.wala.ipa.callgraph.Entrypoint;
import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
import com.ibm.wala.ipa.callgraph.impl.ExplicitCallGraph;
import com.ibm.wala.ipa.callgraph.impl.FakeRootMethod;
import com.ibm.wala.ipa.cha.IClassHierarchy;
@ -1428,20 +1430,27 @@ public abstract class SSAPropagationCallGraphBuilder extends PropagationCallGrap
}
// add an invocation from the fake root method to the <clinit>
AbstractRootMethod fakeWorldClinitMethod = (AbstractRootMethod) callGraph.getFakeWorldClinitNode().getMethod();
MethodReference m = klass.getClassInitializer().getReference();
CallSiteReference site = CallSiteReference.make(1, m, IInvokeInstruction.Dispatch.STATIC);
IMethod targetMethod = getOptions().getMethodTargetSelector().getCalleeTarget(callGraph.getFakeRootNode(), site, null);
if (targetMethod != null) {
CGNode target = getTargetForCall(callGraph.getFakeRootNode(), site, null, null);
if (target != null && callGraph.getPredNodeCount(target) == 0) {
AbstractRootMethod fakeWorldClinitMethod = (AbstractRootMethod) callGraph.getFakeWorldClinitNode().getMethod();
SSAAbstractInvokeInstruction s = fakeWorldClinitMethod.addInvocation(new int[0], site);
PointerKey uniqueCatch = getBuilder().getPointerKeyForExceptionalReturnValue(callGraph.getFakeRootNode());
getBuilder().processResolvedCall(callGraph.getFakeWorldClinitNode(), s, target, null, uniqueCatch);
}
}
}
IMethod finalizer = klass.getMethod(MethodReference.finalizeSelector);
if (finalizer != null && finalizer.getDeclaringClass().equals(klass)) {
Entrypoint ef = new DefaultEntrypoint(finalizer, getClassHierarchy());
ef.addCall((AbstractRootMethod)callGraph.getFakeRootNode().getMethod());
getBuilder().markChanged(callGraph.getFakeRootNode());
}
IClass sc = klass.getSuperclass();
if (sc != null) {
processClassInitializer(sc);

14
com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java
View File

@ -28,19 +28,13 @@ public class Runtime {
}
private static class DefaultCallbackPolicy implements Policy {
// if not found:
// look up the stack for expected caller
// if found:
// (callback case)
// record real target of expected caller (or not)
// policy-based edge for call to current method
// if not found:
// (async system edge)
// policy-based edge for call to current method
@Override
public void callback(StackTraceElement[] stack, String klass, String method, Object receiver) {
// stack frames: Runtime.execution(0), callee(1), caller(2)
String root = "<clinit>".equals(stack[1].getMethodName())? "clinit": "callbacks";
String root =
"<clinit>".equals(stack[1].getMethodName())? "clinit":
"finalize".equals(stack[1].getMethodName())? "root":
"callbacks";
String line = root + "\t" + bashToDescriptor(klass) + "\t" + String.valueOf(method) + "\n";
synchronized (runtime) {
if (runtime.output != null) {