*** old/src/share/vm/oops/valueArrayKlass.cpp	Wed Jun 14 17:41:30 2017
--- new/src/share/vm/oops/valueArrayKlass.cpp	Wed Jun 14 17:41:29 2017

*** 69,87 ****
--- 69,91 ----
      print();
    }
  #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;
!   _element_value_store_size = ValueKlass::cast(k)->raw_value_byte_size();
  }
  
  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();
    int size = ArrayKlass::static_size(ValueArrayKlass::header_size());
    ValueArrayKlass* vak = new (loader_data, size, THREAD) ValueArrayKlass(element_klass, name);