# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1397081124 -7200
# Node ID 04f1723150b43388c913fbc61832aeaeaaf41e11
# Parent  5e6f29f287d6a923cad988ce983b431a82154e0e# Parent  5efc947b216bd3c66a3b531be299eb6a38b9cee7
Merge.

diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/NativeFunctionInterface.java
--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/NativeFunctionInterface.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/NativeFunctionInterface.java	Thu Apr 10 00:05:24 2014 +0200
@@ -32,7 +32,7 @@
     /**
      * Resolves and returns a handle to an open native library. This method will open the library
      * only if it is not already open.
-     * 
+     *
      * @param libPath the absolute path to the library
      * @return the resolved library handle
      * @throws UnsatisfiedLinkError if the library could not be found or opened
@@ -48,7 +48,7 @@
 
     /**
      * Resolves the function pointer {@code NativeFunctionPointer} of a native function.
-     * 
+     *
      * @param libraries the ordered list of libraries to search for the function
      * @param name the name of the function to be resolved
      * @return a pointer to the native function
@@ -60,7 +60,7 @@
      * Resolves a function name to a {@linkplain NativeFunctionHandle handle} that can be called
      * with a given signature. The signature contains the types of the arguments that will be passed
      * to the handle when it is {@linkplain NativeFunctionHandle#call(Object...) called}.
-     * 
+     *
      * @param library the handle to a resolved library
      * @param name the name of the function to be resolved
      * @param returnType the type of the return value
@@ -68,26 +68,26 @@
      * @return the function handle of the native function
      * @throws UnsatisfiedLinkError if the function handle could not be resolved
      */
-    NativeFunctionHandle getFunctionHandle(NativeLibraryHandle library, String name, Class returnType, Class... argumentTypes);
+    NativeFunctionHandle getFunctionHandle(NativeLibraryHandle library, String name, Class<?> returnType, Class<?>... argumentTypes);
 
     /**
      * Resolves a function pointer to a {@linkplain NativeFunctionHandle handle} that can be called
      * with a given signature. The signature contains the types of the arguments that will be passed
      * to the handle when it is {@linkplain NativeFunctionHandle#call(Object...) called}.
-     * 
+     *
      * @param functionPointer a function pointer
      * @param returnType the type of the return value
      * @param argumentTypes the types of the arguments
      * @return the function handle of the native function
      * @throws UnsatisfiedLinkError the function handle could not be created
      */
-    NativeFunctionHandle getFunctionHandle(NativeFunctionPointer functionPointer, Class returnType, Class... argumentTypes);
+    NativeFunctionHandle getFunctionHandle(NativeFunctionPointer functionPointer, Class<?> returnType, Class<?>... argumentTypes);
 
     /**
      * Resolves a function name to a {@linkplain NativeFunctionHandle handle} that can be called
      * with a given signature. The signature contains the types of the arguments that will be passed
      * to the handle when it is {@linkplain NativeFunctionHandle#call(Object...) called}.
-     * 
+     *
      * @param libraries the ordered list of libraries to search for the function
      * @param name the name of the function to be resolved
      * @param returnType the type of the return value
@@ -95,13 +95,13 @@
      * @return the function handle of the native function
      * @throws UnsatisfiedLinkError if the function handle could not be created
      */
-    NativeFunctionHandle getFunctionHandle(NativeLibraryHandle[] libraries, String name, Class returnType, Class... argumentTypes);
+    NativeFunctionHandle getFunctionHandle(NativeLibraryHandle[] libraries, String name, Class<?> returnType, Class<?>... argumentTypes);
 
     /**
      * Resolves a function name to a {@linkplain NativeFunctionHandle handle} that can be called
      * with a given signature. The signature contains the types of the arguments that will be passed
      * to the handle when it is {@linkplain NativeFunctionHandle#call(Object...) called}.
-     * 
+     *
      * @param name the name of the function to be resolved
      * @param returnType the type of the return value
      * @param argumentTypes the types of the arguments
@@ -110,11 +110,11 @@
      *             {@linkplain #isDefaultLibrarySearchSupported() supported} or if the function
      *             could not be resolved
      */
