--- a/src/hotspot/share/opto/library_call.cpp	Wed Apr 18 15:57:19 2018 +0200
+++ b/src/hotspot/share/opto/library_call.cpp	Wed Apr 18 10:39:40 2018 -0400
@@ -3488,6 +3488,7 @@
 Node* LibraryCallKit::load_mirror_from_klass(Node* klass) {
   Node* p = basic_plus_adr(klass, in_bytes(Klass::java_mirror_offset()));
   Node* load = make_load(NULL, p, TypeRawPtr::NOTNULL, T_ADDRESS, MemNode::unordered);
+  // mirror = ((OopHandle)mirror)->resolve();
   return make_load(NULL, load, TypeInstPtr::MIRROR, T_OBJECT, MemNode::unordered);
 }