Skip to content

Commit 993aae5

Browse files
committed
restored important libgraal invariant check
1 parent a5ae8d8 commit 993aae5

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotReplacementsImpl.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,13 @@ public <T> T getInjectedArgument(Class<T> capability) {
274274
return super.getInjectedArgument(capability);
275275
}
276276

277+
public ResolvedJavaMethod findSnippetMethod(ResolvedJavaMethod thisMethod) {
278+
if (snippetEncoder == null) {
279+
throw new GraalError("findSnippetMethod called before initialization of Replacements");
280+
}
281+
return snippetEncoder.findSnippetMethod(thisMethod);
282+
}
283+
277284
public static MetaAccessProvider noticeTypes(MetaAccessProvider metaAccess) {
278285
if (inImageBuildtimeCode()) {
279286
return SymbolicSnippetEncoder.noticeTypes(metaAccess);

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/AbstractForeignCallStub.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import jdk.graal.compiler.options.OptionValues;
5151
import jdk.graal.compiler.replacements.GraphKit;
5252
import jdk.graal.compiler.replacements.nodes.ReadRegisterNode;
53+
import jdk.graal.compiler.serviceprovider.GraalServices;
5354
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
5455
import jdk.vm.ci.hotspot.HotSpotSignature;
5556
import jdk.vm.ci.meta.JavaMethod;
@@ -275,6 +276,10 @@ private ResolvedJavaMethod getGraphMethod() {
275276
if (thisMethod == null) {
276277
throw new InternalError("Can't find " + getClass().getSimpleName() + ".getGraph");
277278
}
279+
if (GraalServices.isBuildingLibgraal()) {
280+
HotSpotReplacementsImpl replacements = (HotSpotReplacementsImpl) providers.getReplacements();
281+
replacements.findSnippetMethod(thisMethod);
282+
}
278283
return thisMethod;
279284
}
280285

0 commit comments

Comments
 (0)