src/hotspot/share/jvmci/jvmciCodeInstaller.cpp

@@ -173,11 +173,11 @@
   }
   return map;
 }
 
 AOTOopRecorder::AOTOopRecorder(Arena* arena, bool deduplicate) : OopRecorder(arena, deduplicate) {
-  _meta_refs = new GrowableArray<jobject>();
+  _meta_refs = new GrowableArray<jobject>(64);
 }
 
 int AOTOopRecorder::nr_meta_refs() const {
   return _meta_refs->length();
 }

@@ -1182,11 +1182,12 @@
       JVMCI_ERROR("debug info expected at call at %i", pc_offset);
     }
 
     TRACE_jvmci_3("method call");
     CodeInstaller::pd_relocate_JavaMethod(buffer, hotspot_method, pc_offset, CHECK);
-    if (_next_call_type == INVOKESTATIC || _next_call_type == INVOKESPECIAL) {
+    if ((_next_call_type == INVOKESTATIC || _next_call_type == INVOKESPECIAL)
+        && !_immutable_pic_compilation) {
       // Need a static call stub for transitions from compiled to interpreted.
       CompiledStaticCall::emit_to_interp_stub(buffer, _instructions->start() + pc_offset);
     }
 #if INCLUDE_AOT
     // Trampoline to far aot code.