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

add global to field-based pointer analysis

This commit is contained in:
Julian Dolby 2014-11-04 21:33:22 -05:00
parent afb113efb9
commit 339de954ea
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestPointerAnalyses.java
View File

@ -19,6 +19,7 @@ import org.junit.Assert;
import org.junit.Test;
import com.ibm.wala.analysis.pointers.HeapGraph;
import com.ibm.wala.cast.ir.ssa.AstGlobalWrite;
import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.GlobalVertex;
import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.ObjectVertex;
import com.ibm.wala.cast.js.html.JSSourceExtractor;
@ -34,7 +35,6 @@ import com.ibm.wala.cast.js.types.JavaScriptTypes;
import com.ibm.wala.cast.loader.AstDynamicField;
import com.ibm.wala.cast.types.AstMethodReference;
import com.ibm.wala.classLoader.CallSiteReference;
import com.ibm.wala.classLoader.IField;
import com.ibm.wala.classLoader.NewSiteReference;
import com.ibm.wala.ipa.callgraph.CGNode;
import com.ibm.wala.ipa.callgraph.CallGraph;
@ -264,7 +264,13 @@ public abstract class TestPointerAnalyses {
System.err.println("heap graph models instruction " + inst);
}
}
} else if (inst instanceof AstGlobalWrite) {
String propName = ((AstGlobalWrite) inst).getGlobalName();
propName = propName.substring("global ".length());
PointerKey propKey = fbPA.getHeapModel().getPointerKeyForInstanceField(null, new AstDynamicField(false, null, Atom.findOrCreateUnicodeAtom(propName), JavaScriptTypes.Root));
Assert.assertTrue("global " + propName + " should exist", hg.hasEdge(GlobalVertex.instance(), propKey));
System.err.println("heap graph models instruction " + inst);}
}
}

3
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FlowGraph.java
View File

@ -15,6 +15,7 @@ import java.util.Iterator;
import java.util.Set;
import com.ibm.wala.analysis.pointers.HeapGraph;
import com.ibm.wala.cast.ir.ssa.AstGlobalWrite;
import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.AbstractVertexVisitor;
import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.CreationSiteVertex;
import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.FuncVertex;
@ -355,6 +356,8 @@ public class FlowGraph implements Iterable<Vertex> {
for(ObjectVertex o : getPointsToSet(object)) {
addEdge(ensureNode(o), ensureNode(property));
}
} else if (inst instanceof AstGlobalWrite) {
addEdge(ensureNode(factory.global()), ensureNode(property));
}
}
}

10
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/GlobalVertex.java
View File

@ -11,6 +11,16 @@ import com.ibm.wala.util.collections.Pair;
public class GlobalVertex extends Vertex implements ObjectVertex {
private GlobalVertex() {
}
public static final GlobalVertex global = new GlobalVertex();
public static GlobalVertex instance() {
return global;
}
@Override
public IClass getConcreteType() {
return null;

2
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/VertexFactory.java
View File

@ -128,7 +128,7 @@ public class VertexFactory {
return value;
}
private GlobalVertex global = new GlobalVertex();
private GlobalVertex global = GlobalVertex.instance();
public GlobalVertex global() {
return global;