--- a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp	Fri Oct 23 14:33:19 2015 +0300
+++ b/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp	Mon Oct 26 13:11:36 2015 -0400
@@ -306,7 +306,7 @@
     }                                                                                                                                                          \
     static void compute_offsets();                                                                                                                             \
   public:                                                                                                                                                      \
-    static InstanceKlass* klass() { return SystemDictionary::name##_klass() == NULL ? NULL : InstanceKlass::cast(SystemDictionary::name##_klass()); }
+    static InstanceKlass* klass() { return SystemDictionary::name##_klass(); }
 
 #define END_CLASS };