jdk-sandbox: comparison src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java

equal deleted inserted replaced

-:1a8d65e71a66
+:aec7bf35d6f5
 import java.lang.reflect.Array;
 import java.math.BigInteger;
 import java.util.zip.CRC32;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
 import org.graalvm.compiler.core.common.type.ObjectStamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.type.TypeReference;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.nodes.graphbuilderconf.NodeIntrinsicPluginFactory;
 import org.graalvm.compiler.nodes.memory.HeapAccess.BarrierType;
 import org.graalvm.compiler.nodes.memory.ReadNode;
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
+import org.graalvm.compiler.nodes.spi.Replacements;
 import org.graalvm.compiler.nodes.util.GraphUtil;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
 import org.graalvm.compiler.replacements.InlineDuringParsingPlugin;
 import org.graalvm.compiler.replacements.MethodHandlePlugin;
 import org.graalvm.compiler.word.WordOperationPlugin;
 import org.graalvm.compiler.word.WordTypes;
 import jdk.internal.vm.compiler.word.LocationIdentity;
 import jdk.vm.ci.code.CodeUtil;
+import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.hotspot.VMIntrinsicMethod;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
 *
 * @param constantReflection
 * @param snippetReflection
 * @param foreignCalls
 * @param options
+* @param target
 */
 public static Plugins create(HotSpotGraalRuntimeProvider graalRuntime,
 CompilerConfiguration compilerConfiguration,
 GraalHotSpotVMConfig config,
 HotSpotWordTypes wordTypes,
 MetaAccessProvider metaAccess,
 ConstantReflectionProvider constantReflection,
 SnippetReflectionProvider snippetReflection,
 ForeignCallsProvider foreignCalls,
 ReplacementsImpl replacements,
-OptionValues options) {
+OptionValues options, TargetDescription target) {
 InvocationPlugins invocationPlugins = new HotSpotInvocationPlugins(graalRuntime, config, compilerConfiguration);
 Plugins plugins = new Plugins(invocationPlugins);
-NodeIntrinsificationProvider nodeIntrinsificationProvider = new NodeIntrinsificationProvider(metaAccess, snippetReflection, foreignCalls, wordTypes);
+NodeIntrinsificationProvider nodeIntrinsificationProvider = new NodeIntrinsificationProvider(metaAccess, snippetReflection, foreignCalls, wordTypes, target);
 HotSpotWordOperationPlugin wordOperationPlugin = new HotSpotWordOperationPlugin(snippetReflection, wordTypes);
 HotSpotNodePlugin nodePlugin = new HotSpotNodePlugin(wordOperationPlugin, config, wordTypes);
 plugins.appendTypePlugin(nodePlugin);
 plugins.appendNodePlugin(nodePlugin);
 invocationPlugins.defer(new Runnable() {
 @Override
 public void run() {
-BytecodeProvider replacementBytecodeProvider = replacements.getDefaultReplacementBytecodeProvider();
+registerObjectPlugins(invocationPlugins, options, config, replacements);
-registerObjectPlugins(invocationPlugins, options, config, replacementBytecodeProvider);
+registerClassPlugins(plugins, config, replacements);
-registerClassPlugins(plugins, config, replacementBytecodeProvider);
 registerSystemPlugins(invocationPlugins, foreignCalls);
-registerThreadPlugins(invocationPlugins, metaAccess, wordTypes, config, replacementBytecodeProvider);
+registerThreadPlugins(invocationPlugins, metaAccess, wordTypes, config, replacements);
 if (!GeneratePIC.getValue(options)) {
 registerCallSitePlugins(invocationPlugins);
 }
-registerReflectionPlugins(invocationPlugins, replacementBytecodeProvider);
+registerReflectionPlugins(invocationPlugins, replacements);
-registerConstantPoolPlugins(invocationPlugins, wordTypes, config, replacementBytecodeProvider);
+registerConstantPoolPlugins(invocationPlugins, wordTypes, config, replacements);
-registerAESPlugins(invocationPlugins, config, replacementBytecodeProvider);
+registerAESPlugins(invocationPlugins, config, replacements);
-registerCRC32Plugins(invocationPlugins, config, replacementBytecodeProvider);
+registerCRC32Plugins(invocationPlugins, config, replacements);
-registerCRC32CPlugins(invocationPlugins, config, replacementBytecodeProvider);
+registerCRC32CPlugins(invocationPlugins, config, replacements);
-registerBigIntegerPlugins(invocationPlugins, config, replacementBytecodeProvider);
+registerBigIntegerPlugins(invocationPlugins, config, replacements);
-registerSHAPlugins(invocationPlugins, config, replacementBytecodeProvider);
+registerSHAPlugins(invocationPlugins, config, replacements);
 registerGHASHPlugins(invocationPlugins, config, metaAccess, foreignCalls);
-registerCounterModePlugins(invocationPlugins, config, replacementBytecodeProvider);
+registerCounterModePlugins(invocationPlugins, config, replacements);
 registerBase64Plugins(invocationPlugins, config, metaAccess, foreignCalls);
-registerUnsafePlugins(invocationPlugins, config, replacementBytecodeProvider);
+registerUnsafePlugins(invocationPlugins, config, replacements);
-StandardGraphBuilderPlugins.registerInvocationPlugins(metaAccess, snippetReflection, invocationPlugins, replacementBytecodeProvider, true, false);
+StandardGraphBuilderPlugins.registerInvocationPlugins(metaAccess, snippetReflection, invocationPlugins, replacements, true, false);
-registerArrayPlugins(invocationPlugins, replacementBytecodeProvider);
+registerArrayPlugins(invocationPlugins, replacements);
-registerStringPlugins(invocationPlugins, replacementBytecodeProvider);
+registerStringPlugins(invocationPlugins, replacements);
-registerArraysSupportPlugins(invocationPlugins, config, replacementBytecodeProvider);
+registerArraysSupportPlugins(invocationPlugins, config, replacements);
 for (NodeIntrinsicPluginFactory factory : GraalServices.load(NodeIntrinsicPluginFactory.class)) {
 factory.registerPlugins(invocationPlugins, nodeIntrinsificationProvider);
 }
 }
 });
 return plugins;
 }
