src/hotspot/share/classfile/placeholders.cpp

*** 60,10 ***
--- 60,12 ---
  // For bootclasssearchpath, set before calling load_instance_class.
  // Defining must be single threaded on a class/classloader basis
  // For DEFINE_CLASS, the head of the queue owns the
  // define token and the rest of the threads wait to return the
  // result the first thread gets.
+ // For INLINE_FIELD, set when loading inline type fields for
+ // class circularity checking.
  class SeenThread: public CHeapObj<mtInternal> {
  private:
     JavaThread* _thread;
     SeenThread* _stnext;
     SeenThread* _stprev;

*** 100,10 ***
--- 102,13 ---
         queuehead = _superThreadQ;
         break;
      case PlaceholderTable::DEFINE_CLASS:
         queuehead = _defineThreadQ;
         break;
+     case PlaceholderTable::PRIMITIVE_OBJECT_FIELD:
+        queuehead = _inlineTypeFieldQ;
+        break;
      default: Unimplemented();
    }
    return queuehead;
  }
  

*** 116,10 ***
--- 121,13 ---
         _superThreadQ = seenthread;
         break;
      case PlaceholderTable::DEFINE_CLASS:
         _defineThreadQ = seenthread;
         break;
+     case PlaceholderTable::PRIMITIVE_OBJECT_FIELD:
+        _inlineTypeFieldQ = seenthread;
+        break;
      default: Unimplemented();
    }
    return;
  }
  

*** 231,10 ***
--- 239,11 ---
  static const char* action_to_string(PlaceholderTable::classloadAction action) {
    switch (action) {
    case PlaceholderTable::LOAD_INSTANCE: return "LOAD_INSTANCE";
    case PlaceholderTable::LOAD_SUPER:    return "LOAD_SUPER";
    case PlaceholderTable::DEFINE_CLASS:  return "DEFINE_CLASS";
+   case PlaceholderTable::PRIMITIVE_OBJECT_FIELD: return "PRIMITIVE_OBJECT_FIELD";
   }
   return "";
  }
  
  inline void log(Symbol* name, PlaceholderEntry* entry, const char* function, PlaceholderTable::classloadAction action) {

*** 299,11 ***
    if (probe->superThreadQ() == nullptr) {
      probe->set_supername(nullptr);
    }
    // If no other threads using this entry, and this thread is not using this entry for other states
    if ((probe->superThreadQ() == nullptr) && (probe->loadInstanceThreadQ() == nullptr)
!       && (probe->defineThreadQ() == nullptr) && (probe->definer() == nullptr)) {
      remove_entry(name, loader_data);
    }
  }
  
  void PlaceholderKey::print_on(outputStream* st) const {
--- 308,12 ---
    if (probe->superThreadQ() == nullptr) {
      probe->set_supername(nullptr);
    }
    // If no other threads using this entry, and this thread is not using this entry for other states
    if ((probe->superThreadQ() == nullptr) && (probe->loadInstanceThreadQ() == nullptr)
!       && (probe->defineThreadQ() == nullptr) && (probe->definer() == nullptr)
+       && (probe->inlineTypeFieldQ() == nullptr)) {
      remove_entry(name, loader_data);
    }
  }
  
  void PlaceholderKey::print_on(outputStream* st) const {

*** 333,10 ***
--- 343,13 ---
    superThreadQ()->print_action_queue(st);
    st->cr();
    st->print("defineThreadQ threads:");
    defineThreadQ()->print_action_queue(st);
    st->cr();
+   st->print("inlineTypeFieldQ threads:");
+   inlineTypeFieldQ()->print_action_queue(st);
+   st->cr();
  }
  
  void PlaceholderTable::print_on(outputStream* st) {
    auto printer = [&] (PlaceholderKey& key, PlaceholderEntry& entry) {
        st->print("placeholder ");