src/hotspot/share/ci/ciInstanceKlass.cpp

*** 537,547 ****
    }
  
    for (JavaFieldStream fs(k); !fs.done(); fs.next()) {
      if (fs.access_flags().is_static())  continue;
      fieldDescriptor& fd = fs.field_descriptor();
!     if (fd.is_flatten() && flatten) {
        assert(fd.field_type() == T_VALUETYPE, "flattening is only supported for value type fields");
        // Value type fields are embedded
        int field_offset = fd.offset();
        // Get ValueKlass and adjust number of fields
        ciValueKlass* vk = get_field_type_by_offset(field_offset)->as_value_klass();
--- 537,547 ----
    }
  
    for (JavaFieldStream fs(k); !fs.done(); fs.next()) {
      if (fs.access_flags().is_static())  continue;
      fieldDescriptor& fd = fs.field_descriptor();
!     if (fd.is_flattened() && flatten) {
        assert(fd.field_type() == T_VALUETYPE, "flattening is only supported for value type fields");
        // Value type fields are embedded
        int field_offset = fd.offset();
        // Get ValueKlass and adjust number of fields
        ciValueKlass* vk = get_field_type_by_offset(field_offset)->as_value_klass();