-private static void registerObjectPlugins(InvocationPlugins plugins, OptionValues options, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+private static void registerObjectPlugins(InvocationPlugins plugins, OptionValues options, GraalHotSpotVMConfig config, Replacements replacements) {
-Registration r = new Registration(plugins, Object.class, bytecodeProvider);
+Registration r = new Registration(plugins, Object.class, replacements);
 if (!GeneratePIC.getValue(options)) {
 // FIXME: clone() requires speculation and requires a fix in here (to check that
 // b.getAssumptions() != null), and in ReplacementImpl.getSubstitution() where there is
 // an instantiation of IntrinsicGraphBuilder using a constructor that sets
 // AllowAssumptions to YES automatically. The former has to inherit the assumptions
 if (config.inlineNotifyAll()) {
 r.registerMethodSubstitution(ObjectSubstitutions.class, "notifyAll", Receiver.class);
 }
 }
-private static void registerClassPlugins(Plugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+private static void registerClassPlugins(Plugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
-Registration r = new Registration(plugins.getInvocationPlugins(), Class.class, bytecodeProvider);
+Registration r = new Registration(plugins.getInvocationPlugins(), Class.class, replacements);
 r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "getModifiers", Receiver.class);
 r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "isInterface", Receiver.class);
 r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "isArray", Receiver.class);
 r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "isPrimitive", Receiver.class);
 plugins.register(plugin, ConstantCallSite.class, "getTarget", Receiver.class);
 plugins.register(plugin, MutableCallSite.class, "getTarget", Receiver.class);
 plugins.register(plugin, VolatileCallSite.class, "getTarget", Receiver.class);
 }
