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

adapt to type changes

This commit is contained in:
Julian Dolby 2014-02-09 19:00:31 -05:00 committed by Michael Heilmann
parent 675db79ef2
commit 5228cacd43
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScopeMappingInstanceKeys.java
View File

@ -102,8 +102,7 @@ abstract public class ScopeMappingInstanceKeys implements InstanceKeyFactory {
result = new CompoundIterator<CGNode>(result, new NonNullSingletonIterator<CGNode>(callerOfConstructor));
} else {
PointerKey funcKey = builder.getPointerKeyForLocal(callerOfConstructor, 1);
OrdinalSet<InstanceKey> funcPtrs = builder.getPointerAnalysis().getPointsToSet(funcKey);
for (InstanceKey funcPtr : funcPtrs) {
for (InstanceKey funcPtr : builder.getPointerAnalysis().getPointsToSet(funcKey)) {
if (funcPtr instanceof ScopeMappingInstanceKey) {
result = new CompoundIterator<CGNode>(result, ((ScopeMappingInstanceKey) funcPtr).getFunargNodes(name));
}

2
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/lexical/LexicalModRef.java
View File

@ -121,7 +121,7 @@ public class LexicalModRef {
Collection<Pair<CGNode, String>> result = HashSetFactory.make();
// use scope-mapping instance keys in pointer analysis. may need a different
// scheme for CG construction not based on pointer analysis
OrdinalSet<InstanceKey> functionValues = pa.getPointsToSet(pa.getHeapModel().getPointerKeyForLocal(n, 1));
OrdinalSet<? extends InstanceKey> functionValues = pa.getPointsToSet(pa.getHeapModel().getPointerKeyForLocal(n, 1));
for (InstanceKey ik : functionValues) {
if (ik instanceof ScopeMappingInstanceKey) {
ScopeMappingInstanceKey smik = (ScopeMappingInstanceKey) ik;