From c576c1ee5ad94ce084a985061d88c66d8e3503ca Mon Sep 17 00:00:00 2001 From: Tomas Zezula Date: Thu, 29 Feb 2024 10:55:21 +0100 Subject: [PATCH] [GR-52302] NPE while diagnosing compilation failure when using compilation in isolate. (cherry picked from commit 5b487875747e9fa971f74892a12fb5cd2f811e4a) --- .../isolated/IsolatedTruffleCompilerEventForwarder.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java index db16ae8ae9a3..f7ec66154d2d 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java @@ -84,7 +84,7 @@ public void onFailure(TruffleCompilable compilable, String reason, boolean bailo @Override public void onCompilationRetry(TruffleCompilable compilable, TruffleCompilationTask task) { - onCompilationRetry0(IsolatedCompileContext.get().getClient(), contextHandle, IsolatedCompileClient.get().hand(task)); + onCompilationRetry0(IsolatedCompileContext.get().getClient(), contextHandle); } @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class, publishAs = CEntryPoint.Publish.NotPublished) @@ -117,8 +117,7 @@ private static void onFailure0(@SuppressWarnings("unused") ClientIsolateThread c } @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class, publishAs = CEntryPoint.Publish.NotPublished) - private static void onCompilationRetry0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle contextHandle, - @SuppressWarnings("unused") ClientHandle task) { + private static void onCompilationRetry0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle contextHandle) { IsolatedEventContext context = IsolatedCompileClient.get().unhand(contextHandle); context.listener.onCompilationRetry(context.compilable, context.task); }