--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/Kind.java	Thu Sep 03 00:53:54 2015 +0200
+++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/Kind.java	Thu Sep 03 12:03:25 2015 +0200
@@ -70,7 +70,7 @@
     private final boolean isStackInt;
     private final Class<?> primitiveJavaClass;
     private final Class<?> boxedJavaClass;
-    private final EnumKey key = new EnumKey(this);
+    private final EnumKey<Kind> key = new EnumKey<>(this);
     private final int slotCount;
 
     private Kind(char typeChar, String javaName, int slotCount, boolean isStackInt, Class<?> primitiveJavaClass, Class<?> boxedJavaClass) {

--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/PlatformKind.java	Thu Sep 03 00:53:54 2015 +0200
+++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/PlatformKind.java	Thu Sep 03 12:03:25 2015 +0200
@@ -35,11 +35,10 @@
 
     }
 
-    public class EnumKey implements Key {
-        @SuppressWarnings("rawtypes") private final Enum e;
+    public class EnumKey<E extends Enum<E>> implements Key {
+        private final Enum<E> e;
 
-        @SuppressWarnings("rawtypes")
-        public EnumKey(Enum e) {
+        public EnumKey(Enum<E> e) {
             this.e = e;
         }
 
@@ -54,7 +53,7 @@
                 return true;
             }
             if (obj instanceof EnumKey) {
-                EnumKey that = (EnumKey) obj;
+                EnumKey<?> that = (EnumKey<?>) obj;
                 return this.e == that.e;
             }
             return false;