--- a/src/share/vm/classfile/javaClasses.cpp	Wed Oct 15 10:09:04 2014 -0700
+++ b/src/share/vm/classfile/javaClasses.cpp	Fri Oct 17 12:34:59 2014 +0100
@@ -575,6 +575,7 @@
       instanceKlass::cast(k())->do_local_static_fields(&initialize_static_field, CHECK_NULL);
     }
     // set the classLoader field in the java_lang_Class instance
+    assert(class_loader() == k->class_loader(), "should be same");
     set_class_loader(mirror(), class_loader());
     return mirror();
   } else {

--- a/src/share/vm/oops/arrayKlass.cpp	Wed Oct 15 10:09:04 2014 -0700
+++ b/src/share/vm/oops/arrayKlass.cpp	Fri Oct 17 12:34:59 2014 +0100
@@ -124,7 +124,7 @@
   ResourceMark rm(THREAD);
   k->initialize_supers(super_klass(), CHECK);
   k->vtable()->initialize_vtable(false, CHECK);
-  java_lang_Class::create_mirror(k, CHECK);
+  java_lang_Class::create_mirror(k, Handle(THREAD, k->class_loader()), CHECK);
 }
 
 objArrayOop arrayKlass::compute_secondary_supers(int num_extra_slots, TRAPS) {

--- a/src/share/vm/oops/objArrayKlass.cpp	Wed Oct 15 10:09:04 2014 -0700
+++ b/src/share/vm/oops/objArrayKlass.cpp	Fri Oct 17 12:34:59 2014 +0100
@@ -202,6 +202,15 @@
   }
 }
 
+// Protect against _bottom_klass being null, when called from Universe::fixup_mirrors
+oop objArrayKlass::class_loader() const {
+  if (bottom_klass() != NULL) {
+    return Klass::cast(bottom_klass())->class_loader();
+  } else {
+    return NULL;
+  }
+}
+
 
 klassOop objArrayKlass::array_klass_impl(bool or_null, int n, TRAPS) {
   objArrayKlassHandle h_this(THREAD, as_klassOop());

--- a/src/share/vm/oops/objArrayKlass.hpp	Wed Oct 15 10:09:04 2014 -0700
+++ b/src/share/vm/oops/objArrayKlass.hpp	Fri Oct 17 12:34:59 2014 +0100
@@ -68,7 +68,7 @@
   // Compute protection domain
   oop protection_domain() { return Klass::cast(bottom_klass())->protection_domain(); }
   // Compute class loader
-  oop class_loader() const { return Klass::cast(bottom_klass())->class_loader(); }
+  oop class_loader() const;
 
  private:
   // Either oop or narrowOop depending on UseCompressedOops.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/runtime/LoadClass/ShowClassLoader.java	Fri Oct 17 12:34:59 2014 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @key regression
+ * @bug 8058927
+ * @summary Make sure array class has the right class loader
+ * @run main ShowClassLoader
+ */
+
+public class ShowClassLoader {
+
+    public static void main(String[] args) {
+        Object[] oa = new Object[0];
+        ShowClassLoader[] sa = new ShowClassLoader[0];
+
+        System.out.println("Classloader for Object[] is " + oa.getClass().getClassLoader());
+        System.out.println("Classloader for SCL[] is " + sa.getClass().getClassLoader() );
+
+        if (sa.getClass().getClassLoader() == null) {
+            throw new RuntimeException("Wrong class loader");
+        }
+    }
+}