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

-:13588c901957
+:9cf78a70fa4f
 import static org.graalvm.compiler.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.GHASH_PROCESS_BLOCKS;
 import static org.graalvm.compiler.hotspot.meta.HotSpotAOTProfilingPlugin.Options.TieredAOT;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_THREAD_OBJECT_LOCATION;
 import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsing;
-import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java8OrEarlier;
 import java.lang.invoke.ConstantCallSite;
 import java.lang.invoke.MutableCallSite;
 import java.lang.invoke.VolatileCallSite;
 import java.lang.reflect.Array;
 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.hotspot.GraalHotSpotVMConfig;
+import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
 import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode;
 import org.graalvm.compiler.hotspot.replacements.AESCryptSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.ArraysSupportSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.BigIntegerSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.CRC32CSubstitutions;
 import org.graalvm.compiler.replacements.NodeIntrinsificationProvider;
 import org.graalvm.compiler.replacements.ReplacementsImpl;
 import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins;
 import org.graalvm.compiler.replacements.arraycopy.ArrayCopyNode;
 import org.graalvm.compiler.serviceprovider.GraalServices;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 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.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;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 * @param constantReflection
 * @param snippetReflection
 * @param foreignCalls
 * @param options
 */
-public static Plugins create(CompilerConfiguration compilerConfiguration, GraalHotSpotVMConfig config, HotSpotWordTypes wordTypes, MetaAccessProvider metaAccess,
+public static Plugins create(HotSpotGraalRuntimeProvider graalRuntime,
-ConstantReflectionProvider constantReflection, SnippetReflectionProvider snippetReflection, ForeignCallsProvider foreignCalls, ReplacementsImpl replacements,
+CompilerConfiguration compilerConfiguration,
+GraalHotSpotVMConfig config,
+HotSpotWordTypes wordTypes,
+MetaAccessProvider metaAccess,
+ConstantReflectionProvider constantReflection,
+SnippetReflectionProvider snippetReflection,
+ForeignCallsProvider foreignCalls,
+ReplacementsImpl replacements,
 OptionValues options) {
-InvocationPlugins invocationPlugins = new HotSpotInvocationPlugins(config, compilerConfiguration);
+InvocationPlugins invocationPlugins = new HotSpotInvocationPlugins(graalRuntime, config, compilerConfiguration);
 Plugins plugins = new Plugins(invocationPlugins);
 NodeIntrinsificationProvider nodeIntrinsificationProvider = new NodeIntrinsificationProvider(metaAccess, snippetReflection, foreignCalls, wordTypes);
 HotSpotWordOperationPlugin wordOperationPlugin = new HotSpotWordOperationPlugin(snippetReflection, wordTypes);
 HotSpotNodePlugin nodePlugin = new HotSpotNodePlugin(wordOperationPlugin, config, wordTypes);
 if (InlineDuringParsing.getValue(options)) {
 plugins.appendInlineInvokePlugin(new InlineDuringParsingPlugin());
 }
 if (GeneratePIC.getValue(options)) {
-plugins.setClassInitializationPlugin(new HotSpotClassInitializationPlugin());
+plugins.setClassInitializationPlugin(new HotSpotAOTClassInitializationPlugin());
 if (TieredAOT.getValue(options)) {
 plugins.setProfilingPlugin(new HotSpotAOTProfilingPlugin());
+}
+} else {
+if (config.instanceKlassInitThreadOffset != -1) {
+plugins.setClassInitializationPlugin(new HotSpotJITClassInitializationPlugin());
 }
 }
 invocationPlugins.defer(new Runnable() {
 registerBigIntegerPlugins(invocationPlugins, config, replacementBytecodeProvider);
 registerSHAPlugins(invocationPlugins, config, replacementBytecodeProvider);
 registerGHASHPlugins(invocationPlugins, config, metaAccess, foreignCalls);
 registerCounterModePlugins(invocationPlugins, config, replacementBytecodeProvider);
 registerBase64Plugins(invocationPlugins, config, metaAccess, foreignCalls);
-registerUnsafePlugins(invocationPlugins, replacementBytecodeProvider);
+registerUnsafePlugins(invocationPlugins, config, replacementBytecodeProvider);
 StandardGraphBuilderPlugins.registerInvocationPlugins(metaAccess, snippetReflection, invocationPlugins, replacementBytecodeProvider, true, false);
 registerArrayPlugins(invocationPlugins, replacementBytecodeProvider);
 registerStringPlugins(invocationPlugins, replacementBytecodeProvider);
 registerArraysSupportPlugins(invocationPlugins, config, replacementBytecodeProvider);
 private static void registerCallSitePlugins(InvocationPlugins plugins) {
 InvocationPlugin plugin = new InvocationPlugin() {
 @Override
 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
 ValueNode callSite = receiver.get();
-ValueNode folded = CallSiteTargetNode.tryFold(GraphUtil.originalValue(callSite), b.getMetaAccess(), b.getAssumptions());
+ValueNode folded = CallSiteTargetNode.tryFold(GraphUtil.originalValue(callSite, true), b.getMetaAccess(), b.getAssumptions());
 if (folded != null) {
 b.addPush(JavaKind.Object, folded);
 } else {
 b.addPush(JavaKind.Object, new CallSiteTargetNode(b.getInvokeKind(), targetMethod, b.bci(), b.getInvokeReturnStamp(b.getAssumptions()), callSite));
 }
 }
 });
 r.registerMethodSubstitution(ReflectionSubstitutions.class, "getClassAccessFlags", Class.class);
 }
-private static void registerUnsafePlugins(InvocationPlugins plugins, BytecodeProvider replacementBytecodeProvider) {
+private static void registerUnsafePlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider replacementBytecodeProvider) {
 Registration r;
-if (Java8OrEarlier) {
+if (JavaVersionUtil.JAVA_SPEC <= 8) {
 r = new Registration(plugins, Unsafe.class, replacementBytecodeProvider);
 } else {
 r = new Registration(plugins, "jdk.internal.misc.Unsafe", replacementBytecodeProvider);
 }
-r.registerMethodSubstitution(HotSpotUnsafeSubstitutions.class, HotSpotUnsafeSubstitutions.copyMemoryName, "copyMemory", Receiver.class, Object.class, long.class, Object.class, long.class,
+String substituteMethodName = config.doingUnsafeAccessOffset != Integer.MAX_VALUE ? "copyMemoryGuarded" : "copyMemory";
-long.class);
+r.registerMethodSubstitution(HotSpotUnsafeSubstitutions.class, HotSpotUnsafeSubstitutions.copyMemoryName, substituteMethodName, Receiver.class, Object.class, long.class, Object.class,
+long.class, long.class);
 }
 private static final LocationIdentity INSTANCE_KLASS_CONSTANTS = NamedLocationIdentity.immutable("InstanceKlass::_constants");
 private static final LocationIdentity CONSTANT_POOL_LENGTH = NamedLocationIdentity.immutable("ConstantPool::_length");
 r.setAllowOverwrite(true);
 r.registerMethodSubstitution(HotSpotArraySubstitutions.class, "newInstance", Class.class, int.class);
 }
 private static void registerStringPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
-if (!Java8OrEarlier) {
+if (JavaVersionUtil.JAVA_SPEC > 8) {
 final Registration utf16r = new Registration(plugins, "java.lang.StringUTF16", bytecodeProvider);
 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);
 }
 }
 });
 r.registerMethodSubstitution(ThreadSubstitutions.class, "isInterrupted", Receiver.class, boolean.class);
 }
