--- old/src/share/vm/ci/ciMethodData.cpp	2017-04-25 16:44:10.091176060 +0200
+++ new/src/share/vm/ci/ciMethodData.cpp	2017-04-25 16:44:09.967176065 +0200
@@ -186,11 +186,8 @@
 void ciReceiverTypeData::translate_receiver_data_from(const ProfileData* data) {
   for (uint row = 0; row < row_limit(); row++) {
     Klass* k = data->as_ReceiverTypeData()->receiver(row);
-    if (k != NULL) {
-      ciKlass* klass = CURRENT_ENV->get_klass(k);
-      CURRENT_ENV->ensure_metadata_alive(klass);
-      set_receiver(row, klass);
-    }
+    ciKlass* klass = CURRENT_ENV->get_klass(k);
+    set_receiver(row, klass);
   }
 }
 
@@ -210,7 +207,6 @@
 void ciSpeculativeTrapData::translate_from(const ProfileData* data) {
   Method* m = data->as_SpeculativeTrapData()->method();
   ciMethod* ci_m = CURRENT_ENV->get_method(m);
-  CURRENT_ENV->ensure_metadata_alive(ci_m);
   set_method(ci_m);
 }