Skip to content

[Backport] [Oracle GraalVM] [GR-69291] Backport to 23.1: Do not inline hasNextTier in parsing. #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bulasevich wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −0
Open

[Backport] [Oracle GraalVM] [GR-69291] Backport to 23.1: Do not inline hasNextTier in parsing. #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ...jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HostInliningTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,23 @@ public void test() {
runTest("testThrow");
runTest("testRangeCheck");
runTest("testImplicitCast");
runTest("testBCDSLPrologIfVersion");
}

/*
* Test for GR-69170
*/
@SuppressWarnings("unused")
@BytecodeInterpreterSwitch
static Object testBCDSLPrologIfVersion(int value) {
Object o = null;
if (!CompilerDirectives.inInterpreter() && CompilerDirectives.hasNextTier()) {
GraalDirectives.deoptimize();
o = new Object();
}
// must be inlined
trivialMethod();
return o;
}

@SuppressWarnings("try")
Expand Down
1 change: 1 addition & 0 deletions ...nternal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/HostInliningPhase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,6 +1342,7 @@ public static boolean shouldDenyTrivialInlining(TruffleHostEnvironment env, Reso
info.isTruffleBoundary() ||
types.isInInterpreter(callee) ||
types.isInInterpreterFastPath(callee) ||
types.isHasNextTier(callee) ||
types.isTransferToInterpreterMethod(callee));
}

Expand Down
5 changes: 5 additions & 0 deletions ...nal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/TruffleKnownHostTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public final class TruffleKnownHostTypes extends AbstractKnownTruffleTypes {
public final ResolvedJavaMethod CompilerDirectives_transferToInterpreter = findMethod(CompilerDirectives, "transferToInterpreter");
public final ResolvedJavaMethod CompilerDirectives_transferToInterpreterAndInvalidate = findMethod(CompilerDirectives, "transferToInterpreterAndInvalidate");
public final ResolvedJavaMethod CompilerDirectives_inInterpreter = findMethod(CompilerDirectives, "inInterpreter");
public final ResolvedJavaMethod CompilerDirectives_hasNextTier = findMethod(CompilerDirectives, "hasNextTier");

public final ResolvedJavaType HostCompilerDirectives = lookupTypeCached("com.oracle.truffle.api.HostCompilerDirectives");
public final ResolvedJavaMethod HostCompilerDirectives_inInterpreterFastPath = findMethod(HostCompilerDirectives, "inInterpreterFastPath");
Expand All @@ -75,6 +76,10 @@ public boolean isInInterpreterFastPath(ResolvedJavaMethod method) {
return method.equals(HostCompilerDirectives_inInterpreterFastPath);
}

public boolean isHasNextTier(ResolvedJavaMethod method) {
return method.equals(CompilerDirectives_hasNextTier);
}

/**
* Determines if {@code method} is a method is a transferToInterpreter method from
* CompilerDirectives.
Expand Down
Loading