-public static final String cbcEncryptName;
-public static final String cbcDecryptName;
 public static final String aesEncryptName;
 public static final String aesDecryptName;
 public static final String reflectionClass;
 public static final String constantPoolClass;
 static {
-if (Java8OrEarlier) {
+if (JavaVersionUtil.JAVA_SPEC <= 8) {
-cbcEncryptName = "encrypt";
-cbcDecryptName = "decrypt";
 aesEncryptName = "encryptBlock";
 aesDecryptName = "decryptBlock";
 reflectionClass = "sun.reflect.Reflection";
 constantPoolClass = "sun.reflect.ConstantPool";
 } else {
-cbcEncryptName = "implEncrypt";
-cbcDecryptName = "implDecrypt";
 aesEncryptName = "implEncryptBlock";
 aesDecryptName = "implDecryptBlock";
 reflectionClass = "jdk.internal.reflect.Reflection";
 constantPoolClass = "jdk.internal.reflect.ConstantPool";
 }
+}
+public static boolean cbcUsesImplNames(GraalHotSpotVMConfig config) {
+for (VMIntrinsicMethod intrinsic : config.getStore().getIntrinsics()) {
+if ("com/sun/crypto/provider/CipherBlockChaining".equals(intrinsic.declaringClass)) {
+if ("encrypt".equals(intrinsic.name)) {
+return false;
+} else if ("implEncrypt".equals(intrinsic.name)) {
+return true;
+}
+}
+}
+throw GraalError.shouldNotReachHere();
 }
 private static void registerAESPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
 if (config.useAESIntrinsics) {
 assert config.aescryptEncryptBlockStub != 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);
+boolean implNames = cbcUsesImplNames(config);
+String cbcEncryptName = implNames ? "implEncrypt" : "encrypt";
+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);
 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) {
 Registration r = new Registration(plugins, BigInteger.class, bytecodeProvider);
 if (config.useMultiplyToLenIntrinsic()) {
 assert config.multiplyToLen != 0L;
-if (Java8OrEarlier) {
+if (JavaVersionUtil.JAVA_SPEC <= 8) {
 r.registerMethodSubstitution(BigIntegerSubstitutions.class, "multiplyToLen", "multiplyToLenStatic", int[].class, int.class, int[].class, int.class,
 int[].class);
 } else {
 r.registerMethodSubstitution(BigIntegerSubstitutions.class, "implMultiplyToLen", "multiplyToLenStatic", int[].class, 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 (!Java8OrEarlier && (useSha1 || useSha256 || useSha512)) {
+if (JavaVersionUtil.JAVA_SPEC > 8 && (useSha1 || useSha256 || useSha512)) {
 Registration r = new Registration(plugins, "sun.security.provider.DigestBase", bytecodeProvider);
 r.registerMethodSubstitution(DigestBaseSubstitutions.class, "implCompressMultiBlock0", Receiver.class, byte[].class, int.class, int.class);
 }
 if (useSha1) {
 private static void registerCRC32Plugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
 if (config.useCRC32Intrinsics) {
 Registration r = new Registration(plugins, CRC32.class, bytecodeProvider);
 r.registerMethodSubstitution(CRC32Substitutions.class, "update", int.class, int.class);
-if (Java8OrEarlier) {
+if (JavaVersionUtil.JAVA_SPEC <= 8) {
 r.registerMethodSubstitution(CRC32Substitutions.class, "updateBytes", int.class, byte[].class, int.class, int.class);
 r.registerMethodSubstitution(CRC32Substitutions.class, "updateByteBuffer", int.class, long.class, int.class, int.class);
 } else {
 r.registerMethodSubstitution(CRC32Substitutions.class, "updateBytes0", int.class, byte[].class, int.class, int.class);
 r.registerMethodSubstitution(CRC32Substitutions.class, "updateByteBuffer0", int.class, long.class, int.class, int.class);

branch	datagramsocketimpl-branch
changeset 58678	9cf78a70fa4f
parent 54601	c40b2a190173
child 58679	9c3209ff7550