Skip to content

Commit d5a9b91

Browse files
authored
Merge pull request #247 from bulasevich/undo_TruffleFromLibGraal_OnCompilationSuccess
Drop extra TruffleFromLibGraal.OnCompilationSuccess entrypoint added by GR-54673 backport
2 parents 2070dfb + 6ec2f1b commit d5a9b91

File tree

3 files changed

+0
-17
lines changed

3 files changed

+0
-17
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
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;
4140
import static com.oracle.svm.graal.hotspot.libgraal.truffle.HSTruffleCompilableGen.callPrepareForCompilation;
4241
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.AsJavaConstant;
4342
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.CancelCompilation;
@@ -51,7 +50,6 @@
5150
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.IsSameOrSplit;
5251
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.IsTrivial;
5352
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnCompilationFailed;
54-
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnCompilationSuccess;
5553
import static org.graalvm.jniutils.JNIMethodScope.env;
5654
import static org.graalvm.jniutils.JNIUtil.createString;
5755

@@ -175,13 +173,6 @@ public void onCompilationFailed(Supplier<String> serializedException, boolean si
175173
}
176174
}
177175

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-
185176
@TruffleFromLibGraal(GetCompilableName)
186177
@Override
187178
public String getName() {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ 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,
166164
@Signature({void.class, Object.class, Object.class, Object.class})
167165
OnCompilationRetry,
168166
@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: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
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;
7877
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnCompilationRetry;
7978
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnFailure;
8079
import static com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id.OnGraalTierFinished;
@@ -341,11 +340,6 @@ static void onCompilationFailed(Object compilable, Supplier<String> serializedEx
341340
((TruffleCompilable) compilable).onCompilationFailed(serializedException, silent, bailout, permanentBailout, graphTooBig);
342341
}
343342

344-
@TruffleFromLibGraal(OnCompilationSuccess)
345-
static void onCompilationSuccess(Object compilable, int compilationTier, boolean lastTier) {
346-
((TruffleCompilable) compilable).onCompilationSuccess(compilationTier, lastTier);
347-
}
348-
349343
@TruffleFromLibGraal(OnSuccess)
350344
static void onSuccess(Object listener, Object compilable, Object plan, long graphInfoHandle, long compilationResultInfoHandle, int tier) {
351345
try (LibGraalGraphInfo graphInfo = new LibGraalGraphInfo(graphInfoHandle);

0 commit comments

Comments
 (0)