From 5228cacd43139ac2738030523b6b94602327dfdd Mon Sep 17 00:00:00 2001
From: Julian Dolby <dolby@us.ibm.com>
Date: Sun, 9 Feb 2014 19:00:31 -0500
Subject: [PATCH] adapt to type changes

---
 .../ibm/wala/cast/ipa/callgraph/ScopeMappingInstanceKeys.java  | 3 +--
 .../java/com/ibm/wala/cast/ipa/lexical/LexicalModRef.java      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScopeMappingInstanceKeys.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScopeMappingInstanceKeys.java
index 6a1251b23..0095a3fc1 100644
--- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScopeMappingInstanceKeys.java
+++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScopeMappingInstanceKeys.java
@@ -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));
             }
diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/lexical/LexicalModRef.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/lexical/LexicalModRef.java
index 3a5c10056..f23586ee0 100644
--- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/lexical/LexicalModRef.java
+++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/lexical/LexicalModRef.java
@@ -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;