src/hotspot/share/opto/graphKit.cpp

*** 3622,3632 ****
      assert(klass != NULL, "klass should not be NULL");
      bool    xklass = inst_klass->klass_is_exact();
      bool can_be_flattened = false;
      if (ValueArrayFlatten && klass->is_obj_array_klass()) {
        ciKlass* elem = klass->as_obj_array_klass()->element_klass();
!       can_be_flattened = elem->is_java_lang_Object() || elem->is_interface();
      }
      if (xklass || (klass->is_array_klass() && !can_be_flattened)) {
        jint lhelper = klass->layout_helper();
        if (lhelper != Klass::_lh_neutral_value) {
          constant_value = lhelper;
--- 3622,3632 ----
      assert(klass != NULL, "klass should not be NULL");
      bool    xklass = inst_klass->klass_is_exact();
      bool can_be_flattened = false;
      if (ValueArrayFlatten && klass->is_obj_array_klass()) {
        ciKlass* elem = klass->as_obj_array_klass()->element_klass();
!       can_be_flattened = elem->is_java_lang_Object() || elem->is_interface() || (elem->is_valuetype() && !klass->as_array_klass()->storage_properties().is_null_free());
      }
      if (xklass || (klass->is_array_klass() && !can_be_flattened)) {
        jint lhelper = klass->layout_helper();
        if (lhelper != Klass::_lh_neutral_value) {
          constant_value = lhelper;
*** 4012,4022 ****
    // - null-free, flattened: MyValue.val[] (ciValueArrayKlass "[QMyValue")
    Node* storage_properties = NULL;
    Node* default_value = NULL;
    Node* raw_default_value = NULL;
    int props_shift = UseCompressedClassPointers ? oopDesc::narrow_storage_props_shift : oopDesc::wide_storage_props_shift;
!   if (ary_ptr != NULL) {
      // Array type is known
      elem = ary_ptr->elem();
      ciArrayKlass* ary_klass = ary_ptr->klass()->as_array_klass();
      elem_klass = ary_klass->element_klass();
  
--- 4012,4022 ----
    // - null-free, flattened: MyValue.val[] (ciValueArrayKlass "[QMyValue")
    Node* storage_properties = NULL;
    Node* default_value = NULL;
    Node* raw_default_value = NULL;
    int props_shift = UseCompressedClassPointers ? oopDesc::narrow_storage_props_shift : oopDesc::wide_storage_props_shift;
!   if (ary_ptr != NULL && ary_ptr->klass_is_exact()) {
      // Array type is known
      elem = ary_ptr->elem();
      ciArrayKlass* ary_klass = ary_ptr->klass()->as_array_klass();
      elem_klass = ary_klass->element_klass();
  
*** 4033,4043 ****
        }
        storage_properties = MakeConX(props.encode<NOT_LP64(jint) LP64_ONLY(jlong)>(props_shift));
      }
    }
  
!   if (EnableValhalla && (elem == NULL || (elem_klass != NULL && elem_klass->is_java_lang_Object() && !ary_type->klass_is_exact()))) {
      // Array type is not known, compute default value and storage properties for initialization.
      assert(raw_default_value == NULL && storage_properties == NULL, "shouldn't be set yet");
      assert(elem_mirror != NULL, "should not be null");
  
      Node* r = new RegionNode(4);
--- 4033,4044 ----
        }
        storage_properties = MakeConX(props.encode<NOT_LP64(jint) LP64_ONLY(jlong)>(props_shift));
      }
    }
  
!   if (EnableValhalla && (elem == NULL || (elem_klass != NULL && (elem_klass->is_java_lang_Object() || elem_klass->is_valuetype()) &&
!                                           !ary_type->klass_is_exact()))) {
      // Array type is not known, compute default value and storage properties for initialization.
      assert(raw_default_value == NULL && storage_properties == NULL, "shouldn't be set yet");
      assert(elem_mirror != NULL, "should not be null");
  
      Node* r = new RegionNode(4);