src/hotspot/share/classfile/classFileParser.cpp

*** 1498,1509 ****
    BAD_ALLOCATION_TYPE, // T_VOID        = 15,
    BAD_ALLOCATION_TYPE, // T_ADDRESS     = 16,
    BAD_ALLOCATION_TYPE, // T_NARROWOOP   = 17,
    BAD_ALLOCATION_TYPE, // T_METADATA    = 18,
    BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 19,
!   BAD_ALLOCATION_TYPE, // T_VALUETYPEPTR= 20,
!   BAD_ALLOCATION_TYPE, // T_CONFLICT    = 21,
    BAD_ALLOCATION_TYPE, // 0
    BAD_ALLOCATION_TYPE, // 1
    BAD_ALLOCATION_TYPE, // 2
    BAD_ALLOCATION_TYPE, // 3
    STATIC_BYTE ,        // T_BOOLEAN     =  4,
--- 1498,1508 ----
    BAD_ALLOCATION_TYPE, // T_VOID        = 15,
    BAD_ALLOCATION_TYPE, // T_ADDRESS     = 16,
    BAD_ALLOCATION_TYPE, // T_NARROWOOP   = 17,
    BAD_ALLOCATION_TYPE, // T_METADATA    = 18,
    BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 19,
!   BAD_ALLOCATION_TYPE, // T_CONFLICT    = 20,
    BAD_ALLOCATION_TYPE, // 0
    BAD_ALLOCATION_TYPE, // 1
    BAD_ALLOCATION_TYPE, // 2
    BAD_ALLOCATION_TYPE, // 3
    STATIC_BYTE ,        // T_BOOLEAN     =  4,
*** 1520,1531 ****
    BAD_ALLOCATION_TYPE, // T_VOID        = 15,
    BAD_ALLOCATION_TYPE, // T_ADDRESS     = 16,
    BAD_ALLOCATION_TYPE, // T_NARROWOOP   = 17,
    BAD_ALLOCATION_TYPE, // T_METADATA    = 18,
    BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 19,
!   BAD_ALLOCATION_TYPE, // T_VALUETYPEPTR= 20,
!   BAD_ALLOCATION_TYPE, // T_CONFLICT    = 21,
  };
  
  static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type, bool is_flattenable) {
    assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values");
    FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)];
--- 1519,1529 ----
    BAD_ALLOCATION_TYPE, // T_VOID        = 15,
    BAD_ALLOCATION_TYPE, // T_ADDRESS     = 16,
    BAD_ALLOCATION_TYPE, // T_NARROWOOP   = 17,
    BAD_ALLOCATION_TYPE, // T_METADATA    = 18,
    BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 19,
!   BAD_ALLOCATION_TYPE, // T_CONFLICT    = 20
  };
  
  static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type, bool is_flattenable) {
    assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values");
    FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)];
*** 6019,6033 ****
      DefaultMethods::generate_default_methods(ik,
                                               _all_mirandas,
                                               CHECK);
    }
  
-   if (is_value_type()) {
-     ValueKlass* vk = ValueKlass::cast(ik);
-     vk->initialize_calling_convention();
-   }
- 
    // Add read edges to the unnamed modules of the bootstrap and app class loaders.
    if (changed_by_loadhook && !module_handle.is_null() && module_entry->is_named() &&
        !module_entry->has_default_read_edges()) {
      if (!module_entry->set_has_default_read_edges()) {
        // We won a potential race
--- 6017,6026 ----
*** 6035,6045 ****
      }
    }
  
    int nfields = ik->java_fields_count();
    if (ik->is_value()) nfields++;
!   for(int i = 0; i < nfields; i++) {
      if (ik->field_access_flags(i) & JVM_ACC_FLATTENABLE) {
        Symbol* klass_name = ik->field_signature(i)->fundamental_name(CHECK);
        // Value classes must have been pre-loaded
        Klass* klass = SystemDictionary::find(klass_name,
            Handle(THREAD, ik->class_loader()),
--- 6028,6038 ----
      }
    }
  
    int nfields = ik->java_fields_count();
    if (ik->is_value()) nfields++;
!   for (int i = 0; i < nfields; i++) {
      if (ik->field_access_flags(i) & JVM_ACC_FLATTENABLE) {
        Symbol* klass_name = ik->field_signature(i)->fundamental_name(CHECK);
        // Value classes must have been pre-loaded
        Klass* klass = SystemDictionary::find(klass_name,
            Handle(THREAD, ik->class_loader()),
*** 6052,6061 ****
--- 6045,6058 ----
          && ((ik->field_access_flags(i) & JVM_ACC_STATIC) != 0)) {
        ValueKlass::cast(ik)->set_default_value_offset(ik->field_offset(i));
      }
    }
  
+   if (is_value_type()) {
+     ValueKlass::cast(ik)->initialize_calling_convention(CHECK);
+   }
+ 
    // Update the loader_data graph.
    record_defined_class_dependencies(ik, CHECK);
  
    ClassLoadingService::notify_class_loaded(ik, false /* not shared class */);