Move implementations of resolver meta to dedicated region.

Author: rakachan

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Field.java

@@ -214,6 +214,8 @@ public final void checkLoadingConstraints(StaticObject loader1, StaticObject loa
         getDeclaringKlass().getContext().getRegistries().checkLoadingConstraint(getType(), loader1, loader2);
     }
 
+    // region FieldAccess impl
+
     @Override
     public final void loadingConstraints(Klass accessingClass) {
         checkLoadingConstraints(accessingClass.getDefiningClassLoader(), getDeclaringKlass().getDefiningClassLoader());
@@ -226,6 +228,8 @@ public final boolean shouldEnforceInitializerCheck() {
                         getDeclaringClass().getMajorVersion() >= ClassfileParser.JAVA_9_VERSION;
     }
 
+    // endregion FieldAccess impl
+
     // region Field accesses
 
     // region Generic

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java

@@ -1796,11 +1796,6 @@ public int getStatus() {
         }
     }
 
-    @Override
-    public Klass getSuperClass() {
-        return getSuperKlass();
-    }
-
     @Override
     public byte getTagConstant() {
         return TagConstants.toTagConstant(getJavaKind());
@@ -1879,30 +1874,30 @@ public Assumption getRedefineAssumption() {
 
     // endregion jdwp-specific
 
-    // TypeAccess impl
+    // region TypeAccess impl
 
     @Override
     public String getJavaName() {
         return getExternalName();
     }
 
     @Override
-    public Method lookupInterfaceMethod(Symbol<Name> name, Symbol<Signature> signature) {
+    public Klass getSuperClass() {
+        return getSuperKlass();
+    }
+
+    @Override
+    public Method lookupInterfaceMethod(Symbol<Name> methodName, Symbol<Signature> methodSignature) {
         if (this instanceof ObjectKlass) {
-            return ((ObjectKlass) this).resolveInterfaceMethod(name, signature);
+            return ((ObjectKlass) this).resolveInterfaceMethod(methodName, methodSignature);
         }
         return null;
     }
 
     @Override
-    public Method lookupInstanceMethod(Symbol<Name> name, Symbol<Signature> signature) {
-        return lookupMethod(name, signature, LookupMode.INSTANCE_ONLY);
+    public Method lookupInstanceMethod(Symbol<Name> methodName, Symbol<Signature> methodSignature) {
+        return lookupMethod(methodName, methodSignature, LookupMode.INSTANCE_ONLY);
     }
 
-    @Idempotent
-    @Override
-    // Implement here for indempotent, and make sure arrays are not abstract.
-    public final boolean isAbstract() {
-        return !isArray() && TypeAccess.super.isAbstract();
-    }
+    // endregion TypeAccess impl
 }

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Method.java

@@ -245,11 +245,6 @@ public Symbol<Signature> getRawSignature() {
         return getLinkedMethod().getRawSignature();
     }
 
-    @Override
-    public Symbol<Signature> getSymbolicSignature() {
-        return getRawSignature();
-    }
-
     public Symbol<Type>[] getParsedSignature() {
         assert parsedSignature != null;
         return parsedSignature;
@@ -950,16 +945,6 @@ public void checkLoadingConstraints(StaticObject loader1, StaticObject loader2)
         }
     }
 
-    @Override
-    public void loadingConstraints(Klass accessingClass) {
-        checkLoadingConstraints(accessingClass.getDefiningClassLoader(), getDeclaringKlass().getDefiningClassLoader());
-    }
-
-    @Override
-    public boolean shouldSkipLoadingConstraints() {
-        return isPolySignatureIntrinsic();
-    }
-
     public int getCatchLocation(int bci, StaticObject ex) {
         ExceptionHandler[] handlers = getExceptionHandlers();
         ExceptionHandler resolved = null;
@@ -1330,6 +1315,32 @@ public StaticObject apply(int j) {
         return instance;
     }
 
+    // region MethodAccess impl
+
+    @Override
+    public Symbol<Signature> getSymbolicSignature() {
+        return getRawSignature();
+    }
+
+    @Override
+    @Idempotent
+    // Re-implement here for indempotent annotation. Some of our nodes benefit from it.
+    public boolean isAbstract() {
+        return super.isAbstract();
+    }
+
+    @Override
+    public boolean shouldSkipLoadingConstraints() {
+        return isPolySignatureIntrinsic();
+    }
+
+    @Override
+    public void loadingConstraints(Klass accessingClass) {
+        checkLoadingConstraints(accessingClass.getDefiningClassLoader(), getDeclaringKlass().getDefiningClassLoader());
+    }
+
+    // endregion MethodAccess impl
+
     private static final class Continuum {
         Continuum(LivenessAnalysis livenessAnalysis) {
             this.livenessAnalysis = livenessAnalysis;