Use separate constants for native invoker code size

Author: JornVernee

src/hotspot/cpu/aarch64/universalNativeInvoker_aarch64.cpp

@@ -34,6 +34,8 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaCalls.hpp"
 
+static constexpr CodeBuffer::csize_t native_invoker_size = 1024;
+
 static void generate_invoke_native(MacroAssembler* _masm,
                                    const ABIDescriptor& abi,
                                    const BufferLayout& layout) {
@@ -152,7 +154,7 @@ jlong ProgrammableInvoker::generate_adapter(JNIEnv* env, jobject jabi, jobject j
   const ABIDescriptor abi = parseABIDescriptor(env, jabi);
   const BufferLayout layout = parseBufferLayout(env, jlayout);
 
-  BufferBlob* _invoke_native_blob = BufferBlob::create("invoke_native_blob", MethodHandles::adapter_code_size);
+  BufferBlob* _invoke_native_blob = BufferBlob::create("invoke_native_blob", native_invoker_size);
 
   CodeBuffer code2(_invoke_native_blob);
   ProgrammableInvokerGenerator g2(&code2, &abi, &layout);

src/hotspot/cpu/aarch64/universalUpcallHandler_aarch64.cpp

@@ -38,6 +38,8 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/jniHandles.inline.hpp"
 
+static constexpr CodeBuffer::csize_t upcall_stub_size = 1024;
+
 extern struct JavaVM_ main_vm;
 
 static struct {
@@ -121,7 +123,7 @@ static void upcall_helper(jobject rec, address buff) {
 static address generate_upcall_stub(jobject rec, const ABIDescriptor& abi,
                                     const BufferLayout& layout) {
   ResourceMark rm;
-  CodeBuffer buffer("upcall_stub", 1024, 1024);
+  CodeBuffer buffer("upcall_stub", 1024, upcall_stub_size);
 
   MacroAssembler* _masm = new MacroAssembler(&buffer);
 

src/hotspot/cpu/x86/universalNativeInvoker_x86.cpp

@@ -38,6 +38,8 @@
 #include "runtime/jniHandles.inline.hpp"
 #include "prims/methodHandles.hpp"
 
+static constexpr CodeBuffer::csize_t native_invoker_size = 1024;
+
 void generate_invoke_native(MacroAssembler* _masm, const ABIDescriptor& abi, const BufferLayout& layout) {
 
 #if 0
@@ -190,7 +192,7 @@ jlong ProgrammableInvoker::generate_adapter(JNIEnv* env, jobject jabi, jobject j
     const ABIDescriptor abi = parseABIDescriptor(env, jabi);
     const BufferLayout layout = parseBufferLayout(env, jlayout);
 
-    BufferBlob* _invoke_native_blob = BufferBlob::create("invoke_native_blob", MethodHandles::adapter_code_size);
+    BufferBlob* _invoke_native_blob = BufferBlob::create("invoke_native_blob", native_invoker_size);
 
     CodeBuffer code2(_invoke_native_blob);
     ProgrammableInvokerGenerator g2(&code2, &abi, &layout);

src/hotspot/cpu/x86/universalUpcallHandler_x86.cpp

@@ -39,6 +39,8 @@
 #include "runtime/jniHandles.inline.hpp"
 #include "classfile/symbolTable.hpp"
 
+static constexpr CodeBuffer::csize_t upcall_stub_size = 1024;
+
 extern struct JavaVM_ main_vm;
 
 static struct {
@@ -119,7 +121,7 @@ static void upcall_helper(jobject rec, address buff) {
 
 static address generate_upcall_stub(jobject rec, const ABIDescriptor& abi, const BufferLayout& layout) {
   ResourceMark rm;
-  CodeBuffer buffer("upcall_stub", 1024, 1024);
+  CodeBuffer buffer("upcall_stub", 1024, upcall_stub_size);
 
   MacroAssembler* _masm = new MacroAssembler(&buffer);
   int stack_alignment_C = 16; // bytes