Changed signature of createJNITrampoline to use computed index instea…

…d of nonVirtual boolean. Removed comments about broken feature in sub methods
graalvm · Feb 21, 2022 · 1988cb7 · 1988cb7
1 parent 71723e0
commit 1988cb7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/...svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java b/...svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java
@@ -1053,16 +1053,14 @@ public RegisterAllocationConfig newRegisterAllocationConfig(RegisterConfig regis
 
     @Override
     public CompilationResult createJNITrampolineMethod(ResolvedJavaMethod method, CompilationIdentifier identifier,
-                                                       int threadIsolateOffset, boolean nonVirtual, int methodObjEntryPointOffset,
+                                                       int threadIdIndex, int threadIsolateOffset, int methodIdIndex, int methodObjEntryPointOffset,
                                                        CallingConvention callingConvention) {
 
         RegisterValue threadArg = null;
         if (SubstrateOptions.SpawnIsolates.getValue()) {
             threadArg = (RegisterValue) callingConvention.getArgument(0); // JNIEnv
-            // NOTE: GR-17030: JNI is currently broken in the single-threaded, multi-isolate
-            // case. Fixing this also requires changes to how trampolines are generated.
         }
-        RegisterValue methodIdArg = (RegisterValue) callingConvention.getArgument(nonVirtual ? 3 : 2);
+        RegisterValue methodIdArg = (RegisterValue) callingConvention.getArgument(methodIdIndex);
 
         CompilationResult result = new CompilationResult(identifier);
         AArch64MacroAssembler asm = new AArch64MacroAssembler(getTarget());

diff --git a/...racle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java b/...racle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
@@ -1155,15 +1155,13 @@ public void emitCode(CompilationResultBuilder crb, LIR lir, ResolvedJavaMethod i
 
     @Override
     public CompilationResult createJNITrampolineMethod(ResolvedJavaMethod method, CompilationIdentifier identifier,
-                    int threadIsolateOffset, boolean nonVirtual, int methodObjEntryPointOffset, CallingConvention callingConvention) {
+                                                       int threadIdIndex, int threadIsolateOffset, int methodIdIndex, int methodObjEntryPointOffset, CallingConvention callingConvention) {
 
         RegisterValue threadArg = null;
         if (SubstrateOptions.SpawnIsolates.getValue()) {
             threadArg = (RegisterValue) callingConvention.getArgument(0); // JNIEnv
-            // NOTE: GR-17030: JNI is currently broken in the single-threaded, multi-isolate
-            // case. Fixing this also requires changes to how trampolines are generated.
         }
-        RegisterValue methodIdArg = (RegisterValue) callingConvention.getArgument(nonVirtual ? 3 : 2);
+        RegisterValue methodIdArg = (RegisterValue) callingConvention.getArgument(methodIdIndex);
 
         CompilationResult result = new CompilationResult(identifier);
         AMD64Assembler asm = new AMD64Assembler(getTarget());

diff --git a/.../src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java b/.../src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java
@@ -1016,7 +1016,7 @@ LLVMValueRef createJNIWrapper(LLVMValueRef callee, boolean nativeABI, int numArg
         return transitionWrapper;
     }
 
-    void createJNITrampoline(int threadIsolateOffset, int methodIdArg, int methodObjEntryPointOffset) {
+    void createJNITrampoline(int threadIdIndex, int threadIsolateOffset, int methodIdIndex, int methodObjEntryPointOffset) {
         builder.setFunctionAttribute(Attribute.Naked);
 
         LLVMBasicBlockRef block = builder.appendBasicBlock("main");
@@ -1028,14 +1028,14 @@ void createJNITrampoline(int threadIsolateOffset, int methodIdArg, int methodObj
 
         LLVMValueRef jumpAddressAddress;
         if (SubstrateOptions.SpawnIsolates.getValue()) {
-            LLVMValueRef thread = builder.getFunctionParam(0);
+            LLVMValueRef thread = builder.getFunctionParam(threadIdIndex);
             LLVMValueRef heapBaseAddress = builder.buildGEP(builder.buildIntToPtr(thread, builder.rawPointerType()), builder.constantInt(threadIsolateOffset));
             LLVMValueRef heapBase = builder.buildLoad(heapBaseAddress, builder.rawPointerType());
-            LLVMValueRef methodId = builder.getFunctionParam(methodIdArg);
+            LLVMValueRef methodId = builder.getFunctionParam(methodIdIndex);
             LLVMValueRef methodBase = builder.buildGEP(builder.buildIntToPtr(heapBase, builder.rawPointerType()), builder.buildPtrToInt(methodId));
             jumpAddressAddress = builder.buildGEP(methodBase, builder.constantInt(methodObjEntryPointOffset));
         } else {
-            LLVMValueRef methodBase = builder.getFunctionParam(methodIdArg);
+            LLVMValueRef methodBase = builder.getFunctionParam(methodIdIndex);
             jumpAddressAddress = builder.buildGEP(builder.buildIntToPtr(methodBase, builder.rawPointerType()), builder.constantInt(methodObjEntryPointOffset));
         }
         LLVMValueRef jumpAddress = builder.buildLoad(jumpAddressAddress, builder.rawPointerType());

diff --git a/...m.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/SubstrateLLVMBackend.java b/...m.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/SubstrateLLVMBackend.java
@@ -76,14 +76,14 @@ public BasePhase<CoreProviders> newAddressLoweringPhase(CodeCacheProvider codeCa
     }
 
     @Override
-    public CompilationResult createJNITrampolineMethod(ResolvedJavaMethod method, CompilationIdentifier identifier, int threadIsolateOffset,
-                                                       boolean nonVirtual, int methodObjEntryPointOffset, CallingConvention callingConvention) {
+    public CompilationResult createJNITrampolineMethod(ResolvedJavaMethod method, CompilationIdentifier identifier, int threadIdIndex, int threadIsolateOffset,
+                                                       int methodIdIndex, int methodObjEntryPointOffset, CallingConvention callingConvention) {
 
         CompilationResult result = new CompilationResult(identifier);
         result.setMethods(method, Collections.emptySet());
 
         LLVMGenerator generator = new LLVMGenerator(getProviders(), result, null, method, 0);
-        generator.createJNITrampoline(threadIsolateOffset, nonVirtual ? 3 : 2, methodObjEntryPointOffset);
+        generator.createJNITrampoline(threadIdIndex, threadIsolateOffset, methodIdIndex, methodObjEntryPointOffset);
         byte[] bitcode = generator.getBitcode();
         result.setTargetCode(bitcode, bitcode.length);
 

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateBackend.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateBackend.java
@@ -151,8 +151,8 @@ public static int getNewThreadStatus(CallTargetNode callTarget) {
 
     public abstract BasePhase<CoreProviders> newAddressLoweringPhase(CodeCacheProvider codeCache);
 
-    public abstract CompilationResult createJNITrampolineMethod(ResolvedJavaMethod method, CompilationIdentifier identifier, int threadIsolateOffset,
-                                                                boolean nonVirtual, int methodObjEntryPointOffset, CallingConvention callingConvention);
+    public abstract CompilationResult createJNITrampolineMethod(ResolvedJavaMethod method, CompilationIdentifier identifier, int threadIdIndex, int threadIsolateOffset,
+                                                                int methodIdIndex, int methodObjEntryPointOffset, CallingConvention callingConvention);
 
     /**
      * Returns whether the backend can fold the stack overflow check into the method prologue for

diff --git a/...tratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/hosted/JNICallTrampolineMethod.java b/...tratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/hosted/JNICallTrampolineMethod.java
@@ -130,7 +130,7 @@ public CompileFunction createCustomCompileFunction() {
             CallingConvention callingConvention = backend.getCodeCache().getRegisterConfig().getCallingConvention(
                     SubstrateCallingConventionKind.Native.toType(true), returnType, parameters.toArray(new JavaType[0]), backend);
 
-            return backend.createJNITrampolineMethod(method, identifier, threadIsolateOffset, nonVirtual, getFieldOffset(providers), callingConvention);
+            return backend.createJNITrampolineMethod(method, identifier, 0, threadIsolateOffset, nonVirtual ? 3 : 2, getFieldOffset(providers), callingConvention);
         };
     }