-private static void registerReflectionPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
+private static void registerReflectionPlugins(InvocationPlugins plugins, Replacements replacements) {
-Registration r = new Registration(plugins, reflectionClass, bytecodeProvider);
+Registration r = new Registration(plugins, reflectionClass, replacements);
 r.register0("getCallerClass", new InvocationPlugin() {
 @Override
 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
 b.addPush(JavaKind.Object, new ReflectionGetCallerClassNode(b.getInvokeKind(), targetMethod, b.bci(), b.getInvokeReturnStamp(b.getAssumptions())));
 return true;
 }
 });
 r.registerMethodSubstitution(ReflectionSubstitutions.class, "getClassAccessFlags", Class.class);
 }
-private static void registerUnsafePlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider replacementBytecodeProvider) {
+private static void registerUnsafePlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
 Registration r;
 if (JavaVersionUtil.JAVA_SPEC <= 8) {
-r = new Registration(plugins, Unsafe.class, replacementBytecodeProvider);
+r = new Registration(plugins, Unsafe.class, replacements);
 } else {
-r = new Registration(plugins, "jdk.internal.misc.Unsafe", replacementBytecodeProvider);
+r = new Registration(plugins, "jdk.internal.misc.Unsafe", replacements);
 }
 String substituteMethodName = config.doingUnsafeAccessOffset != Integer.MAX_VALUE ? "copyMemoryGuarded" : "copyMemory";
 r.registerMethodSubstitution(HotSpotUnsafeSubstitutions.class, HotSpotUnsafeSubstitutions.copyMemoryName, substituteMethodName, Receiver.class, Object.class, long.class, Object.class,
 long.class, long.class);
 }
 ValueNode elementValue = WordOperationPlugin.readOp(b, elementKind, elementAddress, NamedLocationIdentity.getArrayLocation(elementKind), BarrierType.NONE, notCompressible);
 b.addPush(elementKind, elementValue);
 return true;
 }
-private static void registerConstantPoolPlugins(InvocationPlugins plugins, WordTypes wordTypes, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+private static void registerConstantPoolPlugins(InvocationPlugins plugins, WordTypes wordTypes, GraalHotSpotVMConfig config, Replacements replacements) {
-Registration r = new Registration(plugins, constantPoolClass, bytecodeProvider);
+Registration r = new Registration(plugins, constantPoolClass, replacements);
 r.register2("getSize0", Receiver.class, Object.class, new InvocationPlugin() {
 @Override
 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode constantPoolOop) {
 boolean notCompressible = false;
 return true;
 }
 });
 }
-private static void registerArrayPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
+private static void registerArrayPlugins(InvocationPlugins plugins, Replacements replacements) {
-Registration r = new Registration(plugins, Array.class, bytecodeProvider);
+Registration r = new Registration(plugins, Array.class, replacements);
 r.setAllowOverwrite(true);
 r.registerMethodSubstitution(HotSpotArraySubstitutions.class, "newInstance", Class.class, int.class);
 }
-private static void registerStringPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
+private static void registerStringPlugins(InvocationPlugins plugins, Replacements replacements) {
 if (JavaVersionUtil.JAVA_SPEC > 8) {
-final Registration utf16r = new Registration(plugins, "java.lang.StringUTF16", bytecodeProvider);
+final Registration utf16r = new Registration(plugins, "java.lang.StringUTF16", replacements);
 utf16r.registerMethodSubstitution(StringUTF16Substitutions.class, "toBytes", char[].class, int.class, int.class);
 utf16r.registerMethodSubstitution(StringUTF16Substitutions.class, "getChars", byte[].class, int.class, int.class, char[].class, int.class);
 }
 }
