[GR-58919] Fix Truffle host inlining may peek into native calls and f…

…ail. PullRequest: graal/19020
oracle · Oct 21, 2024 · d5fd699 · d5fd699
2 parents 191353e + 6af3d09
commit d5fd699
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/...ler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HostInliningTest.java b/...ler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HostInliningTest.java
@@ -147,6 +147,7 @@ public void test() {
         runTest("testThrow");
         runTest("testRangeCheck");
         runTest("testImplicitCast");
+        runTest("testNativeCall");
     }
 
     @SuppressWarnings("try")
@@ -963,6 +964,22 @@ static int testImplicitCast(int value) {
         return (int) MyTypesGen.asImplicitDouble(0, value);
     }
 
+    @BytecodeInterpreterSwitch
+    @ExpectNotInlined(name = {"nativeCall"}, count = {1})
+    static int testNativeCall(int value) {
+        if (value == 42) {
+            // we do not call nativeCall directly to trigger the peek deopt logic in host inlining
+            peekNativeCall();
+        }
+        return 42;
+    }
+
+    static void peekNativeCall() {
+        nativeCall();
+    }
+
+    static native void nativeCall();
+
     static int testIndirectIntrinsicsImpl(A a) {
         return a.intrinsic(); // inlined and intrinsic
     }

diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/HostInliningPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/HostInliningPhase.java
@@ -603,6 +603,10 @@ private BackPropagation peekPropagatesDeoptOrUnwind(InliningPhaseContext context
             return BackPropagation.NOTHING;
         }
 
+        if (!method.hasBytecodes() || method.isNative()) {
+            return BackPropagation.NOTHING;
+        }
+
         StructuredGraph graph = lookupGraph(context, callerInvoke, method);
         FixedNode current = graph.start();
         while (current instanceof FixedWithNextNode) {