Skip to content

Commit a6f3804

Browse files
committed
[GR-42578] [GR-42972] [GR-43567] Make Native Image more extensible
PullRequest: graal/13457
2 parents f09208f + 1406f5e commit a6f3804

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Diff for: substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaStackWalker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ private static boolean callUnknownFrame(JavaStackWalk walk, ParameterizedStackFr
346346

347347
@Uninterruptible(reason = "Wraps the now safe call to the possibly interruptible visitor.", callerMustBe = true, calleeMustBe = false)
348348
@RestrictHeapAccess(reason = "Whitelisted because some StackFrameVisitor implementations can allocate.", access = RestrictHeapAccess.Access.UNRESTRICTED)
349-
static boolean callVisitor(JavaStackWalk walk, CodeInfo info, ParameterizedStackFrameVisitor visitor, Object data) {
349+
public static boolean callVisitor(JavaStackWalk walk, CodeInfo info, ParameterizedStackFrameVisitor visitor, Object data) {
350350
return visitor.visitFrame(walk.getSP(), walk.getPossiblyStaleIP(), info, Deoptimizer.checkDeoptimized(walk.getSP()), data);
351351
}
352352
}

Diff for: substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/DeoptimizationFeature.java

+3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
import org.graalvm.compiler.options.OptionValues;
3333
import org.graalvm.compiler.phases.util.Providers;
3434
import org.graalvm.nativeimage.ImageSingletons;
35+
import org.graalvm.nativeimage.Platforms;
3536
import org.graalvm.nativeimage.hosted.Feature;
37+
import org.graalvm.nativeimage.impl.InternalPlatform;
3638

3739
import com.oracle.graal.pointsto.meta.AnalysisMethod;
3840
import com.oracle.svm.core.deopt.DeoptimizationCanaryFeature;
@@ -57,6 +59,7 @@
5759
/**
5860
* Feature to allow deoptimization in a generated native image.
5961
*/
62+
@Platforms(InternalPlatform.NATIVE_ONLY.class)
6063
public final class DeoptimizationFeature implements InternalFeature {
6164

6265
private static final Method deoptStubMethod;

0 commit comments

Comments
 (0)