-private static void registerThreadPlugins(InvocationPlugins plugins, MetaAccessProvider metaAccess, WordTypes wordTypes, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+private static void registerThreadPlugins(InvocationPlugins plugins, MetaAccessProvider metaAccess, WordTypes wordTypes, GraalHotSpotVMConfig config, Replacements replacements) {
-Registration r = new Registration(plugins, Thread.class, bytecodeProvider);
+Registration r = new Registration(plugins, Thread.class, replacements);
 r.register0("currentThread", new InvocationPlugin() {
 @Override
 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
 CurrentJavaThreadNode thread = b.add(new CurrentJavaThreadNode(wordTypes.getWordKind()));
 ValueNode offset = b.add(ConstantNode.forLong(config.threadObjectOffset));
 });
 r.registerMethodSubstitution(ThreadSubstitutions.class, "isInterrupted", Receiver.class, boolean.class);
 }
-public static final String aesEncryptName;
-public static final String aesDecryptName;
 public static final String reflectionClass;
 public static final String constantPoolClass;
 static {
 if (JavaVersionUtil.JAVA_SPEC <= 8) {
-aesEncryptName = "encryptBlock";
-aesDecryptName = "decryptBlock";
 reflectionClass = "sun.reflect.Reflection";
 constantPoolClass = "sun.reflect.ConstantPool";
 } else {
-aesEncryptName = "implEncryptBlock";
-aesDecryptName = "implDecryptBlock";
 reflectionClass = "jdk.internal.reflect.Reflection";
 constantPoolClass = "jdk.internal.reflect.ConstantPool";
 }
 }
-public static boolean cbcUsesImplNames(GraalHotSpotVMConfig config) {
+public static String lookupIntrinsicName(GraalHotSpotVMConfig config, String className, String name1, String name2) {
+boolean foundName1 = false;
+boolean foundName2 = false;
+String name = name1;
 for (VMIntrinsicMethod intrinsic : config.getStore().getIntrinsics()) {
-if ("com/sun/crypto/provider/CipherBlockChaining".equals(intrinsic.declaringClass)) {
+if (className.equals(intrinsic.declaringClass)) {
-if ("encrypt".equals(intrinsic.name)) {
+if (name1.equals(intrinsic.name)) {
-return false;
+foundName1 = true;
-} else if ("implEncrypt".equals(intrinsic.name)) {
+} else if (name2.equals(intrinsic.name)) {
+foundName2 = true;
+name = name2;
+}
+}
+}
+if (foundName1 != foundName2) {
+return name;
+}
+throw GraalError.shouldNotReachHere();
+}
+public static boolean isIntrinsicName(GraalHotSpotVMConfig config, String className, String name) {
+for (VMIntrinsicMethod intrinsic : config.getStore().getIntrinsics()) {
+if (className.equals(intrinsic.declaringClass)) {
+if (name.equals(intrinsic.name)) {
 return true;
 }
 }
 }
-throw GraalError.shouldNotReachHere();
+return false;
 }
-private static void registerAESPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+private static void registerAESPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
 if (config.useAESIntrinsics) {
 assert config.aescryptEncryptBlockStub != 0L;
 assert config.aescryptDecryptBlockStub != 0L;
 assert config.cipherBlockChainingEncryptAESCryptStub != 0L;
 assert config.cipherBlockChainingDecryptAESCryptStub != 0L;
 String arch = config.osArch;
 String decryptSuffix = arch.equals("sparc") ? "WithOriginalKey" : "";
-Registration r = new Registration(plugins, "com.sun.crypto.provider.CipherBlockChaining", bytecodeProvider);
+String cbcEncryptName = lookupIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implEncrypt", "encrypt");
-boolean implNames = cbcUsesImplNames(config);
+String cbcDecryptName = lookupIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implDecrypt", "decrypt");
-String cbcEncryptName = implNames ? "implEncrypt" : "encrypt";
+Registration r = new Registration(plugins, "com.sun.crypto.provider.CipherBlockChaining", replacements);
-String cbcDecryptName = implNames ? "implDecrypt" : "decrypt";
 r.registerMethodSubstitution(CipherBlockChainingSubstitutions.class, cbcEncryptName, Receiver.class, byte[].class, int.class, int.class, byte[].class, int.class);
 r.registerMethodSubstitution(CipherBlockChainingSubstitutions.class, cbcDecryptName, cbcDecryptName + decryptSuffix, Receiver.class, byte[].class, int.class, int.class, byte[].class,
 int.class);
-r = new Registration(plugins, "com.sun.crypto.provider.AESCrypt", bytecodeProvider);
+String aesEncryptName = lookupIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implEncryptBlock", "encryptBlock");
+String aesDecryptName = lookupIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implDecryptBlock", "decryptBlock");
+r = new Registration(plugins, "com.sun.crypto.provider.AESCrypt", replacements);
 r.registerMethodSubstitution(AESCryptSubstitutions.class, aesEncryptName, Receiver.class, byte[].class, int.class, byte[].class, int.class);
 r.registerMethodSubstitution(AESCryptSubstitutions.class, aesDecryptName, aesDecryptName + decryptSuffix, Receiver.class, byte[].class, int.class, byte[].class, int.class);
 }
 }
-private static void registerBigIntegerPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+private static void registerBigIntegerPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
-Registration r = new Registration(plugins, BigInteger.class, bytecodeProvider);
+Registration r = new Registration(plugins, BigInteger.class, replacements);
-if (config.useMultiplyToLenIntrinsic()) {
+assert !config.useMultiplyToLenIntrinsic() || config.multiplyToLen != 0L;
-assert config.multiplyToLen != 0L;
+if (JavaVersionUtil.JAVA_SPEC <= 8) {
-if (JavaVersionUtil.JAVA_SPEC <= 8) {
+r.registerConditionalMethodSubstitution(config.useMultiplyToLenIntrinsic(), BigIntegerSubstitutions.class, "multiplyToLen", "multiplyToLenStatic", int[].class, int.class, int[].class,
-r.registerMethodSubstitution(BigIntegerSubstitutions.class, "multiplyToLen", "multiplyToLenStatic", int[].class, int.class, int[].class, int.class,
+int.class, int[].class);
-int[].class);
+} else {
-} else {
+r.registerConditionalMethodSubstitution(config.useMultiplyToLenIntrinsic(), BigIntegerSubstitutions.class, "implMultiplyToLen", "multiplyToLenStatic", int[].class, int.class, int[].class,
-r.registerMethodSubstitution(BigIntegerSubstitutions.class, "implMultiplyToLen", "multiplyToLenStatic", int[].class, int.class, int[].class, int.class,
+int.class, int[].class);
-int[].class);
+}
-}
+r.registerConditionalMethodSubstitution(config.useMulAddIntrinsic(), BigIntegerSubstitutions.class, "implMulAdd", int[].class, int[].class, int.class, int.class, int.class);
-}
+r.registerConditionalMethodSubstitution(config.useMontgomeryMultiplyIntrinsic(), BigIntegerSubstitutions.class, "implMontgomeryMultiply", int[].class, int[].class, int[].class, int.class,
-if (config.useMulAddIntrinsic()) {
+long.class, int[].class);
-r.registerMethodSubstitution(BigIntegerSubstitutions.class, "implMulAdd", int[].class, int[].class, int.class, int.class, int.class);
+r.registerConditionalMethodSubstitution(config.useMontgomerySquareIntrinsic(), BigIntegerSubstitutions.class, "implMontgomerySquare", int[].class, int[].class, int.class, long.class,
-}
+int[].class);
-if (config.useMontgomeryMultiplyIntrinsic()) {
+r.registerConditionalMethodSubstitution(config.useSquareToLenIntrinsic(), BigIntegerSubstitutions.class, "implSquareToLen", int[].class, int.class, int[].class, int.class);
-r.registerMethodSubstitution(BigIntegerSubstitutions.class, "implMontgomeryMultiply", int[].class, int[].class, int[].class, int.class, long.class, int[].class);
+}
-}
-if (config.useMontgomerySquareIntrinsic()) {
+private static void registerSHAPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
-r.registerMethodSubstitution(BigIntegerSubstitutions.class, "implMontgomerySquare", int[].class, int[].class, int.class, long.class, int[].class);
-}
-if (config.useSquareToLenIntrinsic()) {
-r.registerMethodSubstitution(BigIntegerSubstitutions.class, "implSquareToLen", int[].class, int.class, int[].class, int.class);
-}
-}
-private static void registerSHAPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
 boolean useSha1 = config.useSHA1Intrinsics();
 boolean useSha256 = config.useSHA256Intrinsics();
 boolean useSha512 = config.useSHA512Intrinsics();
-if (JavaVersionUtil.JAVA_SPEC > 8 && (useSha1 || useSha256 || useSha512)) {
+if (isIntrinsicName(config, "sun/security/provider/DigestBase", "implCompressMultiBlock0") && (useSha1 || useSha256 || useSha512)) {
-Registration r = new Registration(plugins, "sun.security.provider.DigestBase", bytecodeProvider);
+Registration r = new Registration(plugins, "sun.security.provider.DigestBase", replacements);
 r.registerMethodSubstitution(DigestBaseSubstitutions.class, "implCompressMultiBlock0", Receiver.class, byte[].class, int.class, int.class);
 }
+String implCompressName = lookupIntrinsicName(config, "sun/security/provider/SHA", "implCompress", "implCompress0");
 if (useSha1) {
 assert config.sha1ImplCompress != 0L;
-Registration r = new Registration(plugins, "sun.security.provider.SHA", bytecodeProvider);
+Registration r = new Registration(plugins, "sun.security.provider.SHA", replacements);
-r.registerMethodSubstitution(SHASubstitutions.class, SHASubstitutions.implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
+r.registerMethodSubstitution(SHASubstitutions.class, implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
 }
 if (useSha256) {
 assert config.sha256ImplCompress != 0L;
-Registration r = new Registration(plugins, "sun.security.provider.SHA2", bytecodeProvider);
+Registration r = new Registration(plugins, "sun.security.provider.SHA2", replacements);
-r.registerMethodSubstitution(SHA2Substitutions.class, SHA2Substitutions.implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
+r.registerMethodSubstitution(SHA2Substitutions.class, implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
 }
 if (useSha512) {
 assert config.sha512ImplCompress != 0L;
-Registration r = new Registration(plugins, "sun.security.provider.SHA5", bytecodeProvider);
+Registration r = new Registration(plugins, "sun.security.provider.SHA5", replacements);
-r.registerMethodSubstitution(SHA5Substitutions.class, SHA5Substitutions.implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
+r.registerMethodSubstitution(SHA5Substitutions.class, implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
 }
 }
 private static void registerGHASHPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) {
 if (config.useGHASHIntrinsics()) {
 }
 });
 }
 }
-private static void registerCounterModePlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+private static void registerCounterModePlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
-if (config.useAESCTRIntrinsics) {
+if (JavaVersionUtil.JAVA_SPEC > 8) {
-assert config.counterModeAESCrypt != 0L;
+assert !config.useAESCTRIntrinsics || config.counterModeAESCrypt != 0L;
-Registration r = new Registration(plugins, "com.sun.crypto.provider.CounterMode", bytecodeProvider);
+Registration r = new Registration(plugins, "com.sun.crypto.provider.CounterMode", replacements);
-r.registerMethodSubstitution(CounterModeSubstitutions.class, "implCrypt", Receiver.class, byte[].class, int.class, int.class, byte[].class, int.class);
+r.registerConditionalMethodSubstitution(config.useAESCTRIntrinsics, CounterModeSubstitutions.class, "implCrypt", Receiver.class, byte[].class, int.class, int.class, byte[].class,
+int.class);
 }
 }
 private static void registerBase64Plugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) {
 if (config.useBase64Intrinsics()) {
 }
 });
 }
 }
