--- a/src/hotspot/share/classfile/javaClasses.cpp	Wed Aug 22 16:06:51 2018 +0100
+++ b/src/hotspot/share/classfile/javaClasses.cpp	Tue Aug 14 09:59:37 2018 -0700
@@ -1213,7 +1213,7 @@
 bool java_lang_Class::restore_archived_mirror(Klass *k,
                                               Handle class_loader, Handle module,
                                               Handle protection_domain, TRAPS) {
-  oop m = MetaspaceShared::materialize_archived_object(k->archived_java_mirror_raw());
+  oop m = MetaspaceShared::materialize_archived_object(k->archived_java_mirror_raw_narrow());
 
   if (m == NULL) {
     return false;