[GR-62804] Avoid resolving java.* classes where possible.

PullRequest: graal/20761

Author: davleopo

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

@@ -102,8 +102,8 @@ protected HotSpotPlatformConfigurationProvider createConfigInfoProvider(GraalHot
         return new HotSpotPlatformConfigurationProvider(config, barrierSet);
     }
 
-    protected HotSpotMetaAccessExtensionProvider createMetaAccessExtensionProvider(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection) {
-        return new HotSpotMetaAccessExtensionProvider(metaAccess, constantReflection);
+    protected HotSpotMetaAccessExtensionProvider createMetaAccessExtensionProvider(ConstantReflectionProvider constantReflection) {
+        return new HotSpotMetaAccessExtensionProvider(constantReflection);
     }
 
     protected HotSpotReplacementsImpl createReplacements(TargetDescription target, HotSpotProviders p, BytecodeProvider bytecodeProvider) {
@@ -171,7 +171,7 @@ public final HotSpotBackend createBackend(HotSpotGraalRuntimeProvider graalRunti
             }
             HotSpotMetaAccessExtensionProvider metaAccessExtensionProvider;
             try (InitTimer rt = timer("create MetaAccessExtensionProvider")) {
-                metaAccessExtensionProvider = createMetaAccessExtensionProvider(metaAccess, constantReflection);
+                metaAccessExtensionProvider = createMetaAccessExtensionProvider(constantReflection);
             }
             HotSpotStampProvider stampProvider;
             try (InitTimer rt = timer("create stamp provider")) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotMetaAccessExtensionProvider.java

@@ -30,18 +30,15 @@
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
-import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 public class HotSpotMetaAccessExtensionProvider implements MetaAccessExtensionProvider {
     private final ConstantReflectionProvider constantReflection;
-    private final ResolvedJavaType jlClassType;
 
-    public HotSpotMetaAccessExtensionProvider(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection) {
+    public HotSpotMetaAccessExtensionProvider(ConstantReflectionProvider constantReflection) {
         this.constantReflection = constantReflection;
-        this.jlClassType = metaAccess.lookupJavaType(Class.class);
     }
 
     @Override
@@ -80,7 +77,7 @@ public ResolvedJavaField getStaticFieldForAccess(JavaConstant base, long offset,
         ResolvedJavaType type = constantReflection.asJavaType(base);
         // check that it's indeed a j.l.Class when we get a result since constant reflection will
         // also return a type if the constant wraps a ResolvedJavaType
-        if (type == null || !objectConstant.getType().equals(jlClassType)) {
+        if (type == null || !objectConstant.getType().getName().equals("Ljava/lang/Class;")) {
             return null;
         }
         for (ResolvedJavaField field : type.getStaticFields()) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/BytecodeParser.java

@@ -5078,7 +5078,7 @@ public boolean currentBlockCatchesOOME() {
             if (handler != null) {
                 JavaType catchType = handler.getCatchType();
                 // catch type can be null for java.lang.Throwable which catches everything
-                inOOMETry = catchType != null && catchType.equals(getMetaAccess().lookupJavaType(OutOfMemoryError.class));
+                inOOMETry = catchType != null && catchType.getName().equals("Ljava/lang/OutOfMemoryError;");
             }
         }
         return inOOMETry;

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ObjectEqualsNode.java

@@ -178,8 +178,7 @@ public static LogicNode virtualizeComparison(ValueNode x, ValueNode y, Structure
             } else if (!xVirtual.hasIdentity() && !yVirtual.hasIdentity()) {
                 ResolvedJavaType type = xVirtual.type();
                 if (type.equals(yVirtual.type())) {
-                    MetaAccessProvider metaAccess = tool.getMetaAccess();
-                    if (type.equals(metaAccess.lookupJavaType(Integer.class)) || type.equals(metaAccess.lookupJavaType(Long.class))) {
+                    if (type.getName().equals("Ljava/lang/Integer;") || type.getName().equals("Ljava/lang/Long;")) {
                         // both are virtual without identity: check contents
                         assert xVirtual.entryCount() == 1 && yVirtual.entryCount() == 1 : Assertions.errorMessageContext("x", xVirtual, "y", yVirtual);
                         assert xVirtual.entryKind(tool.getMetaAccessExtensionProvider(), 0).getStackKind() == JavaKind.Int ||

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/DynamicNewInstanceNode.java

@@ -38,7 +38,6 @@
 import jdk.graal.compiler.nodes.spi.Canonicalizable;
 import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 import jdk.graal.compiler.nodes.spi.CoreProviders;
-import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 @NodeInfo
@@ -60,7 +59,7 @@ public ValueNode getInstanceType() {
     static ResolvedJavaType tryConvertToNonDynamic(ValueNode clazz, CoreProviders tool) {
         if (clazz.isConstant()) {
             ResolvedJavaType type = tool.getConstantReflection().asJavaType(clazz.asConstant());
-            if (type != null && !throwsInstantiationException(type, tool.getMetaAccess()) && tool.getMetaAccessExtensionProvider().canConstantFoldDynamicAllocation(type)) {
+            if (type != null && !throwsInstantiationException(type) && tool.getMetaAccessExtensionProvider().canConstantFoldDynamicAllocation(type)) {
                 return type;
             }
         }
@@ -88,7 +87,7 @@ public static boolean throwsInstantiationExceptionInjectedProbability(double pro
                         probability(probability, type == classClass);
     }
 
-    public static boolean throwsInstantiationException(ResolvedJavaType type, MetaAccessProvider metaAccess) {
-        return type.isPrimitive() || type.isArray() || type.isInterface() || Modifier.isAbstract(type.getModifiers()) || type.equals(metaAccess.lookupJavaType(Class.class));
+    public static boolean throwsInstantiationException(ResolvedJavaType type) {
+        return type.isPrimitive() || type.isArray() || type.isInterface() || Modifier.isAbstract(type.getModifiers()) || type.getName().equals("Ljava/lang/Class;");
     }
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/DefaultJavaLoweringProvider.java

@@ -407,7 +407,7 @@ private void lowerBinaryMath(BinaryMathIntrinsicNode math, LoweringTool tool) {
                 // lowering to emit the stub assembly code instead of the Node lowering.
                 return;
             }
-            if (method.getName().equalsIgnoreCase(math.getOperation().name()) && tool.getMetaAccess().lookupJavaType(Math.class).equals(method.getDeclaringClass())) {
+            if (method.getName().equalsIgnoreCase(math.getOperation().name()) && method.getDeclaringClass().getName().equals("Ljava/lang/Math;")) {
                 // A root compilation of the intrinsic method should emit the full assembly
                 // implementation.
                 return;
@@ -428,7 +428,7 @@ private void lowerUnaryMath(UnaryMathIntrinsicNode math, LoweringTool tool) {
         }
         ResolvedJavaMethod method = math.graph().method();
         if (method != null) {
-            if (method.getName().equalsIgnoreCase(math.getOperation().name()) && tool.getMetaAccess().lookupJavaType(Math.class).equals(method.getDeclaringClass())) {
+            if (method.getName().equalsIgnoreCase(math.getOperation().name()) && method.getDeclaringClass().getName().equals("Ljava/lang/Math;")) {
                 // A root compilation of the intrinsic method should emit the full assembly
                 // implementation.
                 return;