src/hotspot/share/code/aotCodeCache.cpp

*** 203,18 ***
      disable_caching();
      return; // AOTCache must be specified to dump and use AOT code
    }
  
    if (VerifyOops) {
!     // Disable AOT stubs caching when VerifyOops flag is on.
      // Verify oops code generated a lot of C strings which overflow
      // AOT C string table (which has fixed size).
      // AOT C string table will be reworked later to handle such cases.
!     //
-     // Note: AOT adapters are not affected - they don't have oop operations.
-     log_info(aot, codecache, init)("AOT Stubs Caching is not supported with VerifyOops.");
      FLAG_SET_ERGO(AOTStubCaching, false);
    }
  
    bool is_dumping = false;
    bool is_using   = false;
    if (CDSConfig::is_dumping_final_static_archive() && CDSConfig::is_dumping_aot_linked_classes()) {
--- 203,20 ---
      disable_caching();
      return; // AOTCache must be specified to dump and use AOT code
    }
  
    if (VerifyOops) {
!     // Disable AOT stub caching when VerifyOops flag is on.
      // Verify oops code generated a lot of C strings which overflow
      // AOT C string table (which has fixed size).
      // AOT C string table will be reworked later to handle such cases.
!     log_info(aot, codecache, init)("AOT Stub Caching is not supported with VerifyOops.");
      FLAG_SET_ERGO(AOTStubCaching, false);
+     if (InlineTypePassFieldsAsArgs) {
+       log_info(aot, codecache, init)("AOT Adapter Caching is not supported with VerifyOops + InlineTypePassFieldsAsArgs.");
+       FLAG_SET_ERGO(AOTAdapterCaching, false);
+     }
    }
  
    bool is_dumping = false;
    bool is_using   = false;
    if (CDSConfig::is_dumping_final_static_archive() && CDSConfig::is_dumping_aot_linked_classes()) {

*** 1927,10 ***
--- 1929,11 ---
    // Record addresses of VM runtime methods
    ADD_EXTERNAL_ADDRESS(SharedRuntime::fixup_callers_callsite);
    ADD_EXTERNAL_ADDRESS(SharedRuntime::handle_wrong_method);
    ADD_EXTERNAL_ADDRESS(SharedRuntime::handle_wrong_method_abstract);
    ADD_EXTERNAL_ADDRESS(SharedRuntime::handle_wrong_method_ic_miss);
+   ADD_EXTERNAL_ADDRESS(SharedRuntime::allocate_inline_types);
  #if defined(AARCH64) && !defined(ZERO)
    ADD_EXTERNAL_ADDRESS(JavaThread::aarch64_get_thread_helper);
    ADD_EXTERNAL_ADDRESS(BarrierSetAssembler::patching_epoch_addr());
  #endif
  

*** 2045,10 ***
--- 2048,18 ---
      ADD_EXTERNAL_ADDRESS(Runtime1::move_klass_patching);
      ADD_EXTERNAL_ADDRESS(Runtime1::move_mirror_patching);
      ADD_EXTERNAL_ADDRESS(Runtime1::move_appendix_patching);
      ADD_EXTERNAL_ADDRESS(Runtime1::predicate_failed_trap);
      ADD_EXTERNAL_ADDRESS(Runtime1::unimplemented_entry);
+     ADD_EXTERNAL_ADDRESS(Runtime1::new_null_free_array);
+     ADD_EXTERNAL_ADDRESS(Runtime1::load_flat_array);
+     ADD_EXTERNAL_ADDRESS(Runtime1::store_flat_array);
+     ADD_EXTERNAL_ADDRESS(Runtime1::substitutability_check);
+     ADD_EXTERNAL_ADDRESS(Runtime1::buffer_inline_args);
+     ADD_EXTERNAL_ADDRESS(Runtime1::buffer_inline_args_no_receiver);
+     ADD_EXTERNAL_ADDRESS(Runtime1::throw_identity_exception);
+     ADD_EXTERNAL_ADDRESS(Runtime1::throw_illegal_monitor_state_exception);
      // already added
      // ADD_EXTERNAL_ADDRESS(Thread::current);
      ADD_EXTERNAL_ADDRESS(CompressedKlassPointers::base_addr());
    }
  #endif

*** 2070,10 ***
--- 2081,12 ---
      ADD_EXTERNAL_ADDRESS(OptoRuntime::monitor_notify_C);
      ADD_EXTERNAL_ADDRESS(OptoRuntime::monitor_notifyAll_C);
      ADD_EXTERNAL_ADDRESS(OptoRuntime::rethrow_C);
      ADD_EXTERNAL_ADDRESS(OptoRuntime::slow_arraycopy_C);
      ADD_EXTERNAL_ADDRESS(OptoRuntime::register_finalizer_C);
+     ADD_EXTERNAL_ADDRESS(OptoRuntime::load_unknown_inline_C);
+     ADD_EXTERNAL_ADDRESS(OptoRuntime::store_unknown_inline_C);
      ADD_EXTERNAL_ADDRESS(OptoRuntime::vthread_end_first_transition_C);
      ADD_EXTERNAL_ADDRESS(OptoRuntime::vthread_start_final_transition_C);
      ADD_EXTERNAL_ADDRESS(OptoRuntime::vthread_start_transition_C);
      ADD_EXTERNAL_ADDRESS(OptoRuntime::vthread_end_transition_C);
      // already added for