--- old/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp	2018-03-23 16:35:58.182747174 +0000
+++ new/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp	2018-03-23 16:35:57.582806495 +0000
@@ -175,7 +175,7 @@
 }
 
 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 {
@@ -1184,7 +1184,8 @@
 
     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);
     }