From ba84b5a403d35a47077492dcff0307a7cacc5708 Mon Sep 17 00:00:00 2001
From: Ben Liblit <liblit@cs.wisc.edu>
Date: Sun, 6 Aug 2017 20:07:33 -0500
Subject: [PATCH] Fix warning about unchecked cast to generic by being less
 specific

Casting to `Foo<Bar>` results in an unchecked-cast warning due to Java
generics type erasure.  However, sometimes we don't really need a
`Foo<Bar>`, but could simply use any `Foo<?>`.  Casting to the latter
creates no warning.
---
 .../src/com/ibm/wala/core/tests/ir/AnnotationTest.java          | 2 +-
 com.ibm.wala.core/src/com/ibm/wala/classLoader/CodeScanner.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/AnnotationTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/AnnotationTest.java
index 6b26b73b6..048cc1ea1 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/AnnotationTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/AnnotationTest.java
@@ -183,7 +183,7 @@ public class AnnotationTest extends WalaTestCase {
     IMethod methodUnderTest = cha.resolveMethod(methodRefUnderTest);
     harness.assertTrue(methodRefUnderTest.toString() + " not found", methodUnderTest != null);
     harness.assertTrue(methodUnderTest + " must be bytecode method", methodUnderTest instanceof IBytecodeMethod);
-    IBytecodeMethod<IInstruction> IBytecodeMethodUnderTest = (IBytecodeMethod<IInstruction>) methodUnderTest;
+    IBytecodeMethod<?> IBytecodeMethodUnderTest = (IBytecodeMethod<?>) methodUnderTest;
 
     Collection<Annotation>[] parameterAnnotations = IBytecodeMethodUnderTest.getParameterAnnotations();
     harness.assertEquals(expected.length, parameterAnnotations.length);
diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/CodeScanner.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/CodeScanner.java
index 6a5b96afb..a41f8c163 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/CodeScanner.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/CodeScanner.java
@@ -191,7 +191,7 @@ public class CodeScanner {
     return false;
   }
 
-  private static Collection<CallSiteReference> getCallSitesFromShrikeBT(IBytecodeMethod M) throws InvalidClassFileException {
+  private static Collection<CallSiteReference> getCallSitesFromShrikeBT(IBytecodeMethod<?> M) throws InvalidClassFileException {
     return M.getCallSites();
   }