--- old/src/share/vm/oops/valueArrayKlass.cpp	2017-06-16 14:34:20.665928422 +0200
+++ new/src/share/vm/oops/valueArrayKlass.cpp	2017-06-16 14:34:20.277928440 +0200
@@ -69,14 +69,18 @@
 #endif
 }
 
-void ValueArrayKlass::set_element_klass(ValueKlass* k) {
+ValueKlass* ValueArrayKlass::element_klass() const {
+  return ValueKlass::cast(_element_klass);
+}
+
+void ValueArrayKlass::set_element_klass(Klass* k) {
   _element_klass = k;
 }
 
 ValueArrayKlass* ValueArrayKlass::allocate_klass(Klass*  element_klass,
                                                  Symbol* name,
                                                  TRAPS) {
-  assert(ValueArrayFlatten, "Flatten array not allowed");
+  assert(ValueArrayFlatten, "Flatten array required");
   assert(ValueKlass::cast(element_klass)->is_atomic() || (!ValueArrayAtomicAccess), "Atomic by-default");
 
   ClassLoaderData* loader_data = element_klass->class_loader_data();