-    NativeFunctionHandle getFunctionHandle(String name, Class returnType, Class... argumentTypes);
+    NativeFunctionHandle getFunctionHandle(String name, Class<?> returnType, Class<?>... argumentTypes);
 
     /**
      * Creates a {@link NativeFunctionPointer} from a raw value.
-     * 
+     *
      * @param rawValue raw function pointer
      * @return {@code NativeFunctionPointer} for {@code rawValue}
      */
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/FieldUniverse.java
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/FieldUniverse.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/FieldUniverse.java	Thu Apr 10 00:05:24 2014 +0200
@@ -35,7 +35,7 @@
     public final Map<Field, ResolvedJavaField> fields = new HashMap<>();
 
     public FieldUniverse() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             for (Field f : c.getDeclaredFields()) {
                 ResolvedJavaField field = metaAccess.lookupJavaField(f);
                 fields.put(f, field);
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/MethodUniverse.java
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/MethodUniverse.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/MethodUniverse.java	Thu Apr 10 00:05:24 2014 +0200
@@ -36,12 +36,12 @@
     public final Map<Constructor<?>, ResolvedJavaMethod> constructors = new HashMap<>();
 
     public MethodUniverse() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             for (Method m : c.getDeclaredMethods()) {
                 ResolvedJavaMethod method = metaAccess.lookupJavaMethod(m);
                 methods.put(m, method);
             }
-            for (Constructor m : c.getDeclaredConstructors()) {
+            for (Constructor<?> m : c.getDeclaredConstructors()) {
                 constructors.put(m, metaAccess.lookupJavaConstructor(m));
             }
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/NameAndSignature.java
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/NameAndSignature.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/NameAndSignature.java	Thu Apr 10 00:05:24 2014 +0200
@@ -34,8 +34,8 @@
     public static final MetaAccessProvider metaAccess = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getProviders().getMetaAccess();
 
     final String name;
-    final Class returnType;
-    final Class[] parameterTypes;
+    final Class<?> returnType;
+    final Class<?>[] parameterTypes;
 
     public NameAndSignature(Method m) {
         this.name = m.getName();
@@ -61,7 +61,7 @@
     public String toString() {
         StringBuilder sb = new StringBuilder(name + "(");
         String sep = "";
-        for (Class p : parameterTypes) {
+        for (Class<?> p : parameterTypes) {
             sb.append(sep);
             sep = ", ";
             sb.append(p.getName());
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestConstantReflectionProvider.java
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestConstantReflectionProvider.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestConstantReflectionProvider.java	Thu Apr 10 00:05:24 2014 +0200
@@ -108,7 +108,7 @@
 
             Object o = snippetReflection.asBoxedValue(c);
             if (o instanceof Class) {
-                assertEquals(metaAccess.lookupJavaType((Class) o), type);
+                assertEquals(metaAccess.lookupJavaType((Class<?>) o), type);
             } else {
                 assertNull(type);
             }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestJavaField.java
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestJavaField.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestJavaField.java	Thu Apr 10 00:05:24 2014 +0200
@@ -68,7 +68,7 @@
     @Test
     public void getDeclaringClassTest() {
         for (Map.Entry<Field, ResolvedJavaField> e : fields.entrySet()) {
-            Class expected = e.getKey().getDeclaringClass();
+            Class<?> expected = e.getKey().getDeclaringClass();
             ResolvedJavaType actual = e.getValue().getDeclaringClass();
             assertTrue(actual.equals(metaAccess.lookupJavaType(expected)));
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestJavaMethod.java
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestJavaMethod.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestJavaMethod.java	Thu Apr 10 00:05:24 2014 +0200
@@ -48,7 +48,7 @@
     @Test
     public void getDeclaringClassTest() {
         for (Map.Entry<Method, ResolvedJavaMethod> e : methods.entrySet()) {
-            Class expected = e.getKey().getDeclaringClass();
+            Class<?> expected = e.getKey().getDeclaringClass();
             ResolvedJavaType actual = e.getValue().getDeclaringClass();
             assertTrue(actual.equals(metaAccess.lookupJavaType(expected)));
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestJavaType.java
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestJavaType.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestJavaType.java	Thu Apr 10 00:05:24 2014 +0200
@@ -38,7 +38,7 @@
 
     @Test
     public void getKindTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             JavaType type = metaAccess.lookupJavaType(c);
             Kind expected = Kind.fromJavaClass(c);
             Kind actual = type.getKind();
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestMetaAccessProvider.java
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestMetaAccessProvider.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestMetaAccessProvider.java	Thu Apr 10 00:05:24 2014 +0200
@@ -38,7 +38,7 @@
 
     @Test
     public void lookupJavaTypeTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             assertNotNull(type);
             assertEquals(c.getModifiers(), type.getModifiers());
@@ -51,7 +51,7 @@
 
     @Test
     public void lookupJavaMethodTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             for (Method reflect : c.getDeclaredMethods()) {
                 ResolvedJavaMethod method = metaAccess.lookupJavaMethod(reflect);
                 assertNotNull(method);
@@ -65,7 +65,7 @@
 
     @Test
     public void lookupJavaFieldTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             for (Field reflect : c.getDeclaredFields()) {
                 ResolvedJavaField field = metaAccess.lookupJavaField(reflect);
                 assertNotNull(field);
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java	Thu Apr 10 00:05:24 2014 +0200
@@ -46,7 +46,7 @@
 
     @Test
     public void findInstanceFieldWithOffsetTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             Set<Field> reflectionFields = getInstanceFields(c, true);
             for (Field f : reflectionFields) {
@@ -62,7 +62,7 @@
 
     @Test
     public void isInterfaceTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             boolean expected = c.isInterface();
             boolean actual = type.isInterface();
@@ -72,7 +72,7 @@
 
     @Test
     public void isInstanceClassTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             boolean expected = !c.isArray() && !c.isPrimitive() && !c.isInterface();
             boolean actual = type.isInstanceClass();
@@ -82,7 +82,7 @@
 
     @Test
     public void isArrayTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             boolean expected = c.isArray();
             boolean actual = type.isArray();
@@ -92,7 +92,7 @@
 
     @Test
     public void getModifiersTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             int expected = c.getModifiers();
             int actual = type.getModifiers();
@@ -102,7 +102,7 @@
 
     @Test
     public void isAssignableFromTest() {
-        Class[] all = classes.toArray(new Class[classes.size()]);
+        Class<?>[] all = classes.toArray(new Class[classes.size()]);
         for (int i = 0; i < all.length; i++) {
             Class<?> c1 = all[i];
             for (int j = i; j < all.length; j++) {
@@ -136,7 +136,7 @@
         }
     }
 
-    private static Class asExactClass(Class c) {
+    private static Class<?> asExactClass(Class<?> c) {
         if (c.isArray()) {
             if (asExactClass(c.getComponentType()) != null) {
                 return c;
@@ -151,10 +151,10 @@
 
     @Test
     public void asExactTypeTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             ResolvedJavaType exactType = type.asExactType();
-            Class expected = asExactClass(c);
+            Class<?> expected = asExactClass(c);
             if (expected == null) {
                 assertTrue("exact(" + c.getName() + ") != null", exactType == null);
             } else {
@@ -166,9 +166,9 @@
 
     @Test
     public void getSuperclassTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
-            Class expected = c.getSuperclass();
+            Class<?> expected = c.getSuperclass();
             ResolvedJavaType actual = type.getSuperclass();
             if (expected == null) {
                 assertTrue(actual == null);
@@ -181,9 +181,9 @@
 
     @Test
     public void getInterfacesTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
-            Class[] expected = c.getInterfaces();
+            Class<?>[] expected = c.getInterfaces();
             ResolvedJavaType[] actual = type.getInterfaces();
             assertEquals(expected.length, actual.length);
             for (int i = 0; i < expected.length; i++) {
@@ -192,10 +192,10 @@
         }
     }
 
-    public Class getSupertype(Class c) {
+    public Class<?> getSupertype(Class<?> c) {
         assert !c.isPrimitive();
         if (c.isArray()) {
-            Class componentType = c.getComponentType();
+            Class<?> componentType = c.getComponentType();
             if (componentType.isPrimitive() || componentType == Object.class) {
                 return Object.class;
             }
@@ -207,7 +207,7 @@
         return c.getSuperclass();
     }
 
-    public Class findLeastCommonAncestor(Class<?> c1Initial, Class<?> c2Initial) {
+    public Class<?> findLeastCommonAncestor(Class<?> c1Initial, Class<?> c2Initial) {
         if (c1Initial.isPrimitive() || c2Initial.isPrimitive()) {
             return null;
         } else {
@@ -228,14 +228,14 @@
 
     @Test
     public void findLeastCommonAncestorTest() {
-        Class[] all = classes.toArray(new Class[classes.size()]);
+        Class<?>[] all = classes.toArray(new Class[classes.size()]);
         for (int i = 0; i < all.length; i++) {
             Class<?> c1 = all[i];
             for (int j = i; j < all.length; j++) {
                 Class<?> c2 = all[j];
                 ResolvedJavaType t1 = metaAccess.lookupJavaType(c1);
                 ResolvedJavaType t2 = metaAccess.lookupJavaType(c2);
-                Class expected = findLeastCommonAncestor(c1, c2);
+                Class<?> expected = findLeastCommonAncestor(c1, c2);
                 ResolvedJavaType actual = t1.findLeastCommonAncestor(t2);
                 if (expected == null) {
                     assertTrue(actual == null);
@@ -268,7 +268,7 @@
     abstract static class Abstract4 extends Concrete3 {
     }
 
-    void checkConcreteSubtype(ResolvedJavaType type, Class expected) {
+    void checkConcreteSubtype(ResolvedJavaType type, Class<?> expected) {
         ResolvedJavaType subtype = type.findUniqueConcreteSubtype();
         if (subtype == null) {
             // findUniqueConcreteSubtype() is conservative
@@ -323,9 +323,9 @@
 
     @Test
     public void getComponentTypeTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
-            Class expected = c.getComponentType();
+            Class<?> expected = c.getComponentType();
             ResolvedJavaType actual = type.getComponentType();
             if (expected == null) {
                 assertNull(actual);
@@ -337,10 +337,10 @@
 
     @Test
     public void getArrayClassTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             if (c != void.class) {
                 ResolvedJavaType type = metaAccess.lookupJavaType(c);
-                Class expected = getArrayClass(c);
+                Class<?> expected = getArrayClass(c);
                 ResolvedJavaType actual = type.getArrayClass();
                 assertTrue(actual.equals(metaAccess.lookupJavaType(expected)));
             }
@@ -381,14 +381,14 @@
         return false;
     }
 
-    static final Map<Class, VTable> vtables = new HashMap<>();
+    static final Map<Class<?>, VTable> vtables = new HashMap<>();
 
     static class VTable {
 
         final Map<NameAndSignature, Method> methods = new HashMap<>();
     }
 
-    static synchronized VTable getVTable(Class c) {
+    static synchronized VTable getVTable(Class<?> c) {
         VTable vtable = vtables.get(c);
         if (vtable == null) {
             vtable = new VTable();
@@ -411,7 +411,7 @@
         return vtable;
     }
 
-    static Set<Method> findDeclarations(Method impl, Class c) {
+    static Set<Method> findDeclarations(Method impl, Class<?> c) {
         Set<Method> declarations = new HashSet<>();
         NameAndSignature implSig = new NameAndSignature(impl);
         if (c != null) {
@@ -424,7 +424,7 @@
             if (!c.isInterface()) {
                 declarations.addAll(findDeclarations(impl, c.getSuperclass()));
             }
-            for (Class i : c.getInterfaces()) {
+            for (Class<?> i : c.getInterfaces()) {
                 declarations.addAll(findDeclarations(impl, i));
             }
         }
@@ -438,7 +438,7 @@
 
     @Test
     public void resolveMethodTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             if (c.isInterface() || c.isPrimitive()) {
                 ResolvedJavaType type = metaAccess.lookupJavaType(c);
                 for (Method m : c.getDeclaredMethods()) {
@@ -478,7 +478,7 @@
         assertEquals(thisMethod, ucm);
     }
 
-    public static Set<Field> getInstanceFields(Class c, boolean includeSuperclasses) {
+    public static Set<Field> getInstanceFields(Class<?> c, boolean includeSuperclasses) {
         if (c.isArray() || c.isPrimitive() || c.isInterface()) {
             return Collections.emptySet();
         }
@@ -529,7 +529,7 @@
 
     @Test
     public void getInstanceFieldsTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             for (boolean includeSuperclasses : new boolean[]{true, false}) {
                 Set<Field> expected = getInstanceFields(c, includeSuperclasses);
@@ -552,7 +552,7 @@
 
     @Test
     public void getDeclaredMethodsTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             Method[] raw = c.getDeclaredMethods();
             Set<ResolvedJavaMethod> expected = new HashSet<>();
@@ -595,7 +595,7 @@
 
     @Test
     public void getAnnotationTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             for (Annotation a : c.getAnnotations()) {
                 assertEquals(a, type.getAnnotation(a.annotationType()));
@@ -605,11 +605,11 @@
 
     @Test
     public void memberClassesTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             assertEquals(c.isLocalClass(), type.isLocal());
             assertEquals(c.isMemberClass(), type.isMember());
-            Class enclc = c.getEnclosingClass();
+            Class<?> enclc = c.getEnclosingClass();
             ResolvedJavaType enclt = type.getEnclosingType();
             assertFalse(enclc == null ^ enclt == null);
             if (enclc != null) {
@@ -620,7 +620,7 @@
 
     @Test
     public void classFilePathTest() {
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             URL path = type.getClassFilePath();
             if (type.isPrimitive() || type.isArray()) {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TypeUniverse.java
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TypeUniverse.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TypeUniverse.java	Thu Apr 10 00:05:24 2014 +0200
@@ -71,10 +71,10 @@
         }
         unsafe = theUnsafe;
 
-        Class[] initialClasses = {void.class, boolean.class, byte.class, short.class, char.class, int.class, float.class, long.class, double.class, Object.class, Class.class, ClassLoader.class,
+        Class<?>[] initialClasses = {void.class, boolean.class, byte.class, short.class, char.class, int.class, float.class, long.class, double.class, Object.class, Class.class, ClassLoader.class,
                         String.class, Serializable.class, Cloneable.class, Test.class, TestMetaAccessProvider.class, List.class, Collection.class, Map.class, Queue.class, HashMap.class,
                         LinkedHashMap.class, IdentityHashMap.class, AbstractCollection.class, AbstractList.class, ArrayList.class};
-        for (Class c : initialClasses) {
+        for (Class<?> c : initialClasses) {
             addClass(c);
         }
         for (Field f : Constant.class.getDeclaredFields()) {
@@ -89,7 +89,7 @@
                 }
             }
         }
-        for (Class c : classes) {
+        for (Class<?> c : classes) {
             if (c != void.class && !c.isArray()) {
                 constants.add(snippetReflection.forObject(Array.newInstance(c, 42)));
             }
@@ -106,7 +106,7 @@
         constants.add(snippetReflection.forObject(String[].class));
     }
 
-    public synchronized Class<?> getArrayClass(Class componentType) {
+    public synchronized Class<?> getArrayClass(Class<?> componentType) {
         Class<?> arrayClass = arrayClasses.get(componentType);
         if (arrayClass == null) {
             arrayClass = Array.newInstance(componentType, 0).getClass();
@@ -115,27 +115,27 @@
         return arrayClass;
     }
 
-    public static int dimensions(Class c) {
+    public static int dimensions(Class<?> c) {
         if (c.getComponentType() != null) {
             return 1 + dimensions(c.getComponentType());
         }
         return 0;
     }
 
-    private void addClass(Class c) {
+    private void addClass(Class<?> c) {
         if (classes.add(c)) {
             if (c.getSuperclass() != null) {
                 addClass(c.getSuperclass());
             }
-            for (Class sc : c.getInterfaces()) {
+            for (Class<?> sc : c.getInterfaces()) {
                 addClass(sc);
             }
-            for (Class dc : c.getDeclaredClasses()) {
+            for (Class<?> dc : c.getDeclaredClasses()) {
                 addClass(dc);
             }
             for (Method m : c.getDeclaredMethods()) {
                 addClass(m.getReturnType());
-                for (Class p : m.getParameterTypes()) {
+                for (Class<?> p : m.getParameterTypes()) {
                     addClass(p);
                 }
             }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractJavaProfile.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractJavaProfile.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractJavaProfile.java	Thu Apr 10 00:05:24 2014 +0200
@@ -131,7 +131,7 @@
         if (!(obj instanceof AbstractJavaProfile)) {
             return false;
         }
-        AbstractJavaProfile that = (AbstractJavaProfile) obj;
+        AbstractJavaProfile<?, ?> that = (AbstractJavaProfile<?, ?>) obj;
         if (that.notRecordedProbability != notRecordedProbability) {
             return false;
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractProfiledItem.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractProfiledItem.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractProfiledItem.java	Thu Apr 10 00:05:24 2014 +0200
@@ -28,7 +28,7 @@
  * A profiled type that has a probability. Profiled types are naturally sorted in descending order
  * of their probabilities.
  */
-public abstract class AbstractProfiledItem<T> implements Comparable<AbstractProfiledItem>, Serializable {
+public abstract class AbstractProfiledItem<T> implements Comparable<AbstractProfiledItem<?>>, Serializable {
 
     private static final long serialVersionUID = 7838575753661305744L;
 
@@ -56,7 +56,7 @@
     }
 
     @Override
-    public int compareTo(AbstractProfiledItem o) {
+    public int compareTo(AbstractProfiledItem<?> o) {
         if (getProbability() > o.getProbability()) {
             return -1;
         } else if (getProbability() < o.getProbability()) {
@@ -87,7 +87,7 @@
         if (getClass() != obj.getClass()) {
             return false;
         }
-        AbstractProfiledItem other = (AbstractProfiledItem) obj;
+        AbstractProfiledItem<?> other = (AbstractProfiledItem<?>) obj;
         if (Double.doubleToLongBits(probability) != Double.doubleToLongBits(other.probability)) {
             return false;
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ForeignCallDescriptor.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ForeignCallDescriptor.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ForeignCallDescriptor.java	Thu Apr 10 00:05:24 2014 +0200
@@ -41,10 +41,10 @@
 public class ForeignCallDescriptor {
 
     private final String name;
-    private final Class resultType;
-    private final Class[] argumentTypes;
+    private final Class<?> resultType;
+    private final Class<?>[] argumentTypes;
 
-    public ForeignCallDescriptor(String name, Class resultType, Class... argumentTypes) {
+    public ForeignCallDescriptor(String name, Class<?> resultType, Class<?>... argumentTypes) {
         this.name = name;
         this.resultType = resultType;
         this.argumentTypes = argumentTypes;
@@ -89,7 +89,7 @@
     public String toString() {
         StringBuilder sb = new StringBuilder(name).append('(');
         String sep = "";
-        for (Class arg : argumentTypes) {
+        for (Class<?> arg : argumentTypes) {
             sb.append(sep).append(arg.getSimpleName());
             sep = ",";
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Kind.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Kind.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Kind.java	Thu Apr 10 00:05:24 2014 +0200
@@ -66,10 +66,10 @@
     private final char typeChar;
     private final String javaName;
     private final boolean isStackInt;
-    private final Class primitiveJavaClass;
-    private final Class boxedJavaClass;
+    private final Class<?> primitiveJavaClass;
+    private final Class<?> boxedJavaClass;
 
-    private Kind(char typeChar, String javaName, boolean isStackInt, Class primitiveJavaClass, Class boxedJavaClass) {
+    private Kind(char typeChar, String javaName, boolean isStackInt, Class<?> primitiveJavaClass, Class<?> boxedJavaClass) {
         this.typeChar = typeChar;
         this.javaName = javaName;
         this.isStackInt = isStackInt;
@@ -95,7 +95,7 @@
 
     /**
      * Checks whether this type is a Java primitive type.
-     * 
+     *
      * @return {@code true} if this is {@link #Boolean}, {@link #Byte}, {@link #Char},
      *         {@link #Short}, {@link #Int}, {@link #Long}, {@link #Float}, {@link #Double}, or
      *         {@link #Void}.
@@ -106,7 +106,7 @@
 
     /**
      * Returns the kind that represents this kind when on the Java operand stack.
-     * 
+     *
      * @return the kind used on the operand stack
      */
     public Kind getStackKind() {
@@ -118,7 +118,7 @@
 
     /**
      * Checks whether this type is a Java primitive type representing an integer number.
-     * 
+     *
      * @return {@code true} if the stack kind is {@link #Int} or {@link #Long}.
      */
     public boolean isNumericInteger() {
@@ -127,7 +127,7 @@
 
     /**
      * Checks whether this type is a Java primitive type representing an unsigned number.
-     * 
+     *
      * @return {@code true} if the kind is {@link #Boolean} or {@link #Char}.
      */
     public boolean isUnsigned() {
@@ -136,7 +136,7 @@
 
     /**
      * Checks whether this type is a Java primitive type representing a floating point number.
-     * 
+     *
      * @return {@code true} if this is {@link #Float} or {@link #Double}.
      */
     public boolean isNumericFloat() {
@@ -145,7 +145,7 @@
 
     /**
      * Checks whether this represent an Object of some sort.
-     * 
+     *
      * @return {@code true} if this is {@link #Object}.
      */
     public boolean isObject() {
@@ -154,7 +154,7 @@
 
     /**
      * Returns the kind corresponding to the Java type string.
-     * 
+     *
      * @param typeString the Java type string
      * @return the kind
      */
@@ -169,7 +169,7 @@
 
     /**
      * Returns the kind of a word given the size of a word in bytes.
-     * 
+     *
      * @param wordSizeInBytes the size of a word in bytes
      * @return the kind representing a word value
      */
@@ -184,7 +184,7 @@
 
     /**
      * Returns the kind from the character describing a primitive or void.
-     * 
+     *
      * @param ch the character
      * @return the kind
      */
@@ -214,7 +214,7 @@
 
     /**
      * Returns the Kind representing the given Java class.
-     * 
+     *
      * @param klass the class
      * @return the kind
      */
@@ -244,7 +244,7 @@
 
     /**
      * Returns the Java class representing this kind.
-     * 
+     *
      * @return the Java class
      */
     public Class<?> toJavaClass() {
@@ -253,7 +253,7 @@
 
     /**
      * Returns the Java class for instances of boxed values of this kind.
-     * 
+     *
      * @return the Java class
      */
     public Class<?> toBoxedJavaClass() {
@@ -279,13 +279,13 @@
     /**
      * Classes for which invoking {@link Object#toString()} does not run user code.
      */
-    private static boolean isToStringSafe(Class c) {
+    private static boolean isToStringSafe(Class<?> c) {
         return c == Boolean.class || c == Byte.class || c == Character.class || c == Short.class || c == Integer.class || c == Float.class || c == Long.class || c == Double.class;
     }
 
     /**
      * Gets a formatted string for a given value of this kind.
-     * 
+     *
      * @param value a value of this kind
      * @return a formatted string for {@code value} based on this kind
      */
@@ -307,7 +307,7 @@
                 } else if (value instanceof JavaType) {
                     return "JavaType:" + MetaUtil.toJavaName((JavaType) value);
                 } else if (value instanceof Enum) {
-                    return MetaUtil.getSimpleName(value.getClass(), true) + ":" + ((Enum) value).name();
+                    return MetaUtil.getSimpleName(value.getClass(), true) + ":" + ((Enum<?>) value).name();
                 } else if (value instanceof FormatWithToString) {
                     return MetaUtil.getSimpleName(value.getClass(), true) + ":" + String.valueOf(value);
                 } else if (value instanceof Class<?>) {
@@ -351,7 +351,7 @@
 
     /**
      * The minimum value that can be represented as a value of this kind.
-     * 
+     *
      * @return the minimum value
      */
     public long getMinValue() {
@@ -375,7 +375,7 @@
 
     /**
      * The maximum value that can be represented as a value of this kind.
-     * 
+     *
      * @return the maximum value
      */
     public long getMaxValue() {
@@ -399,7 +399,7 @@
 
     /**
      * Number of bytes that are necessary to represent a value of this kind.
-     * 
+     *
      * @return the number of bytes
      */
     public int getByteCount() {
@@ -412,7 +412,7 @@
 
     /**
      * Number of bits that are necessary to represent a value of this kind.
-     * 
+     *
      * @return the number of bits
      */
     public int getBitCount() {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaAccessProvider.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaAccessProvider.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaAccessProvider.java	Thu Apr 10 00:05:24 2014 +0200
@@ -45,7 +45,7 @@
     /**
      * Provides the {@link ResolvedJavaMethod} for a {@link Constructor} obtained via reflection.
      */
-    ResolvedJavaMethod lookupJavaConstructor(Constructor reflectionConstructor);
+    ResolvedJavaMethod lookupJavaConstructor(Constructor<?> reflectionConstructor);
 
     /**
      * Provides the {@link ResolvedJavaField} for a {@link Field} obtained via reflection.
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaUtil.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaUtil.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaUtil.java	Thu Apr 10 00:05:24 2014 +0200
@@ -50,7 +50,7 @@
     /**
      * Returns the number of bytes occupied by this constant value or constant object and
      * recursively all values reachable from this value.
-     * 
+     *
      * @param constant the constant whose bytes should be measured
      * @param printTopN print total size and instance count of the top n classes is desired
      * @return the number of bytes occupied by this constant
@@ -158,7 +158,7 @@
     /**
      * Calls {@link MetaAccessProvider#lookupJavaType(Class)} on an array of classes.
      */
-    public static ResolvedJavaType[] lookupJavaTypes(MetaAccessProvider metaAccess, Class[] classes) {
+    public static ResolvedJavaType[] lookupJavaTypes(MetaAccessProvider metaAccess, Class<?>[] classes) {
         ResolvedJavaType[] result = new ResolvedJavaType[classes.length];
         for (int i = 0; i < result.length; i++) {
             result[i] = metaAccess.lookupJavaType(classes[i]);
@@ -182,7 +182,7 @@
     /**
      * Extends the functionality of {@link Class#getSimpleName()} to include a non-empty string for
      * anonymous and local classes.
-     * 
+     *
      * @param clazz the class for which the simple name is being requested
      * @param withEnclosingClass specifies if the returned name should be qualified with the name(s)
      *            of the enclosing class/classes of {@code clazz} (if any). This option is ignored
@@ -218,7 +218,7 @@
     /**
      * Converts a given type to its Java programming language name. The following are examples of
      * strings returned by this method:
-     * 
+     *
      * <pre>
      *     qualified == true:
      *         java.lang.Object
@@ -229,7 +229,7 @@
      *         int
      *         boolean[][]
      * </pre>
-     * 
+     *
      * @param type the type to be converted to a Java name
      * @param qualified specifies if the package prefix of the type should be included in the
      *            returned name
@@ -246,13 +246,13 @@
     /**
      * Converts a given type to its Java programming language name. The following are examples of
      * strings returned by this method:
-     * 
+     *
      * <pre>
      *      java.lang.Object
      *      int
      *      boolean[][]
      * </pre>
-     * 
+     *
      * @param type the type to be converted to a Java name
      * @return the Java name corresponding to {@code type}
      */
@@ -308,7 +308,7 @@
      * and specifiers that denote an attribute of the method that is to be copied to the result. A
      * specifier is a single character preceded by a '%' character. The accepted specifiers and the
      * method attributes they denote are described below:
-     * 
+     *
      * <pre>
      *     Specifier | Description                                          | Example(s)
      *     ----------+------------------------------------------------------------------------------------------
@@ -322,7 +322,7 @@
      *     'f'       | Indicator if method is unresolved, static or virtual | "unresolved" "static" "virtual"
      *     '%'       | A '%' character                                      | "%"
      * </pre>
-     * 
+     *
      * @param format a format specification
      * @param method the method to be formatted
      * @return the result of formatting this method according to {@code format}
@@ -402,7 +402,7 @@
      * specifiers that denote an attribute of the field that is to be copied to the result. A
      * specifier is a single character preceded by a '%' character. The accepted specifiers and the
      * field attributes they denote are described below:
-     * 
+     *
      * <pre>
      *     Specifier | Description                                          | Example(s)
      *     ----------+------------------------------------------------------------------------------------------
@@ -414,7 +414,7 @@
      *     'f'       | Indicator if field is unresolved, static or instance | "unresolved" "static" "instance"
      *     '%'       | A '%' character                                      | "%"
      * </pre>
-     * 
+     *
      * @param format a format specification
      * @param field the field to be formatted
      * @return the result of formatting this field according to {@code format}
@@ -472,7 +472,7 @@
 
     /**
      * Gets the annotations of a particular type for the formal parameters of a given method.
-     * 
+     *
      * @param annotationClass the Class object corresponding to the annotation type
      * @param method the method for which a parameter annotations are being requested
      * @return the annotation of type {@code annotationClass} (if any) for each formal parameter
@@ -494,7 +494,7 @@
 
     /**
      * Gets the annotation of a particular type for a formal parameter of a given method.
-     * 
+     *
      * @param annotationClass the Class object corresponding to the annotation type
      * @param parameterIndex the index of a formal parameter of {@code method}
      * @param method the method for which a parameter annotation is being requested
@@ -530,18 +530,18 @@
      * line number is {@linkplain ResolvedJavaMethod#asStackTraceElement(int) available} for the
      * given method, then the string returned is the {@link StackTraceElement#toString()} value of
      * the stack trace element, suffixed by the bci location. For example:
-     * 
+     *
      * <pre>
      *     java.lang.String.valueOf(String.java:2930) [bci: 12]
      * </pre>
-     * 
+     *
      * Otherwise, the string returned is the value of applying {@link #format(String, JavaMethod)}
      * with the format string {@code "%H.%n(%p)"}, suffixed by the bci location. For example:
-     * 
+     *
      * <pre>
      *     java.lang.String.valueOf(int) [bci: 12]
      * </pre>
-     * 
+     *
      * @param sb
      * @param method
      * @param bci
@@ -586,13 +586,13 @@
      * Gets the <a
      * href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.3.3">method
      * descriptor</a> corresponding to this signature. For example:
-     * 
+     *
      * <pre>
      * (ILjava/lang/String;D)V
      * </pre>
-     * 
+     *
      * .
-     * 
+     *
      * @param sig the {@link Signature} to be converted.
      * @return the signature as a string
      */
@@ -607,7 +607,7 @@
 
     /**
      * Formats some profiling information associated as a string.
-     * 
+     *
      * @param info the profiling info to format
      * @param method an optional method that augments the profile string returned
      * @param sep the separator to use for each separate profile record
@@ -669,13 +669,13 @@
         return s.substring(0, s.length() - sep.length());
     }
 
-    private static void appendProfile(StringBuilder buf, AbstractJavaProfile profile, int bci, String type, String sep) {
+    private static void appendProfile(StringBuilder buf, AbstractJavaProfile<?, ?> profile, int bci, String type, String sep) {
         if (profile != null) {
-            AbstractProfiledItem[] pitems = profile.getItems();
+            AbstractProfiledItem<?>[] pitems = profile.getItems();
             if (pitems != null) {
                 buf.append(String.format("%s@%d:", type, bci));
                 for (int j = 0; j < pitems.length; j++) {
-                    AbstractProfiledItem pitem = pitems[j];
+                    AbstractProfiledItem<?> pitem = pitems[j];
                     buf.append(String.format(" %.6f (%s)%s", pitem.getProbability(), pitem.getItem(), sep));
                 }
                 if (profile.getNotRecordedProbability() != 0) {
@@ -689,7 +689,7 @@
 
     /**
      * Converts a Java source-language class name into the internal form.
-     * 
+     *
      * @param className the class name
      * @return the internal name form of the class name
      */
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Graal.java
--- a/graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Graal.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Graal.java	Thu Apr 10 00:05:24 2014 +0200
@@ -38,7 +38,7 @@
     public static GraalRuntime getRuntime() {
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
-            Class cc = Reflection.getCallerClass();
+            Class<?> cc = Reflection.getCallerClass();
             if (cc.getClassLoader() != null) {
                 sm.checkPermission(ACCESS_PERMISSION);
             }
@@ -60,7 +60,7 @@
     public static <T> T getRequiredCapability(Class<T> clazz) {
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
-            Class cc = Reflection.getCallerClass();
+            Class<?> cc = Reflection.getCallerClass();
             if (cc.getClassLoader() != null) {
                 sm.checkPermission(ACCESS_PERMISSION);
             }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64MemoryPeephole.java
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64MemoryPeephole.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64MemoryPeephole.java	Thu Apr 10 00:05:24 2014 +0200
@@ -353,10 +353,10 @@
     }
 
     @Override
-    public Value emitZeroExtendMemory(int inputBits, int resultBits, Access access) {
-        assert resultBits == 32 || resultBits == 64;
+    public Value emitZeroExtendMemory(int fromBits, int toBits, Access access) {
+        assert fromBits != toBits;
         Kind memoryKind = access.accessLocation().getValueKind();
-        if (memoryKind.getBitCount() != inputBits && !memoryKind.isUnsigned()) {
+        if (memoryKind.getBitCount() != fromBits && !memoryKind.isUnsigned()) {
             // The memory being read from is signed and smaller than the result size so
             // this is a sign extension to inputBits followed by a zero extension to resultBits
             // which can't be expressed in a memory operation.
@@ -366,7 +366,7 @@
             memoryKind = Kind.Char;
         }
         evaluateDeferred();
-        return gen.getLIRGenerator().emitZeroExtendMemory(memoryKind, resultBits, makeAddress(access), getState(access));
+        return gen.getLIRGenerator().emitZeroExtendMemory(memoryKind, toBits, makeAddress(access), getState(access));
     }
 
     public boolean emitIfMemory(IfNode x, Access access) {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/GraalKernelTester.java
--- a/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/GraalKernelTester.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/GraalKernelTester.java	Thu Apr 10 00:05:24 2014 +0200
@@ -126,7 +126,7 @@
         }
     }
 
-    public static OptionValue<?> getOptionFromField(Class declaringClass, String fieldName) {
+    public static OptionValue<?> getOptionFromField(Class<?> declaringClass, String fieldName) {
         try {
             Field f = declaringClass.getDeclaredField(fieldName);
             f.setAccessible(true);
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.compiler.ptx.test/src/com/oracle/graal/compiler/ptx/test/ObjectPTXTest.java
--- a/graal/com.oracle.graal.compiler.ptx.test/src/com/oracle/graal/compiler/ptx/test/ObjectPTXTest.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.compiler.ptx.test/src/com/oracle/graal/compiler/ptx/test/ObjectPTXTest.java	Thu Apr 10 00:05:24 2014 +0200
@@ -151,7 +151,7 @@
     @Ignore("Object return values not yet supported")
     @Test
     public void test9() {
-        for (Object o : new Object[]{null, "object", new Object(), new HashMap()}) {
+        for (Object o : new Object[]{null, "object", new Object(), new HashMap<>()}) {
             A a = new A();
             a.o = o;
             test("testObject", a);
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FinalizableSubclassTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FinalizableSubclassTest.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FinalizableSubclassTest.java	Thu Apr 10 00:05:24 2014 +0200
@@ -59,7 +59,7 @@
         }
     }
 
-    private StructuredGraph parseAndProcess(Class cl, Assumptions assumptions) {
+    private StructuredGraph parseAndProcess(Class<?> cl, Assumptions assumptions) {
         Constructor<?>[] constructors = cl.getConstructors();
         Assert.assertTrue(constructors.length == 1);
         final ResolvedJavaMethod javaMethod = getMetaAccess().lookupJavaConstructor(constructors[0]);
@@ -73,7 +73,7 @@
         return graph;
     }
 
-    private void checkForRegisterFinalizeNode(Class cl, boolean shouldContainFinalizer, boolean optimistic) {
+    private void checkForRegisterFinalizeNode(Class<?> cl, boolean shouldContainFinalizer, boolean optimistic) {
         Assumptions assumptions = new Assumptions(optimistic);
         StructuredGraph graph = parseAndProcess(cl, assumptions);
         Assert.assertTrue(graph.getNodes().filter(RegisterFinalizerNode.class).count() == (shouldContainFinalizer ? 1 : 0));
@@ -109,7 +109,7 @@
         private static int loaderInstance = 0;
 
         private final String replaceTo;
-        private HashMap<String, Class> cache = new HashMap<>();
+        private HashMap<String, Class<?>> cache = new HashMap<>();
 
         public ClassTemplateLoader() {
             loaderInstance++;
@@ -149,7 +149,7 @@
             }
             dumpStringsInByteArray(classData);
 
-            Class c = defineClass(null, classData, 0, classData.length);
+            Class<?> c = defineClass(null, classData, 0, classData.length);
             cache.put(nameReplaced, c);
             return c;
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java	Thu Apr 10 00:05:24 2014 +0200
@@ -853,7 +853,7 @@
 
     public static Object convertFormatArg(Object arg) {
         if (arg instanceof Class) {
-            return ((Class) arg).getSimpleName();
+            return ((Class<?>) arg).getSimpleName();
         }
         return arg;
     }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java	Thu Apr 10 00:05:24 2014 +0200
@@ -111,7 +111,7 @@
          * method. If not specified, then the class in which the annotated method is declared is
          * used (and is assumed to be a {@link Node} subclass).
          */
-        Class value() default NodeIntrinsic.class;
+        Class<?> value() default NodeIntrinsic.class;
 
         /**
          * Determines if the stamp of the instantiated intrinsic node has its stamp set from the
@@ -907,7 +907,8 @@
         if ((flags & FormattableFlags.ALTERNATE) == FormattableFlags.ALTERNATE) {
             formatter.format("%s", toString(Verbosity.Id));
         } else if ((flags & FormattableFlags.UPPERCASE) == FormattableFlags.UPPERCASE) {
-            formatter.format("%s", toString(Verbosity.Long));
+            // Use All here since Long is only slightly longer than Short.
+            formatter.format("%s", toString(Verbosity.All));
         } else {
             formatter.format("%s", toString(Verbosity.Short));
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java	Thu Apr 10 00:05:24 2014 +0200
@@ -495,7 +495,7 @@
         unsafe.putObject(node, offset, value);
     }
 
-    private static void putNodeList(Node node, long offset, NodeList value) {
+    private static void putNodeList(Node node, long offset, NodeList<?> value) {
         unsafe.putObject(node, offset, value);
     }
 
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java	Thu Apr 10 00:05:24 2014 +0200
@@ -62,7 +62,7 @@
      * @param intConsumerClass a class implementing {@code java.util.function.IntConsumer}
      * @return a {@link HotSpotNmethod} handle to the compiled and installed kernel
      */
-    private static HotSpotNmethod getCompiledLambda(Class intConsumerClass) {
+    private static HotSpotNmethod getCompiledLambda(Class<?> intConsumerClass) {
         Method acceptMethod = null;
         for (Method m : intConsumerClass.getMethods()) {
             if (m.getName().equals("accept")) {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java	Thu Apr 10 00:05:24 2014 +0200
@@ -81,7 +81,7 @@
         assertEquals(0, result.getNodes().filter(ReadNode.class).count());
     }
 
-    public static Class getClassObject() {
+    public static Class<AheadOfTimeCompilationTest> getClassObject() {
         return AheadOfTimeCompilationTest.class;
     }
 
@@ -112,7 +112,7 @@
         assertEquals(0, result.getNodes().filter(ReadNode.class).count());
     }
 
-    public static Class getPrimitiveClassObject() {
+    public static Class<Integer> getPrimitiveClassObject() {
         return int.class;
     }
 
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java	Thu Apr 10 00:05:24 2014 +0200
@@ -127,7 +127,7 @@
     }
 
     private static Method lookup(String className, String methodName) {
-        Class c;
+        Class<?> c;
         try {
             c = Class.forName(className);
             for (Method m : c.getDeclaredMethods()) {
@@ -180,7 +180,7 @@
         return result;
     }
 
-    private static byte[] readClassfile16(Class c) throws IOException {
+    private static byte[] readClassfile16(Class<? extends HotSpotCryptoSubstitutionTest> c) throws IOException {
         String classFilePath = "/" + c.getName().replace('.', '/') + ".class";
         InputStream stream = c.getResourceAsStream(classFilePath);
         int bytesToRead = stream.available();
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMethodSubstitutionTest.java
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMethodSubstitutionTest.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMethodSubstitutionTest.java	Thu Apr 10 00:05:24 2014 +0200
@@ -74,7 +74,7 @@
         test("getSuperClass");
         test("getComponentType");
 
-        for (Class c : new Class[]{getClass(), Cloneable.class, int[].class, String[][].class}) {
+        for (Class<?> c : new Class[]{getClass(), Cloneable.class, int[].class, String[][].class}) {
             assertEquals(c.getModifiers(), ClassSubstitutions.getModifiers(c));
             assertEquals(c.isInterface(), ClassSubstitutions.isInterface(c));
             assertEquals(c.isArray(), ClassSubstitutions.isArray(c));
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedJavaFieldTest.java
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedJavaFieldTest.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedJavaFieldTest.java	Thu Apr 10 00:05:24 2014 +0200
@@ -38,7 +38,7 @@
  */
 public class HotSpotResolvedJavaFieldTest {
 
-    private static final Class[] classesWithInternalFields = {Class.class, ClassLoader.class};
+    private static final Class<?>[] classesWithInternalFields = {Class.class, ClassLoader.class};
 
     /**
      * Tests that {@link HotSpotResolvedJavaField#getModifiers()} only includes the modifiers
@@ -47,7 +47,7 @@
      */
     @Test
     public void testModifiersForInternal() {
-        for (Class c : classesWithInternalFields) {
+        for (Class<?> c : classesWithInternalFields) {
             ResolvedJavaType type = HotSpotResolvedObjectType.fromClass(c);
             for (ResolvedJavaField field : type.getInstanceFields(false)) {
                 if (field.isInternal()) {
@@ -63,7 +63,7 @@
      */
     @Test
     public void testCachingForInternalFields() {
-        for (Class c : classesWithInternalFields) {
+        for (Class<?> c : classesWithInternalFields) {
             HotSpotResolvedObjectType type = (HotSpotResolvedObjectType) HotSpotResolvedObjectType.fromClass(c);
             for (ResolvedJavaField field : type.getInstanceFields(false)) {
                 if (field.isInternal()) {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java	Thu Apr 10 00:05:24 2014 +0200
@@ -57,7 +57,7 @@
 
 import edu.umd.cs.findbugs.annotations.*;
 
-public class CompilationTask implements Runnable, Comparable {
+public class CompilationTask implements Runnable, Comparable<Object> {
 
     private static final long TIMESTAMP_START = System.currentTimeMillis();
 
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkage.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkage.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkage.java	Thu Apr 10 00:05:24 2014 +0200
@@ -151,7 +151,7 @@
         return regConfig.getCallingConvention(ccType, returnType, parameterTypes, target, false);
     }
 
-    private static JavaType asJavaType(Class type, MetaAccessProvider metaAccess, CodeCacheProvider codeCache) {
+    private static JavaType asJavaType(Class<?> type, MetaAccessProvider metaAccess, CodeCacheProvider codeCache) {
         if (WordBase.class.isAssignableFrom(type)) {
             return metaAccess.lookupJavaType(codeCache.getTarget().wordKind.toJavaClass());
         } else {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java	Thu Apr 10 00:05:24 2014 +0200
@@ -63,7 +63,7 @@
     public static HotSpotGraalRuntime runtime() {
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
-            Class cc = Reflection.getCallerClass();
+            Class<?> cc = Reflection.getCallerClass();
             if (cc != null && cc.getClassLoader() != null) {
                 sm.checkPermission(Graal.ACCESS_PERMISSION);
             }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptions.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptions.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptions.java	Thu Apr 10 00:05:24 2014 +0200
@@ -217,7 +217,7 @@
      * @param c the class in which the field is declared
      * @param name the name of the field
      */
-    private static void unconditionallyEnableTimerOrMetric(Class c, String name) {
+    private static void unconditionallyEnableTimerOrMetric(Class<?> c, String name) {
         try {
             Field field = c.getDeclaredField(name);
             String propertyName;
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/logging/CountingProxy.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/logging/CountingProxy.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/logging/CountingProxy.java	Thu Apr 10 00:05:24 2014 +0200
@@ -79,7 +79,7 @@
         return interf.cast(obj);
     }
 
-    private static ArrayList<CountingProxy> proxies = new ArrayList<>();
+    private static ArrayList<CountingProxy<?>> proxies = new ArrayList<>();
 
     static {
         if (ENABLED) {
@@ -87,7 +87,7 @@
 
                 @Override
                 public void run() {
-                    for (CountingProxy proxy : proxies) {
+                    for (CountingProxy<?> proxy : proxies) {
                         proxy.print();
                     }
                 }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java	Thu Apr 10 00:05:24 2014 +0200
@@ -226,7 +226,7 @@
         if (constant.getKind() == Kind.Object) {
             Object obj = HotSpotObjectConstant.asObject(constant);
             if (obj instanceof Class) {
-                return runtime.getHostProviders().getMetaAccess().lookupJavaType((Class) obj);
+                return runtime.getHostProviders().getMetaAccess().lookupJavaType((Class<?>) obj);
             }
         }
         return null;
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java	Thu Apr 10 00:05:24 2014 +0200
@@ -69,21 +69,20 @@
     }
 
     public static ForeignCallDescriptor lookupArraycopyDescriptor(Kind kind, boolean aligned, boolean disjoint) {
-        return (ForeignCallDescriptor) arraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0].get(kind);
+        return arraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0].get(kind);
     }
 
-    private static final EnumMap[][] arraycopyDescriptors = new EnumMap[2][2];
+    @SuppressWarnings("unchecked") private static final EnumMap<Kind, ForeignCallDescriptor>[][] arraycopyDescriptors = new EnumMap[2][2];
 
     static {
         // Populate the EnumMap instances
         for (int i = 0; i < arraycopyDescriptors.length; i++) {
             for (int j = 0; j < arraycopyDescriptors[i].length; j++) {
-                arraycopyDescriptors[i][j] = new EnumMap<Kind, ForeignCallDescriptor>(Kind.class);
+                arraycopyDescriptors[i][j] = new EnumMap<>(Kind.class);
             }
         }
     }
 
-    @SuppressWarnings("unchecked")
     private static ForeignCallDescriptor registerArraycopyDescriptor(Kind kind, boolean aligned, boolean disjoint) {
         String name = kind + (aligned ? "Aligned" : "") + (disjoint ? "Disjoint" : "") + "Arraycopy";
         ForeignCallDescriptor desc = new ForeignCallDescriptor(name, void.class, Word.class, Word.class, Word.class);
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java	Thu Apr 10 00:05:24 2014 +0200
@@ -746,6 +746,14 @@
 
         long displacement = 0;
         int indexScaling = 1;
+        boolean signExtend = false;
+        if (offset instanceof SignExtendNode) {
+            SignExtendNode extend = (SignExtendNode) offset;
+            if (extend.getResultBits() == 64) {
+                signExtend = true;
+                offset = extend.getInput();
+            }
+        }
         if (offset instanceof IntegerAddNode) {
             IntegerAddNode integerAddNode = (IntegerAddNode) offset;
             if (integerAddNode.y() instanceof ConstantNode) {
@@ -770,7 +778,10 @@
                 }
             }
         }
-
+        if (signExtend) {
+            // If we were using sign extended values before restore the sign extension.
+            offset = offset.graph().addOrUnique(new SignExtendNode(offset, 64));
+        }
         return IndexedLocationNode.create(locationIdentity, accessKind, displacement, offset, offset.graph(), indexScaling);
     }
 
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaAccessProvider.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaAccessProvider.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaAccessProvider.java	Thu Apr 10 00:05:24 2014 +0200
@@ -93,7 +93,7 @@
         }
     }
 
-    public ResolvedJavaMethod lookupJavaConstructor(Constructor reflectionConstructor) {
+    public ResolvedJavaMethod lookupJavaConstructor(Constructor<?> reflectionConstructor) {
         try {
             Class<?> holder = reflectionConstructor.getDeclaringClass();
             final int slot = reflectionConstructorSlot.getInt(reflectionConstructor);
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java	Thu Apr 10 00:05:24 2014 +0200
@@ -451,7 +451,7 @@
     @Override
     public Annotation[][] getParameterAnnotations() {
         if (isConstructor()) {
-            Constructor javaConstructor = toJavaConstructor();
+            Constructor<?> javaConstructor = toJavaConstructor();
             return javaConstructor == null ? null : javaConstructor.getParameterAnnotations();
         }
         Method javaMethod = toJava();
@@ -486,7 +486,7 @@
     @Override
     public Type[] getGenericParameterTypes() {
         if (isConstructor()) {
-            Constructor javaConstructor = toJavaConstructor();
+            Constructor<?> javaConstructor = toJavaConstructor();
             return javaConstructor == null ? null : javaConstructor.getGenericParameterTypes();
         }
         Method javaMethod = toJava();
@@ -511,7 +511,7 @@
         }
     }
 
-    private Constructor toJavaConstructor() {
+    private Constructor<?> toJavaConstructor() {
         try {
             return holder.mirror().getDeclaredConstructor(signatureToTypes());
         } catch (NoSuchMethodException e) {
@@ -652,7 +652,7 @@
     @Override
     public Constant newInstance(Constant[] arguments) {
         assert isConstructor();
-        Constructor javaConstructor = toJavaConstructor();
+        Constructor<?> javaConstructor = toJavaConstructor();
         javaConstructor.setAccessible(true);
 
         Object[] objArguments = new Object[arguments.length];
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectType.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectType.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectType.java	Thu Apr 10 00:05:24 2014 +0200
@@ -74,7 +74,7 @@
      */
     public static ResolvedJavaType fromMetaspaceKlass(long metaspaceKlass) {
         assert metaspaceKlass != 0;
-        Class javaClass = runtime().getCompilerToVM().getJavaMirror(metaspaceKlass);
+        Class<?> javaClass = runtime().getCompilerToVM().getJavaMirror(metaspaceKlass);
         assert javaClass != null;
         return fromClass(javaClass);
     }
@@ -133,7 +133,7 @@
 
     @Override
     public ResolvedJavaType getComponentType() {
-        Class javaComponentType = mirror().getComponentType();
+        Class<?> javaComponentType = mirror().getComponentType();
         return javaComponentType == null ? null : fromClass(javaComponentType);
     }
 
@@ -199,14 +199,14 @@
 
     @Override
     public HotSpotResolvedObjectType getSuperclass() {
-        Class javaSuperclass = mirror().getSuperclass();
+        Class<?> javaSuperclass = mirror().getSuperclass();
         return javaSuperclass == null ? null : (HotSpotResolvedObjectType) fromClass(javaSuperclass);
     }
 
     @Override
     public ResolvedJavaType[] getInterfaces() {
         if (interfaces == null) {
-            Class[] javaInterfaces = mirror().getInterfaces();
+            Class<?>[] javaInterfaces = mirror().getInterfaces();
             ResolvedJavaType[] result = new ResolvedJavaType[javaInterfaces.length];
             for (int i = 0; i < javaInterfaces.length; i++) {
                 result[i] = fromClass(javaInterfaces[i]);
@@ -712,7 +712,7 @@
 
     @Override
     public ResolvedJavaMethod[] getDeclaredConstructors() {
-        Constructor[] constructors = mirror().getDeclaredConstructors();
+        Constructor<?>[] constructors = mirror().getDeclaredConstructors();
         ResolvedJavaMethod[] result = new ResolvedJavaMethod[constructors.length];
         for (int i = 0; i < constructors.length; i++) {
             result[i] = runtime().getHostProviders().getMetaAccess().lookupJavaConstructor(constructors[i]);
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/HotSpotNativeFunctionHandle.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/HotSpotNativeFunctionHandle.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/HotSpotNativeFunctionHandle.java	Thu Apr 10 00:05:24 2014 +0200
@@ -34,9 +34,9 @@
 
     private final InstalledCode code;
     private final String name;
-    private final Class[] argumentTypes;
+    private final Class<?>[] argumentTypes;
 
-    public HotSpotNativeFunctionHandle(InstalledCode code, String name, Class... argumentTypes) {
+    public HotSpotNativeFunctionHandle(InstalledCode code, String name, Class<?>... argumentTypes) {
         this.argumentTypes = argumentTypes;
         this.name = name;
         this.code = code;
@@ -76,7 +76,7 @@
         for (int i = 0; i < argumentTypes.length; i++) {
             Object arg = args[i];
             assert arg != null;
-            Class expectedType = argumentTypes[i];
+            Class<?> expectedType = argumentTypes[i];
             if (expectedType.isPrimitive()) {
                 Kind kind = Kind.fromJavaClass(expectedType);
                 expectedType = kind.toBoxedJavaClass();
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/HotSpotNativeFunctionInterface.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/HotSpotNativeFunctionInterface.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/HotSpotNativeFunctionInterface.java	Thu Apr 10 00:05:24 2014 +0200
@@ -86,13 +86,13 @@
     }
 
     @Override
-    public HotSpotNativeFunctionHandle getFunctionHandle(NativeLibraryHandle library, String name, Class returnType, Class... argumentTypes) {
+    public HotSpotNativeFunctionHandle getFunctionHandle(NativeLibraryHandle library, String name, Class<?> returnType, Class<?>... argumentTypes) {
         HotSpotNativeFunctionPointer functionPointer = lookupFunctionPointer(name, library, true);
         return createHandle(functionPointer, returnType, argumentTypes);
     }
 
     @Override
-    public HotSpotNativeFunctionHandle getFunctionHandle(NativeLibraryHandle[] libraries, String name, Class returnType, Class... argumentTypes) {
+    public HotSpotNativeFunctionHandle getFunctionHandle(NativeLibraryHandle[] libraries, String name, Class<?> returnType, Class<?>... argumentTypes) {
         HotSpotNativeFunctionPointer functionPointer = null;
         for (NativeLibraryHandle libraryHandle : libraries) {
             functionPointer = lookupFunctionPointer(name, libraryHandle, false);
@@ -105,7 +105,7 @@
     }
 
     @Override
-    public HotSpotNativeFunctionHandle getFunctionHandle(String name, Class returnType, Class... argumentTypes) {
+    public HotSpotNativeFunctionHandle getFunctionHandle(String name, Class<?> returnType, Class<?>... argumentTypes) {
         if (rtldDefault == null) {
             throw new UnsatisfiedLinkError(name);
         }
@@ -136,14 +136,14 @@
     }
 
     @Override
-    public HotSpotNativeFunctionHandle getFunctionHandle(NativeFunctionPointer functionPointer, Class returnType, Class... argumentTypes) {
+    public HotSpotNativeFunctionHandle getFunctionHandle(NativeFunctionPointer functionPointer, Class<?> returnType, Class<?>... argumentTypes) {
         if (!(functionPointer instanceof HotSpotNativeFunctionPointer)) {
             throw new UnsatisfiedLinkError(functionPointer.getName());
         }
         return createHandle(functionPointer, returnType, argumentTypes);
     }
 
-    private HotSpotNativeFunctionHandle createHandle(NativeFunctionPointer functionPointer, Class returnType, Class... argumentTypes) {
+    private HotSpotNativeFunctionHandle createHandle(NativeFunctionPointer functionPointer, Class<?> returnType, Class<?>... argumentTypes) {
         HotSpotNativeFunctionPointer hs = (HotSpotNativeFunctionPointer) functionPointer;
         InstalledCode code = installNativeFunctionStub(hs.value, returnType, argumentTypes);
         return new HotSpotNativeFunctionHandle(code, hs.name, argumentTypes);
@@ -152,7 +152,7 @@
     /**
      * Creates and installs a stub for calling a native function.
      */
-    private InstalledCode installNativeFunctionStub(long functionPointer, Class returnType, Class... argumentTypes) {
+    private InstalledCode installNativeFunctionStub(long functionPointer, Class<?> returnType, Class<?>... argumentTypes) {
         StructuredGraph g = getGraph(providers, factory, functionPointer, returnType, argumentTypes);
         Suites suites = providers.getSuites().createSuites();
         PhaseSuite<HighTierContext> phaseSuite = backend.getSuites().getDefaultGraphBuilderSuite().copy();
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/NativeCallStubGraphBuilder.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/NativeCallStubGraphBuilder.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/NativeCallStubGraphBuilder.java	Thu Apr 10 00:05:24 2014 +0200
@@ -43,13 +43,13 @@
 
     /**
      * Creates a graph for a stub used to call a native function.
-     * 
+     *
      * @param functionPointer a native function pointer
      * @param returnType the type of the return value
      * @param argumentTypes the types of the arguments
      * @return the graph that represents the call stub
      */
-    public static StructuredGraph getGraph(HotSpotProviders providers, RawNativeCallNodeFactory factory, long functionPointer, Class returnType, Class... argumentTypes) {
+    public static StructuredGraph getGraph(HotSpotProviders providers, RawNativeCallNodeFactory factory, long functionPointer, Class<?> returnType, Class<?>... argumentTypes) {
         try {
             ResolvedJavaMethod method = providers.getMetaAccess().lookupJavaMethod(NativeCallStubGraphBuilder.class.getMethod("libCall", Object.class, Object.class, Object.class));
             StructuredGraph g = new StructuredGraph(method);
@@ -98,7 +98,7 @@
         }
     }
 
-    private static FixedWithNextNode getParameters(StructuredGraph g, ParameterNode argumentsArray, int numArgs, Class[] argumentTypes, List<ValueNode> args, HotSpotProviders providers) {
+    private static FixedWithNextNode getParameters(StructuredGraph g, ParameterNode argumentsArray, int numArgs, Class<?>[] argumentTypes, List<ValueNode> args, HotSpotProviders providers) {
         assert numArgs == argumentTypes.length;
         FixedWithNextNode last = null;
         for (int i = 0; i < numArgs; i++) {
@@ -111,7 +111,7 @@
                 last.setNext(boxedElement);
                 last = boxedElement;
             }
-            Class type = argumentTypes[i];
+            Class<?> type = argumentTypes[i];
             Kind kind = getKind(type);
             if (kind == Kind.Object) {
                 // array value
@@ -140,8 +140,8 @@
         return last;
     }
 
-    public static Kind getElementKind(Class clazz) {
-        Class componentType = clazz.getComponentType();
+    public static Kind getElementKind(Class<?> clazz) {
+        Class<?> componentType = clazz.getComponentType();
         if (componentType == null) {
             throw new IllegalArgumentException("Parameter type not supported: " + clazz);
         }
@@ -151,7 +151,7 @@
         throw new IllegalArgumentException("Parameter type not supported: " + clazz);
     }
 
-    private static Kind getKind(Class clazz) {
+    private static Kind getKind(Class<?> clazz) {
         if (clazz == int.class || clazz == Integer.class) {
             return Kind.Int;
         } else if (clazz == long.class || clazz == Long.class) {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassCastNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassCastNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassCastNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -54,7 +54,7 @@
         ValueNode javaClass = getJavaClass();
         if (javaClass.isConstant()) {
             ValueNode object = getObject();
-            Class c = (Class) HotSpotObjectConstant.asObject(javaClass.asConstant());
+            Class<?> c = (Class<?>) HotSpotObjectConstant.asObject(javaClass.asConstant());
             if (c != null && !c.isPrimitive()) {
                 HotSpotResolvedObjectType type = (HotSpotResolvedObjectType) HotSpotResolvedObjectType.fromClass(c);
                 CheckCastNode checkcast = graph().add(new CheckCastNode(type, object, null, false));
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetComponentTypeNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetComponentTypeNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetComponentTypeNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -48,9 +48,9 @@
     public Node canonical(CanonicalizerTool tool) {
         ValueNode javaClass = getJavaClass();
         if (javaClass.isConstant()) {
-            Class c = (Class) HotSpotObjectConstant.asObject(javaClass.asConstant());
+            Class<?> c = (Class<?>) HotSpotObjectConstant.asObject(javaClass.asConstant());
             if (c != null) {
-                Class componentType = c.getComponentType();
+                Class<?> componentType = c.getComponentType();
                 return ConstantNode.forConstant(HotSpotObjectConstant.forObject(componentType), tool.getMetaAccess(), graph());
             }
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetModifiersNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetModifiersNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetModifiersNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -48,7 +48,7 @@
     public Node canonical(CanonicalizerTool tool) {
         ValueNode javaClass = getJavaClass();
         if (javaClass.isConstant()) {
-            Class c = (Class) HotSpotObjectConstant.asObject(javaClass.asConstant());
+            Class<?> c = (Class<?>) HotSpotObjectConstant.asObject(javaClass.asConstant());
             if (c != null) {
                 return ConstantNode.forInt(c.getModifiers(), graph());
             }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetSuperclassNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetSuperclassNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetSuperclassNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -48,9 +48,9 @@
     public Node canonical(CanonicalizerTool tool) {
         ValueNode javaClass = getJavaClass();
         if (javaClass.isConstant()) {
-            Class c = (Class) HotSpotObjectConstant.asObject(javaClass.asConstant());
+            Class<?> c = (Class<?>) HotSpotObjectConstant.asObject(javaClass.asConstant());
             if (c != null) {
-                Class superclass = c.getSuperclass();
+                Class<?> superclass = c.getSuperclass();
                 return ConstantNode.forConstant(HotSpotObjectConstant.forObject(superclass), tool.getMetaAccess(), graph());
             }
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsArrayNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsArrayNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsArrayNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -48,7 +48,7 @@
     public Node canonical(CanonicalizerTool tool) {
         ValueNode javaClass = getJavaClass();
         if (javaClass.isConstant()) {
-            Class c = (Class) HotSpotObjectConstant.asObject(javaClass.asConstant());
+            Class<?> c = (Class<?>) HotSpotObjectConstant.asObject(javaClass.asConstant());
             if (c != null) {
                 return ConstantNode.forBoolean(c.isArray(), graph());
             }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInstanceNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInstanceNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInstanceNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -55,7 +55,7 @@
         ValueNode javaClass = getJavaClass();
         if (javaClass.isConstant()) {
             ValueNode object = getObject();
-            Class c = (Class) HotSpotObjectConstant.asObject(javaClass.asConstant());
+            Class<?> c = (Class<?>) HotSpotObjectConstant.asObject(javaClass.asConstant());
             if (c != null) {
                 if (c.isPrimitive()) {
                     return ConstantNode.forBoolean(false, graph());
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInterfaceNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInterfaceNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInterfaceNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -48,7 +48,7 @@
     public Node canonical(CanonicalizerTool tool) {
         ValueNode javaClass = getJavaClass();
         if (javaClass.isConstant()) {
-            Class c = (Class) HotSpotObjectConstant.asObject(javaClass.asConstant());
+            Class<?> c = (Class<?>) HotSpotObjectConstant.asObject(javaClass.asConstant());
             if (c != null) {
                 return ConstantNode.forBoolean(c.isInterface(), graph());
             }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsPrimitiveNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsPrimitiveNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsPrimitiveNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -48,7 +48,7 @@
     public Node canonical(CanonicalizerTool tool) {
         ValueNode javaClass = getJavaClass();
         if (javaClass.isConstant()) {
-            Class c = (Class) HotSpotObjectConstant.asObject(javaClass.asConstant());
+            Class<?> c = (Class<?>) HotSpotObjectConstant.asObject(javaClass.asConstant());
             if (c != null) {
                 return ConstantNode.forBoolean(c.isPrimitive(), graph());
             }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CipherBlockChainingSubstitutions.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CipherBlockChainingSubstitutions.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CipherBlockChainingSubstitutions.java	Thu Apr 10 00:05:24 2014 +0200
@@ -63,35 +63,12 @@
     }
 
     @Fold
-    private static Class getAESCryptClass() {
+    private static Class<?> getAESCryptClass() {
         return AESCryptSubstitutions.AESCryptClass;
     }
 
-    @MethodSubstitution(isStatic = false, optional = true)
-    static void encrypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset) {
-        Object embeddedCipher = UnsafeLoadNode.load(rcvr, embeddedCipherOffset, Kind.Object, LocationIdentity.ANY_LOCATION);
-        if (getAESCryptClass().isInstance(embeddedCipher)) {
-            Object aesCipher = PiNode.piCastNonNull(embeddedCipher, AESCryptSubstitutions.AESCryptClass);
-            crypt(rcvr, in, inOffset, inLength, out, outOffset, aesCipher, true);
-        } else {
-            encrypt(rcvr, in, inOffset, inLength, out, outOffset);
-        }
-    }
-
-    @MethodSubstitution(isStatic = false, optional = true)
-    static void decrypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset) {
-        Object realReceiver = PiNode.piCastNonNull(rcvr, cipherBlockChainingClass);
-        Object embeddedCipher = UnsafeLoadNode.load(realReceiver, embeddedCipherOffset, Kind.Object, LocationIdentity.ANY_LOCATION);
-        if (in != out && getAESCryptClass().isInstance(embeddedCipher)) {
-            Object aesCipher = PiNode.piCastNonNull(embeddedCipher, AESCryptSubstitutions.AESCryptClass);
-            crypt(realReceiver, in, inOffset, inLength, out, outOffset, aesCipher, false);
-        } else {
-            decrypt(realReceiver, in, inOffset, inLength, out, outOffset);
-        }
-    }
-
-    @MethodSubstitution(value = "encrypt", isStatic = false, optional = true)
-    static int encryptInt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset) {
+    @MethodSubstitution(isStatic = false)
+    static int encrypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset) {
         Object realReceiver = PiNode.piCastNonNull(rcvr, cipherBlockChainingClass);
         Object embeddedCipher = UnsafeLoadNode.load(realReceiver, embeddedCipherOffset, Kind.Object, LocationIdentity.ANY_LOCATION);
         if (getAESCryptClass().isInstance(embeddedCipher)) {
@@ -99,12 +76,12 @@
             crypt(realReceiver, in, inOffset, inLength, out, outOffset, aesCipher, true);
             return inLength;
         } else {
-            return encryptInt(realReceiver, in, inOffset, inLength, out, outOffset);
+            return encrypt(realReceiver, in, inOffset, inLength, out, outOffset);
         }
     }
 
-    @MethodSubstitution(value = "decrypt", isStatic = false, optional = true)
-    static int decryptInt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset) {
+    @MethodSubstitution(isStatic = false)
+    static int decrypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset) {
         Object realReceiver = PiNode.piCastNonNull(rcvr, cipherBlockChainingClass);
         Object embeddedCipher = UnsafeLoadNode.load(realReceiver, embeddedCipherOffset, Kind.Object, LocationIdentity.ANY_LOCATION);
         if (in != out && getAESCryptClass().isInstance(embeddedCipher)) {
@@ -112,7 +89,7 @@
             crypt(realReceiver, in, inOffset, inLength, out, outOffset, aesCipher, false);
             return inLength;
         } else {
-            return decryptInt(realReceiver, in, inOffset, inLength, out, outOffset);
+            return decrypt(realReceiver, in, inOffset, inLength, out, outOffset);
         }
     }
 
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippets.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippets.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippets.java	Thu Apr 10 00:05:24 2014 +0200
@@ -180,7 +180,7 @@
      * Type test used when the type being tested against is not known at compile time.
      */
     @Snippet
-    public static Object instanceofDynamic(Class mirror, Object object, Object trueValue, Object falseValue) {
+    public static Object instanceofDynamic(Class<?> mirror, Object object, Object trueValue, Object falseValue) {
         if (probability(NOT_FREQUENT_PROBABILITY, object == null)) {
             isNull.inc();
             return falseValue;
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java	Thu Apr 10 00:05:24 2014 +0200
@@ -63,7 +63,7 @@
 
     /**
      * Creates a stub for a call to code at a given address.
-     * 
+     *
      * @param address the address of the code to call
      * @param descriptor the signature of the call to this stub
      * @param prependThread true if the JavaThread value for the current thread is to be prepended
@@ -78,7 +78,7 @@
         super(providers, HotSpotForeignCallLinkage.create(providers.getMetaAccess(), providers.getCodeCache(), providers.getForeignCalls(), descriptor, 0L, PRESERVES_REGISTERS, JavaCall, JavaCallee,
                         transition, reexecutable, killedLocations));
         this.prependThread = prependThread;
-        Class[] targetParameterTypes = createTargetParameters(descriptor);
+        Class<?>[] targetParameterTypes = createTargetParameters(descriptor);
         ForeignCallDescriptor targetSig = new ForeignCallDescriptor(descriptor.getName() + ":C", descriptor.getResultType(), targetParameterTypes);
         target = HotSpotForeignCallLinkage.create(providers.getMetaAccess(), providers.getCodeCache(), providers.getForeignCalls(), targetSig, address, DESTROYS_REGISTERS, NativeCall, NativeCall,
                         transition, reexecutable, killedLocations);
@@ -91,10 +91,10 @@
         return target;
     }
 
-    private Class[] createTargetParameters(ForeignCallDescriptor descriptor) {
-        Class[] parameters = descriptor.getArgumentTypes();
+    private Class<?>[] createTargetParameters(ForeignCallDescriptor descriptor) {
+        Class<?>[] parameters = descriptor.getArgumentTypes();
         if (prependThread) {
-            Class[] newParameters = new Class[parameters.length + 1];
+            Class<?>[] newParameters = new Class[parameters.length + 1];
             System.arraycopy(parameters, 0, newParameters, 1, parameters.length);
             newParameters[0] = Word.class;
             return newParameters;
@@ -141,7 +141,7 @@
      * Creates a graph for this stub.
      * <p>
      * If the stub returns an object, the graph created corresponds to this pseudo code:
-     * 
+     *
      * <pre>
      *     Object foreignFunctionStub(args...) {
      *         foreignFunction(currentThread,  args);
@@ -152,10 +152,10 @@
      *         return verifyObject(getAndClearObjectResult(thread()));
      *     }
      * </pre>
-     * 
+     *
      * If the stub returns a primitive or word, the graph created corresponds to this pseudo code
      * (using {@code int} as the primitive return type):
-     * 
+     *
      * <pre>
      *     int foreignFunctionStub(args...) {
      *         int result = foreignFunction(currentThread,  args);
@@ -165,9 +165,9 @@
      *         return result;
      *     }
      * </pre>
-     * 
+     *
      * If the stub is void, the graph created corresponds to this pseudo code:
-     * 
+     *
      * <pre>
      *     void foreignFunctionStub(args...) {
      *         foreignFunction(currentThread,  args);
@@ -176,7 +176,7 @@
      *         }
      *     }
      * </pre>
-     * 
+     *
      * In each example above, the {@code currentThread} argument is the C++ JavaThread value (i.e.,
      * %r15 on AMD64) and is only prepended if {@link #prependThread} is true.
      */
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java	Thu Apr 10 00:05:24 2014 +0200
@@ -69,7 +69,7 @@
         }
         assert found != null : "could not find foreign call named " + name + " in " + stubClass;
         List<Class<?>> paramList = Arrays.asList(found.getParameterTypes());
-        Class[] cCallTypes = paramList.subList(1, paramList.size()).toArray(new Class[paramList.size() - 1]);
+        Class<?>[] cCallTypes = paramList.subList(1, paramList.size()).toArray(new Class[paramList.size() - 1]);
         return new ForeignCallDescriptor(name, found.getReturnType(), cCallTypes);
     }
 
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.java/src/com/oracle/graal/java/VerifyOptionsPhase.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/VerifyOptionsPhase.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/VerifyOptionsPhase.java	Thu Apr 10 00:05:24 2014 +0200
@@ -84,7 +84,7 @@
         this.optionValueType = metaAccess.lookupJavaType(OptionValue.class);
         this.option = option;
         this.boxingTypes = new HashSet<>();
-        for (Class c : new Class[]{Boolean.class, Byte.class, Short.class, Character.class, Integer.class, Float.class, Long.class, Double.class}) {
+        for (Class<?> c : new Class[]{Boolean.class, Byte.class, Short.class, Character.class, Integer.class, Float.class, Long.class, Double.class}) {
             this.boxingTypes.add(metaAccess.lookupJavaType(c));
         }
     }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6186134.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6186134.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6186134.java	Thu Apr 10 00:05:24 2014 +0200
@@ -43,7 +43,7 @@
             return num-- > 0;
         }
 
-        public ArrayList test1() {
+        public ArrayList<?> test1() {
             ArrayList<Object> res = new ArrayList<>();
             int maxResults = Integer.MAX_VALUE;
             int n = 0;
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6823354.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6823354.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6823354.java	Thu Apr 10 00:05:24 2014 +0200
@@ -198,10 +198,10 @@
     }
 
     static void loadandrunclass(String classname) throws Exception {
-        Class cl = Class.forName(classname);
+        Class<?> cl = Class.forName(classname);
         URLClassLoader apploader = (URLClassLoader) cl.getClassLoader();
         ClassLoader loader = new URLClassLoader(apploader.getURLs(), apploader.getParent());
-        Class c = loader.loadClass(classname);
+        Class<?> c = loader.loadClass(classname);
         Runnable r = (Runnable) c.newInstance();
         r.run();
     }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/UnsafeAllocateInstance01.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/UnsafeAllocateInstance01.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/UnsafeAllocateInstance01.java	Thu Apr 10 00:05:24 2014 +0200
@@ -43,7 +43,7 @@
         return newObject.field01;
     }
 
-    public static void testClassForException(Class clazz) throws SecurityException, InstantiationException {
+    public static void testClassForException(Class<?> clazz) throws SecurityException, InstantiationException {
         final Unsafe unsafe = getUnsafe();
         unsafe.allocateInstance(clazz);
     }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName02.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName02.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName02.java	Thu Apr 10 00:05:24 2014 +0200
@@ -31,7 +31,7 @@
 
     public static String test(int i) throws ClassNotFoundException {
         String clname = null;
-        Class cl = null;
+        Class<?> cl = null;
         if (i == 0) {
             clname = "java.lang.Object";
             cl = Object.class;
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName03.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName03.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName03.java	Thu Apr 10 00:05:24 2014 +0200
@@ -33,7 +33,7 @@
 
     public static String test(int i) throws ClassNotFoundException {
         String clname = null;
-        Class cl = null;
+        Class<?> cl = null;
         if (i == 0) {
             clname = "java.lang.Object[]";
             cl = Object.class;
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getComponentType01.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getComponentType01.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getComponentType01.java	Thu Apr 10 00:05:24 2014 +0200
@@ -31,7 +31,7 @@
 public final class Class_getComponentType01 extends JTTTest {
 
     public static String test(int i) {
-        Class cl = Object.class;
+        Class<?> cl = Object.class;
         if (i == 0) {
             cl = int.class;
         } else if (i == 1) {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getModifiers01.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getModifiers01.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getModifiers01.java	Thu Apr 10 00:05:24 2014 +0200
@@ -39,7 +39,7 @@
     private static class Private {
     }
 
-    public static int test(Class c) {
+    public static int test(Class<?> c) {
         return c.getModifiers();
     }
 
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getSuperClass01.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getSuperClass01.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getSuperClass01.java	Thu Apr 10 00:05:24 2014 +0200
@@ -31,7 +31,7 @@
 public final class Class_getSuperClass01 extends JTTTest {
 
     public static String test(int i) {
-        Class cl = Object.class;
+        Class<?> cl = Object.class;
         if (i == 0) {
             cl = int.class;
         } else if (i == 1) {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom01.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom01.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom01.java	Thu Apr 10 00:05:24 2014 +0200
@@ -31,7 +31,7 @@
 public final class Class_isAssignableFrom01 extends JTTTest {
 
     public static boolean test(int i) {
-        Class source = Object.class;
+        Class<?> source = Object.class;
         if (i == 0) {
             source = int.class;
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom02.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom02.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom02.java	Thu Apr 10 00:05:24 2014 +0200
@@ -31,7 +31,7 @@
 public final class Class_isAssignableFrom02 extends JTTTest {
 
     public static boolean test(int i) {
-        Class source = Object.class;
+        Class<?> source = Object.class;
         if (i == 0) {
             source = int.class;
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom03.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom03.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom03.java	Thu Apr 10 00:05:24 2014 +0200
@@ -31,7 +31,7 @@
 public final class Class_isAssignableFrom03 extends JTTTest implements Cloneable {
 
     public static boolean test(int i) {
-        Class source = Object.class;
+        Class<?> source = Object.class;
         if (i == 0) {
             source = int.class;
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance07.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance07.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance07.java	Thu Apr 10 00:05:24 2014 +0200
@@ -35,7 +35,7 @@
     static final String[] sarray = {};
     static final Object thisObject = new Class_isInstance07();
 
-    public static boolean test(int i, Class c) {
+    public static boolean test(int i, Class<?> c) {
         Object object = null;
         if (i == 0) {
             object = obj;
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -67,6 +67,13 @@
             if ((rawY & mask) == 0) {
                 return ConstantNode.forIntegerStamp(stamp(), 0, graph());
             }
+            if (x() instanceof SignExtendNode) {
+                SignExtendNode ext = (SignExtendNode) x();
+                if (rawY == ((1L << ext.getInputBits()) - 1)) {
+                    ValueNode result = graph().unique(new ZeroExtendNode(ext.getInput(), ext.getResultBits()));
+                    return result;
+                }
+            }
             if (x().stamp() instanceof IntegerStamp) {
                 IntegerStamp xStamp = (IntegerStamp) x().stamp();
                 if (((xStamp.upMask() | xStamp.downMask()) & ~rawY) == 0) {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -128,7 +128,7 @@
     public static native boolean materializeCondition(@ConstantNodeParameter Condition condition, long x, long y);
 
     @NodeIntrinsic
-    public static boolean materializeIsInstance(Class mirror, Object object) {
+    public static boolean materializeIsInstance(Class<?> mirror, Object object) {
         return mirror.isInstance(object);
     }
 }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -75,6 +75,19 @@
             ZeroExtendNode other = (ZeroExtendNode) getInput();
             return graph().unique(new ZeroExtendNode(other.getInput(), getResultBits()));
         }
+        if (getInput() instanceof NarrowNode) {
+            NarrowNode narrow = (NarrowNode) getInput();
+            Stamp inputStamp = narrow.getInput().stamp();
+            if (inputStamp instanceof IntegerStamp && inputStamp.isCompatible(stamp())) {
+                IntegerStamp istamp = (IntegerStamp) inputStamp;
+                long mask = IntegerStamp.defaultMask(PrimitiveStamp.getBits(narrow.stamp()));
+                if (((istamp.upMask() | istamp.downMask()) & ~mask) == 0) {
+                    // The original value is in the range of the masked zero extended result so
+                    // simply return the original input.
+                    return narrow.getInput();
+                }
+            }
+        }
 
         return this;
     }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeAccessNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeAccessNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeAccessNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -78,8 +78,18 @@
                 }
             }
         }
+        ResolvedJavaType receiverType = ObjectStamp.typeOrNull(object());
+        if (receiverType != null && receiverType.isArray()) {
+            LocationIdentity identity = NamedLocationIdentity.getArrayLocation(receiverType.getComponentType().getKind());
+            // Try to build a better location node
+            ValueNode location = offset();
+            return cloneAsArrayAccess(location, identity);
+        }
+
         return this;
     }
 
     protected abstract ValueNode cloneAsFieldAccess(ResolvedJavaField field);
+
+    protected abstract ValueNode cloneAsArrayAccess(ValueNode location, LocationIdentity identity);
 }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -79,6 +79,11 @@
         return this.graph().add(new LoadFieldNode(object(), field));
     }
 
+    @Override
+    protected ValueNode cloneAsArrayAccess(ValueNode location, LocationIdentity identity) {
+        return this.graph().add(new UnsafeLoadNode(object(), location, accessKind(), identity));
+    }
+
     @SuppressWarnings({"unchecked", "unused"})
     @NodeIntrinsic
     public static <T> T load(Object object, long offset, @ConstantNodeParameter Kind kind, @ConstantNodeParameter LocationIdentity locationIdentity) {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -108,6 +108,11 @@
         return storeFieldNode;
     }
 
+    @Override
+    protected ValueNode cloneAsArrayAccess(ValueNode location, LocationIdentity identity) {
+        return this.graph().add(new UnsafeStoreNode(object(), location, value, accessKind(), identity));
+    }
+
     public FrameState getState() {
         return stateAfter;
     }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewInstanceNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewInstanceNode.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewInstanceNode.java	Thu Apr 10 00:05:24 2014 +0200
@@ -53,5 +53,5 @@
     }
 
     @NodeIntrinsic
-    public static native Object allocateInstance(Class clazz, @ConstantNodeParameter boolean fillContents);
+    public static native Object allocateInstance(Class<?> clazz, @ConstantNodeParameter boolean fillContents);
 }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionDescriptor.java
--- a/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionDescriptor.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionDescriptor.java	Thu Apr 10 00:05:24 2014 +0200
@@ -29,13 +29,13 @@
 public class OptionDescriptor {
 
     protected final String name;
-    protected final Class type;
+    protected final Class<?> type;
     protected final String help;
     protected final OptionValue<?> option;
     protected final Class<?> declaringClass;
     protected final String fieldName;
 
-    public OptionDescriptor(String name, Class type, String help, Class<?> declaringClass, String fieldName, OptionValue<?> option) {
+    public OptionDescriptor(String name, Class<?> type, String help, Class<?> declaringClass, String fieldName, OptionValue<?> option) {
         this.name = name;
         this.type = type;
         this.help = help;
@@ -48,7 +48,7 @@
     /**
      * Gets the type of values stored in the option.
      */
-    public Class getType() {
+    public Class<?> getType() {
         return type;
     }
 
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java
--- a/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java	Thu Apr 10 00:05:24 2014 +0200
@@ -37,7 +37,7 @@
  * Processes static fields annotated with {@link Option}. An {@link Options} service is generated
  * for each top level class containing at least one such field. These service objects can be
  * retrieved as follows:
- * 
+ *
  * <pre>
  * ServiceLoader&lt;Options&gt; sl = ServiceLoader.loadInstalled(Options.class);
  * for (OptionDescriptor desc : sl) {
@@ -184,11 +184,11 @@
             out.println("        return options.iterator();");
             out.println("    }");
             if (needPrivateFieldAccessor) {
-                out.println("    private static " + OptionValue.class.getSimpleName() + " field(Class<?> declaringClass, String fieldName) {");
+                out.println("    private static " + OptionValue.class.getSimpleName() + "<?> field(Class<?> declaringClass, String fieldName) {");
                 out.println("        try {");
                 out.println("            java.lang.reflect.Field field = declaringClass.getDeclaredField(fieldName);");
                 out.println("            field.setAccessible(true);");
-                out.println("            return (" + OptionValue.class.getSimpleName() + ") field.get(null);");
+                out.println("            return (" + OptionValue.class.getSimpleName() + "<?>) field.get(null);");
                 out.println("        } catch (Exception e) {");
                 out.println("            throw (InternalError) new InternalError().initCause(e);");
                 out.println("        }");
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionValue.java
--- a/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionValue.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionValue.java	Thu Apr 10 00:05:24 2014 +0200
@@ -139,7 +139,7 @@
 
     private long reads;
     private OptionValue<?> next;
-    private static OptionValue head;
+    private static OptionValue<?> head;
 
     private static final boolean ShowReadsHistogram = Boolean.getBoolean("graal.showOptionValueReadsHistogram");
 
@@ -252,7 +252,7 @@
      * {@link OptionValue#override(OptionValue, Object)} or {@link OptionValue#override(Map)}.
      */
     public abstract static class OverrideScope implements AutoCloseable {
-        abstract void addToInherited(Map<OptionValue, Object> inherited);
+        abstract void addToInherited(Map<OptionValue<?>, Object> inherited);
 
         abstract <T> T getOverride(OptionValue<T> option);
 
@@ -276,7 +276,7 @@
         }
 
         @Override
-        void addToInherited(Map<OptionValue, Object> inherited) {
+        void addToInherited(Map<OptionValue<?>, Object> inherited) {
             inherited.put(option, value);
         }
 
@@ -304,7 +304,7 @@
 
     static class MultipleOverridesScope extends OverrideScope {
         final OverrideScope parent;
-        final Map<OptionValue, Object> overrides;
+        final Map<OptionValue<?>, Object> overrides;
 
         public MultipleOverridesScope(OverrideScope parent, OptionValue<?> option, Object value) {
             this.parent = parent;
@@ -348,7 +348,7 @@
         }
 
         @Override
-        void addToInherited(Map<OptionValue, Object> inherited) {
+        void addToInherited(Map<OptionValue<?>, Object> inherited) {
             if (parent != null) {
                 parent.addToInherited(inherited);
             }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BinaryGraphPrinter.java
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BinaryGraphPrinter.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BinaryGraphPrinter.java	Thu Apr 10 00:05:24 2014 +0200
@@ -282,7 +282,7 @@
         } else if (object instanceof Enum<?>) {
             writeByte(POOL_ENUM);
             writePoolObject(object.getClass());
-            writeInt(((Enum) object).ordinal());
+            writeInt(((Enum<?>) object).ordinal());
         } else if (object instanceof JavaType) {
             JavaType type = (JavaType) object;
             writeByte(POOL_CLASS);
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfDynamicTest.java
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfDynamicTest.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfDynamicTest.java	Thu Apr 10 00:05:24 2014 +0200
@@ -82,11 +82,11 @@
         return o.getClass().getName().length();
     }
 
-    public static boolean isInstanceDynamic(Class c, Object o) {
+    public static boolean isInstanceDynamic(Class<?> c, Object o) {
         return c.isInstance(o);
     }
 
-    public static int isInstanceIntDynamic(Class c, Object o) {
+    public static int isInstanceIntDynamic(Class<?> c, Object o) {
         if (c.isInstance(o)) {
             return o.toString().length();
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java	Thu Apr 10 00:05:24 2014 +0200
@@ -116,7 +116,7 @@
 
     @LongTest
     public void test5() {
-        Map map = new HashMap<>();
+        Map<?, ?> map = new HashMap<>();
         test("isMap", profile(), map);
         test("isMap", profile(HashMap.class), map);
         test("isMap", profile(TreeMap.class, HashMap.class), map);
@@ -129,7 +129,7 @@
 
     @LongTest
     public void test6() {
-        Map map = new HashMap<>();
+        Map<?, ?> map = new HashMap<>();
         test("isMapInt", profile(), map);
         test("isMapInt", profile(HashMap.class), map);
         test("isMapInt", profile(TreeMap.class, HashMap.class), map);
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewInstanceTest.java
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewInstanceTest.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewInstanceTest.java	Thu Apr 10 00:05:24 2014 +0200
@@ -135,8 +135,8 @@
         return new String(value);
     }
 
-    public static HashMap newHashMap(int initialCapacity) {
-        return new HashMap(initialCapacity);
+    public static HashMap<?, ?> newHashMap(int initialCapacity) {
+        return new HashMap<>(initialCapacity);
     }
 
     static class SomeObject {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewMultiArrayTest.java
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewMultiArrayTest.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewMultiArrayTest.java	Thu Apr 10 00:05:24 2014 +0200
@@ -83,12 +83,12 @@
 
     ResolvedJavaType arrayType;
     ResolvedJavaType bottomType;
-    Class bottomClass;
+    Class<?> bottomClass;
     int[] dimensions;
 
     @LongTest
     public void test1() {
-        for (Class clazz : new Class[]{byte.class, char.class, short.class, int.class, float.class, long.class, double.class, String.class}) {
+        for (Class<?> clazz : new Class[]{byte.class, char.class, short.class, int.class, float.class, long.class, double.class, String.class}) {
             bottomClass = clazz;
             bottomType = getMetaAccess().lookupJavaType(clazz);
             arrayType = bottomType;
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StandardMethodSubstitutionsTest.java
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StandardMethodSubstitutionsTest.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StandardMethodSubstitutionsTest.java	Thu Apr 10 00:05:24 2014 +0200
@@ -173,8 +173,8 @@
         assertEquals(unsafe.compareAndSwapLong(l1, off(l1, "value"), 42, 53), compareAndSwapLong(unsafe, l2, off(l2, "value"), 42, 53));
         assertEquals(l1.get(), l2.get());
 
-        AtomicReference o1 = new AtomicReference<>("42");
-        AtomicReference o2 = new AtomicReference<>("42");
+        AtomicReference<String> o1 = new AtomicReference<>("42");
+        AtomicReference<String> o2 = new AtomicReference<>("42");
         assertEquals(unsafe.compareAndSwapObject(o1, off(o1, "value"), "42", "53"), compareAndSwapObject(unsafe, o2, off(o2, "value"), "42", "53"));
         assertEquals(o1.get(), o2.get());
 
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/TypeCheckTest.java
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/TypeCheckTest.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/TypeCheckTest.java	Thu Apr 10 00:05:24 2014 +0200
@@ -48,11 +48,11 @@
         return super.getCode(method, graph, forceCompile);
     }
 
-    protected JavaTypeProfile profile(Class... types) {
+    protected JavaTypeProfile profile(Class<?>... types) {
         return profile(TriState.FALSE, types);
     }
 
-    protected JavaTypeProfile profile(TriState nullSeen, Class... types) {
+    protected JavaTypeProfile profile(TriState nullSeen, Class<?>... types) {
         if (types.length == 0) {
             return null;
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeClassSubstitutions.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeClassSubstitutions.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeClassSubstitutions.java	Thu Apr 10 00:05:24 2014 +0200
@@ -44,7 +44,7 @@
     }
 
     @MethodSubstitution
-    private static NodeList getNodeList(Node node, long offset) {
+    private static NodeList<?> getNodeList(Node node, long offset) {
         return PiNode.piCast(UnsafeLoadNode.load(node, offset, Kind.Object, LocationIdentity.ANY_LOCATION), NodeList.class);
     }
 
@@ -54,7 +54,7 @@
     }
 
     @MethodSubstitution
-    private static void putNodeList(Node node, long offset, NodeList value) {
+    private static void putNodeList(Node node, long offset, NodeList<?> value) {
         UnsafeStoreNode.store(node, offset, value, Kind.Object, LocationIdentity.ANY_LOCATION);
     }
 
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java	Thu Apr 10 00:05:24 2014 +0200
@@ -235,7 +235,7 @@
         if (originalMember instanceof Method) {
             original = metaAccess.lookupJavaMethod((Method) originalMember);
         } else {
-            original = metaAccess.lookupJavaConstructor((Constructor) originalMember);
+            original = metaAccess.lookupJavaConstructor((Constructor<?>) originalMember);
         }
         if (Debug.isLogEnabled()) {
             Debug.log("substitution: %s --> %s", MetaUtil.format("%H.%n(%p) %r", original), MetaUtil.format("%H.%n(%p) %r", substitute));
@@ -258,7 +258,7 @@
         if (originalMethod instanceof Method) {
             originalJavaMethod = metaAccess.lookupJavaMethod((Method) originalMethod);
         } else {
-            originalJavaMethod = metaAccess.lookupJavaConstructor((Constructor) originalMethod);
+            originalJavaMethod = metaAccess.lookupJavaConstructor((Constructor<?>) originalMethod);
         }
         registeredMacroSubstitutions.put(originalJavaMethod, macro);
         return originalJavaMethod;
@@ -549,7 +549,7 @@
      * @param optional if true, resolution failure returns null
      * @return the resolved class or null if resolution fails and {@code optional} is true
      */
-    static Class resolveType(String className, boolean optional) {
+    static Class<?> resolveType(String className, boolean optional) {
         try {
             // Need to use launcher class path to handle classes
             // that are not on the boot class path
@@ -563,7 +563,7 @@
         }
     }
 
-    private static Class resolveType(JavaType type) {
+    private static Class<?> resolveType(JavaType type) {
         JavaType base = type;
         int dimensions = 0;
         while (base.getComponentType() != null) {
@@ -571,15 +571,15 @@
             dimensions++;
         }
 
-        Class baseClass = base.getKind() != Kind.Object ? base.getKind().toJavaClass() : resolveType(toJavaName(base), false);
+        Class<?> baseClass = base.getKind() != Kind.Object ? base.getKind().toJavaClass() : resolveType(toJavaName(base), false);
         return dimensions == 0 ? baseClass : Array.newInstance(baseClass, new int[dimensions]).getClass();
     }
 
     static class JavaSignature {
-        final Class returnType;
-        final Class[] parameters;
+        final Class<?> returnType;
+        final Class<?>[] parameters;
 
-        public JavaSignature(Class returnType, Class[] parameters) {
+        public JavaSignature(Class<?> returnType, Class<?>[] parameters) {
             this.parameters = parameters;
             this.returnType = returnType;
         }
@@ -598,8 +598,8 @@
     }
 
     private JavaSignature originalSignature(Method substituteMethod, String methodSubstitution, boolean isStatic) {
-        Class[] parameters;
-        Class returnType;
+        Class<?>[] parameters;
+        Class<?> returnType;
         if (methodSubstitution.isEmpty()) {
             parameters = substituteMethod.getParameterTypes();
             if (!isStatic) {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java	Thu Apr 10 00:05:24 2014 +0200
@@ -207,7 +207,7 @@
             return this;
         }
 
-        public Arguments addVarargs(String name, Class componentType, Stamp argStamp, Object value) {
+        public Arguments addVarargs(String name, Class<?> componentType, Stamp argStamp, Object value) {
             assert check(name, false, true);
             Varargs varargs = new Varargs(componentType, argStamp, value);
             values[nextParamIdx] = varargs;
@@ -276,17 +276,17 @@
      */
     static class Varargs {
 
-        protected final Class componentType;
+        protected final Class<?> componentType;
         protected final Stamp stamp;
         protected final Object value;
         protected final int length;
 
-        protected Varargs(Class componentType, Stamp stamp, Object value) {
+        protected Varargs(Class<?> componentType, Stamp stamp, Object value) {
             this.componentType = componentType;
             this.stamp = stamp;
             this.value = value;
             if (value instanceof List) {
-                this.length = ((List) value).size();
+                this.length = ((List<?>) value).size();
             } else {
                 this.length = Array.getLength(value);
             }
@@ -807,10 +807,10 @@
                 ParameterNode[] params = (ParameterNode[]) parameter;
                 Varargs varargs = (Varargs) argument;
                 int length = params.length;
-                List list = null;
+                List<?> list = null;
                 Object array = null;
                 if (varargs.value instanceof List) {
-                    list = (List) varargs.value;
+                    list = (List<?>) varargs.value;
                     assert list.size() == length : length + " != " + list.size();
                 } else {
                     array = varargs.value;
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/UnsafeSubstitutions.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/UnsafeSubstitutions.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/UnsafeSubstitutions.java	Thu Apr 10 00:05:24 2014 +0200
@@ -387,7 +387,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static Object allocateInstance(final Unsafe thisObj, Class clazz) throws InstantiationException {
+    public static Object allocateInstance(final Unsafe thisObj, Class<?> clazz) throws InstantiationException {
         if (clazz.isPrimitive()) {
             throw new InstantiationException(clazz.getName());
         }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/OptimizedCallTargetInstrumentation.java
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/OptimizedCallTargetInstrumentation.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/OptimizedCallTargetInstrumentation.java	Thu Apr 10 00:05:24 2014 +0200
@@ -55,7 +55,7 @@
         return mark;
     }
 
-    protected static int getFieldOffset(String name, Class declaringClass) {
+    protected static int getFieldOffset(String name, Class<?> declaringClass) {
         try {
             declaringClass.getDeclaredField(name).setAccessible(true);
             Field field = declaringClass.getDeclaredField(name);
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java	Thu Apr 10 00:05:24 2014 +0200
@@ -66,7 +66,7 @@
     private final TruffleCache truffleCache;
     private final ThreadPoolExecutor compileQueue;
 
-    private static final Class[] SKIPPED_EXCEPTION_CLASSES = new Class[]{UnexpectedResultException.class, SlowPathException.class, ArithmeticException.class};
+    private static final Class<?>[] SKIPPED_EXCEPTION_CLASSES = new Class[]{UnexpectedResultException.class, SlowPathException.class, ArithmeticException.class};
 
     public static final OptimisticOptimizations Optimizations = OptimisticOptimizations.ALL.remove(OptimisticOptimizations.Optimization.UseExceptionProbability,
                     OptimisticOptimizations.Optimization.RemoveNeverExecutedCode, OptimisticOptimizations.Optimization.UseTypeCheckedInlining, OptimisticOptimizations.Optimization.UseTypeCheckHints);
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/CompilerDirectivesSubstitutions.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/CompilerDirectivesSubstitutions.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/CompilerDirectivesSubstitutions.java	Thu Apr 10 00:05:24 2014 +0200
@@ -71,7 +71,7 @@
     public static native void bailout(String reason);
 
     @MacroSubstitution(macro = UnsafeTypeCastMacroNode.class, isStatic = true)
-    public static native Object unsafeCast(Object value, Class clazz, boolean condition, boolean nonNull);
+    public static native Object unsafeCast(Object value, Class<?> clazz, boolean condition, boolean nonNull);
 
     @MethodSubstitution
     private static Class<? extends MaterializedFrame> getUnsafeFrameType() {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualizerToolImpl.java
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualizerToolImpl.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualizerToolImpl.java	Thu Apr 10 00:05:24 2014 +0200
@@ -71,7 +71,7 @@
         return assumptions;
     }
 
-    public void reset(PartialEscapeBlockState newState, ValueNode newCurrent, FixedNode newPosition, GraphEffectList newEffects) {
+    public void reset(PartialEscapeBlockState<?> newState, ValueNode newCurrent, FixedNode newPosition, GraphEffectList newEffects) {
         deleted = false;
         state = newState;
         current = newCurrent;
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/TypeSystem.java
--- a/graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/TypeSystem.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/TypeSystem.java	Thu Apr 10 00:05:24 2014 +0200
@@ -61,12 +61,12 @@
  *
  * {@literal @}TypeSystem(types = {boolean.class, int.class, double.class})
  * public abstract class ExampleTypeSystem {
- *
+ * 
  *     {@literal @}TypeCheck
  *     public boolean isInteger(Object value) {
  *         return value instanceof Integer || value instanceof Double;
  *     }
- *
+ * 
  *     {@literal @}TypeCast
  *     public double asInteger(Object value) {
  *         return ((Number)value).doubleValue();
@@ -85,6 +85,6 @@
     /**
      * The list of types as child elements of the {@link TypeSystem}. Each precedes its super type.
      */
-    Class[] value();
+    Class<?>[] value();
 
 }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.truffle.api/src/com/oracle/truffle/api/source/SourceLineLocation.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/source/SourceLineLocation.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/source/SourceLineLocation.java	Thu Apr 10 00:05:24 2014 +0200
@@ -31,7 +31,7 @@
  * instance of {@link Source}, suitable for hash table keys with equality defined in terms of
  * content.
  */
-public class SourceLineLocation implements Comparable {
+public class SourceLineLocation implements Comparable<Object> {
 
     private final Source source;
     private final int line;
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleProcessor.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleProcessor.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleProcessor.java	Thu Apr 10 00:05:24 2014 +0200
@@ -60,7 +60,7 @@
         // TODO run verifications that other annotations are not processed out of scope of the
         // operation or typelattice.
         try {
-            for (AnnotationProcessor generator : getGenerators()) {
+            for (AnnotationProcessor<?> generator : getGenerators()) {
                 AbstractParser<?> parser = generator.getParser();
                 if (parser.getAnnotationType() != null) {
                     for (Element e : env.getElementsAnnotatedWith(parser.getAnnotationType())) {
@@ -86,7 +86,7 @@
         }
     }
 
-    private static void processElement(RoundEnvironment env, AnnotationProcessor generator, Element e, boolean callback) {
+    private static void processElement(RoundEnvironment env, AnnotationProcessor<?> generator, Element e, boolean callback) {
         try {
             generator.process(env, e, callback);
         } catch (Throwable e1) {
@@ -94,16 +94,15 @@
         }
     }
 
-    private static void handleThrowable(AnnotationProcessor generator, Throwable t, Element e) {
+    private static void handleThrowable(AnnotationProcessor<?> generator, Throwable t, Element e) {
         String message = "Uncaught error in " + generator.getClass().getSimpleName() + " while processing " + e;
         generator.getContext().getEnvironment().getMessager().printMessage(Kind.ERROR, message + ": " + Utils.printException(t), e);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void callback(TypeElement template) {
-        for (AnnotationProcessor generator : generators) {
-            Class annotationType = generator.getParser().getAnnotationType();
+        for (AnnotationProcessor<?> generator : generators) {
+            Class<? extends Annotation> annotationType = generator.getParser().getAnnotationType();
             if (annotationType != null) {
                 Annotation annotation = template.getAnnotation(annotationType);
                 if (annotation != null) {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleTypes.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleTypes.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleTypes.java	Thu Apr 10 00:05:24 2014 +0200
@@ -112,7 +112,7 @@
         return nodeCost;
     }
 
-    private DeclaredType getRequired(ProcessorContext context, Class clazz) {
+    private DeclaredType getRequired(ProcessorContext context, Class<?> clazz) {
         TypeMirror type = context.getType(clazz);
         if (type == null) {
             errors.add(String.format("Could not find required type: %s", clazz.getSimpleName()));
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/compiler/AbstractCompiler.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/compiler/AbstractCompiler.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/compiler/AbstractCompiler.java	Thu Apr 10 00:05:24 2014 +0200
@@ -32,7 +32,7 @@
         return method.invoke(o);
     }
 
-    protected static Object method(Object o, String methodName, Class[] paramTypes, Object... values) throws Exception {
+    protected static Object method(Object o, String methodName, Class<?>[] paramTypes, Object... values) throws Exception {
         Method method = o.getClass().getMethod(methodName, paramTypes);
         method.setAccessible(true);
         return method.invoke(o, values);
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/compiler/JavaCCompiler.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/compiler/JavaCCompiler.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/compiler/JavaCCompiler.java	Thu Apr 10 00:05:24 2014 +0200
@@ -44,8 +44,8 @@
         return type.getEnclosedElements();
     }
 
-    private static final Class[] getTreeAndTopLevelSignature = new Class[]{Element.class, AnnotationMirror.class, AnnotationValue.class};
-    private static final Class[] getCharContentSignature = new Class[]{boolean.class};
+    private static final Class<?>[] getTreeAndTopLevelSignature = new Class[]{Element.class, AnnotationMirror.class, AnnotationValue.class};
+    private static final Class<?>[] getCharContentSignature = new Class[]{boolean.class};
 
     @Override
     public String getMethodBody(ProcessingEnvironment env, ExecutableElement method) {
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/template/CodeElementFactory.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/template/CodeElementFactory.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/template/CodeElementFactory.java	Thu Apr 10 00:05:24 2014 +0200
@@ -44,7 +44,7 @@
     protected void createChildren(M m) {
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public CodeElement<?> process(CodeElement parent, M m) {
         model = m;
         element = (CodeElement<? super Element>) create(model);
@@ -57,6 +57,7 @@
         return element;
     }
 
+    @SuppressWarnings("rawtypes")
     public CodeElement getElement() {
         return element;
     }
diff -r 5e6f29f287d6 -r 04f1723150b4 graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/template/CompilationUnitFactory.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/template/CompilationUnitFactory.java	Thu Apr 10 00:01:30 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/template/CompilationUnitFactory.java	Thu Apr 10 00:05:24 2014 +0200
@@ -36,6 +36,7 @@
         return new CodeCompilationUnit();
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
     public CodeCompilationUnit process(CodeElement parent, M m) {
         return (CodeCompilationUnit) super.process(parent, m);
diff -r 5e6f29f287d6 -r 04f1723150b4 mx/eclipse-settings/org.eclipse.jdt.core.prefs
--- a/mx/eclipse-settings/org.eclipse.jdt.core.prefs	Thu Apr 10 00:01:30 2014 +0200
+++ b/mx/eclipse-settings/org.eclipse.jdt.core.prefs	Thu Apr 10 00:05:24 2014 +0200
@@ -87,7 +87,7 @@
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning