Skip to content

Commit 158b65d

Browse files
committed
backport HSTruffleCompilable::onCompilationSuccess
1 parent f2fcdd9 commit 158b65d

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/HSTruffleCompilable.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import static com.oracle.svm.graal.hotspot.libgraal.truffle.HSTruffleCompilableGen.callIsSameOrSplit;
3838
import static com.oracle.svm.graal.hotspot.libgraal.truffle.HSTruffleCompilableGen.callIsTrivial;
3939
import static com.oracle.svm.graal.hotspot.libgraal.truffle.HSTruffleCompilableGen.callOnCompilationFailed;
40+
import static com.oracle.svm.graal.hotspot.libgraal.truffle.HSTruffleCompilableGen.callOnCompilationSuccess;
4041
import static com.oracle.svm.graal.hotspot.libgraal.truffle.HSTruffleCompilableGen.callPrepareForCompilation;
4142
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.AsJavaConstant;
4243
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.CancelCompilation;
@@ -50,6 +51,7 @@
5051
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.IsSameOrSplit;
5152
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.IsTrivial;
5253
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnCompilationFailed;
54+
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnCompilationSuccess;
5355
import static org.graalvm.jniutils.JNIMethodScope.env;
5456
import static org.graalvm.jniutils.JNIUtil.createString;
5557

@@ -173,6 +175,13 @@ public void onCompilationFailed(Supplier<String> serializedException, boolean si
173175
}
174176
}
175177

178+
@TruffleFromLibGraal(OnCompilationSuccess)
179+
@Override
180+
public void onCompilationSuccess(int compilationTier, boolean lastTier) {
181+
JNIEnv env = env();
182+
callOnCompilationSuccess(calls, env, getHandle(), compilationTier, lastTier);
183+
}
184+
176185
@TruffleFromLibGraal(GetCompilableName)
177186
@Override
178187
public String getName() {

truffle/src/com.oracle.truffle.compiler/src/com/oracle/truffle/compiler/hotspot/libgraal/TruffleFromLibGraal.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ enum Id implements FromLibGraalId {
161161
OnCodeInstallation,
162162
@Signature({void.class, Object.class, Supplier.class, boolean.class, boolean.class, boolean.class, boolean.class})
163163
OnCompilationFailed,
164+
@Signature({void.class, Object.class, int.class, boolean.class})
165+
OnCompilationSuccess,
164166
@Signature({void.class, Object.class, Object.class, Object.class})
165167
OnCompilationRetry,
166168
@Signature({void.class, Object.class, Object.class, String.class, boolean.class, boolean.class, int.class, long.class})

truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/hotspot/libgraal/TruffleFromLibGraalEntryPoints.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.Log;
7575
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnCodeInstallation;
7676
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnCompilationFailed;
77+
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnCompilationSuccess;
7778
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnCompilationRetry;
7879
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnFailure;
7980
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnGraalTierFinished;
@@ -340,6 +341,7 @@ static void onCompilationFailed(Object compilable, Supplier<String> serializedEx
340341
((TruffleCompilable) compilable).onCompilationFailed(serializedException, silent, bailout, permanentBailout, graphTooBig);
341342
}
342343

344+
@TruffleFromLibGraal(OnCompilationSuccess)
343345
static void onCompilationSuccess(Object compilable, int compilationTier, boolean lastTier) {
344346
((TruffleCompilable) compilable).onCompilationSuccess(compilationTier, lastTier);
345347
}

0 commit comments

Comments
 (0)