-private static void registerCRC32Plugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+private static void registerCRC32Plugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
-if (config.useCRC32Intrinsics) {
+Registration r = new Registration(plugins, CRC32.class, replacements);
-Registration r = new Registration(plugins, CRC32.class, bytecodeProvider);
+r.registerConditionalMethodSubstitution(config.useCRC32Intrinsics, CRC32Substitutions.class, "update", int.class, int.class);
-r.registerMethodSubstitution(CRC32Substitutions.class, "update", int.class, int.class);
+if (JavaVersionUtil.JAVA_SPEC <= 8) {
-if (JavaVersionUtil.JAVA_SPEC <= 8) {
+r.registerConditionalMethodSubstitution(config.useCRC32Intrinsics, CRC32Substitutions.class, "updateBytes", int.class, byte[].class, int.class, int.class);
-r.registerMethodSubstitution(CRC32Substitutions.class, "updateBytes", int.class, byte[].class, int.class, int.class);
+r.registerConditionalMethodSubstitution(config.useCRC32Intrinsics, CRC32Substitutions.class, "updateByteBuffer", int.class, long.class, int.class, int.class);
-r.registerMethodSubstitution(CRC32Substitutions.class, "updateByteBuffer", int.class, long.class, int.class, int.class);
+} else {
-} else {
+r.registerConditionalMethodSubstitution(config.useCRC32Intrinsics, CRC32Substitutions.class, "updateBytes0", int.class, byte[].class, int.class, int.class);
-r.registerMethodSubstitution(CRC32Substitutions.class, "updateBytes0", int.class, byte[].class, int.class, int.class);
+r.registerConditionalMethodSubstitution(config.useCRC32Intrinsics, CRC32Substitutions.class, "updateByteBuffer0", int.class, long.class, int.class, int.class);
-r.registerMethodSubstitution(CRC32Substitutions.class, "updateByteBuffer0", int.class, long.class, int.class, int.class);
+}
 }
-}
-}
+private static void registerCRC32CPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
+if (JavaVersionUtil.JAVA_SPEC > 8) {
-private static void registerCRC32CPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+Registration r = new Registration(plugins, "java.util.zip.CRC32C", replacements);
-if (config.useCRC32CIntrinsics) {
+r.registerConditionalMethodSubstitution(config.useCRC32CIntrinsics, CRC32CSubstitutions.class, "updateBytes", int.class, byte[].class, int.class, int.class);
-Registration r = new Registration(plugins, "java.util.zip.CRC32C", bytecodeProvider);
+r.registerConditionalMethodSubstitution(config.useCRC32CIntrinsics, CRC32CSubstitutions.class, "updateDirectByteBuffer", int.class, long.class, int.class, int.class);
-r.registerMethodSubstitution(CRC32CSubstitutions.class, "updateBytes", int.class, byte[].class, int.class, int.class);
+}
-r.registerMethodSubstitution(CRC32CSubstitutions.class, "updateDirectByteBuffer", int.class, long.class, int.class, int.class);
+}
-}
-}
+private static void registerArraysSupportPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
+if (JavaVersionUtil.JAVA_SPEC > 8) {
-private static void registerArraysSupportPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+Registration r = new Registration(plugins, "jdk.internal.util.ArraysSupport", replacements);
-if (config.useVectorizedMismatchIntrinsic) {
+r.registerConditionalMethodSubstitution(config.useVectorizedMismatchIntrinsic, ArraysSupportSubstitutions.class, "vectorizedMismatch", Object.class, long.class, Object.class, long.class,
-Registration r = new Registration(plugins, "jdk.internal.util.ArraysSupport", bytecodeProvider);
+int.class, int.class);
-r.registerMethodSubstitution(ArraysSupportSubstitutions.class, "vectorizedMismatch", Object.class, long.class, Object.class, long.class, int.class, int.class);
 }
 }
 }

changeset 58877	aec7bf35d6f5
parent 58533	46b0b7fe255c
child 58901	2700c409ff10