--- old/src/share/vm/ci/ciArrayKlass.cpp	2017-03-06 09:06:44.114041189 +0100
+++ new/src/share/vm/ci/ciArrayKlass.cpp	2017-03-06 09:06:44.042041192 +0100
@@ -73,12 +73,14 @@
 ciType* ciArrayKlass::base_element_type() {
   if (is_type_array_klass()) {
     return ciType::make(as_type_array_klass()->element_type());
-  } else {
+  } else if (is_obj_array_klass()) {
     ciKlass* ek = as_obj_array_klass()->base_element_klass();
     if (ek->is_type_array_klass()) {
       return ciType::make(ek->as_type_array_klass()->element_type());
     }
     return ek;
+  } else {
+    return as_value_array_klass()->base_element_klass();
   }
 }