src/hotspot/share/classfile/classFileParser.cpp

@@ -1493,12 +1493,11 @@
   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, // T_CONFLICT    = 20,
   BAD_ALLOCATION_TYPE, // 0
   BAD_ALLOCATION_TYPE, // 1
   BAD_ALLOCATION_TYPE, // 2
   BAD_ALLOCATION_TYPE, // 3
   STATIC_BYTE ,        // T_BOOLEAN     =  4,

@@ -1515,12 +1514,11 @@
   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, // 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)];

@@ -6051,15 +6049,10 @@
     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

@@ -6067,11 +6060,11 @@
     }
   }
 
   int nfields = ik->java_fields_count();
   if (ik->is_value()) nfields++;
-  for(int i = 0; i < nfields; i++) {
+  for (int i = 0; i < nfields; i++) {
     if (ik->field_access_flags(i) & JVM_ACC_FLATTENABLE) {
       Klass* klass = SystemDictionary::resolve_or_fail(ik->field_signature(i),
                                                        Handle(THREAD, ik->class_loader()),
                                                        Handle(THREAD, ik->protection_domain()), true, CHECK);
       assert(klass != NULL, "Sanity check");

@@ -6081,10 +6074,14 @@
         && ((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 */);