--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java Tue Sep 24 08:54:08 2019 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java Tue Sep 24 12:47:15 2019 -0400
@@ -148,7 +148,8 @@
replacements = createReplacements(target, p, snippetReflection, bytecodeProvider);
}
try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
- plugins = createGraphBuilderPlugins(compilerConfiguration, config, target, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes, options);
+ plugins = createGraphBuilderPlugins(graalRuntime, compilerConfiguration, config, target, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes,
+ options);
replacements.setGraphBuilderPlugins(plugins);
}
try (InitTimer rt = timer("create Suites provider")) {
@@ -163,10 +164,28 @@
}
}
- protected Plugins createGraphBuilderPlugins(CompilerConfiguration compilerConfiguration, GraalHotSpotVMConfig config, TargetDescription target,
- HotSpotConstantReflectionProvider constantReflection, HotSpotHostForeignCallsProvider foreignCalls, HotSpotMetaAccessProvider metaAccess,
- HotSpotSnippetReflectionProvider snippetReflection, HotSpotReplacementsImpl replacements, HotSpotWordTypes wordTypes, OptionValues options) {
- Plugins plugins = HotSpotGraphBuilderPlugins.create(compilerConfiguration, config, wordTypes, metaAccess, constantReflection, snippetReflection, foreignCalls, replacements, options);
+ protected Plugins createGraphBuilderPlugins(HotSpotGraalRuntimeProvider graalRuntime,
+ CompilerConfiguration compilerConfiguration,
+ GraalHotSpotVMConfig config,
+ TargetDescription target,
+ HotSpotConstantReflectionProvider constantReflection,
+ HotSpotHostForeignCallsProvider foreignCalls,
+ HotSpotMetaAccessProvider metaAccess,
+ HotSpotSnippetReflectionProvider snippetReflection,
+ HotSpotReplacementsImpl replacements,
+ HotSpotWordTypes wordTypes,
+ OptionValues options) {
+ Plugins plugins = HotSpotGraphBuilderPlugins.create(
+ graalRuntime,
+ compilerConfiguration,
+ config,
+ wordTypes,
+ metaAccess,
+ constantReflection,
+ snippetReflection,
+ foreignCalls,
+ replacements,
+ options);
AMD64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), (AMD64) target.arch, false, JavaVersionUtil.JAVA_SPEC >= 9, config.useFMAIntrinsics);
return plugins;
}