--- old/src/share/vm/ci/ciMethodData.hpp	2017-04-25 16:44:10.791176036 +0200
+++ new/src/share/vm/ci/ciMethodData.hpp	2017-04-25 16:44:10.643176041 +0200
@@ -68,12 +68,8 @@
 protected:
   static intptr_t translate_klass(intptr_t k) {
     Klass* v = TypeEntries::valid_klass(k);
-    if (v != NULL) {
-      ciKlass* klass = CURRENT_ENV->get_klass(v);
-      CURRENT_ENV->ensure_metadata_alive(klass);
-      return with_status(klass, k);
-    }
-    return with_status(NULL, k);
+    ciKlass* klass = CURRENT_ENV->get_klass(v);
+    return with_status(klass, k);
   }
 
 public: