adapt to type changes
This commit is contained in:
parent
675db79ef2
commit
5228cacd43
|
@ -102,8 +102,7 @@ abstract public class ScopeMappingInstanceKeys implements InstanceKeyFactory {
|
||||||
result = new CompoundIterator<CGNode>(result, new NonNullSingletonIterator<CGNode>(callerOfConstructor));
|
result = new CompoundIterator<CGNode>(result, new NonNullSingletonIterator<CGNode>(callerOfConstructor));
|
||||||
} else {
|
} else {
|
||||||
PointerKey funcKey = builder.getPointerKeyForLocal(callerOfConstructor, 1);
|
PointerKey funcKey = builder.getPointerKeyForLocal(callerOfConstructor, 1);
|
||||||
OrdinalSet<InstanceKey> funcPtrs = builder.getPointerAnalysis().getPointsToSet(funcKey);
|
for (InstanceKey funcPtr : builder.getPointerAnalysis().getPointsToSet(funcKey)) {
|
||||||
for (InstanceKey funcPtr : funcPtrs) {
|
|
||||||
if (funcPtr instanceof ScopeMappingInstanceKey) {
|
if (funcPtr instanceof ScopeMappingInstanceKey) {
|
||||||
result = new CompoundIterator<CGNode>(result, ((ScopeMappingInstanceKey) funcPtr).getFunargNodes(name));
|
result = new CompoundIterator<CGNode>(result, ((ScopeMappingInstanceKey) funcPtr).getFunargNodes(name));
|
||||||
}
|
}
|
||||||
|
|
|
@ -121,7 +121,7 @@ public class LexicalModRef {
|
||||||
Collection<Pair<CGNode, String>> result = HashSetFactory.make();
|
Collection<Pair<CGNode, String>> result = HashSetFactory.make();
|
||||||
// use scope-mapping instance keys in pointer analysis. may need a different
|
// use scope-mapping instance keys in pointer analysis. may need a different
|
||||||
// scheme for CG construction not based on pointer analysis
|
// 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) {
|
for (InstanceKey ik : functionValues) {
|
||||||
if (ik instanceof ScopeMappingInstanceKey) {
|
if (ik instanceof ScopeMappingInstanceKey) {
|
||||||
ScopeMappingInstanceKey smik = (ScopeMappingInstanceKey) ik;
|
ScopeMappingInstanceKey smik = (ScopeMappingInstanceKey) ik;
|
||||||
|
|
Loading…
Reference in New Issue