[GR-55551] Espresso code cleanups

PullRequest: graal/18328

Author: gilles-duboscq

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/classfile/ImmutableConstantPool.java

@@ -101,6 +101,8 @@ ImmutableConstantPool patchForHiddenClass(int thisKlassIndex, Symbol<?> newName)
         PoolConstant[] newEntries = Arrays.copyOf(constants, constants.length + 1);
         newEntries[newNamePos] = newNameConstant;
         newEntries[thisKlassIndex] = ClassConstant.create(newNamePos);
+        // This will get resolved in the ObjectKlass constructor
+        // See initSelfReferenceInPool
 
         int rawLengthIncrease = 2 /* u2 length */ + newName.length() /* symbol length */;
         return new ImmutableConstantPool(newEntries, majorVersion, minorVersion, totalPoolBytes + rawLengthIncrease);

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

@@ -399,7 +399,7 @@ private void setObjectHelper(StaticObject obj, Object value, boolean forceVolati
         assert getDeclaringKlass().isAssignableFrom(obj.getKlass()) : this + " does not exist in " + obj.getKlass();
 
         if (getDeclaringKlass().getContext().anyHierarchyChanged()) {
-            checkSetValueValifity(value);
+            checkSetValueValidity(value);
         }
         if (isVolatile() || forceVolatile) {
             linkedField.setObjectVolatile(obj, value);
@@ -408,7 +408,7 @@ private void setObjectHelper(StaticObject obj, Object value, boolean forceVolati
         }
     }
 
-    protected void checkSetValueValifity(Object value) {
+    protected void checkSetValueValidity(Object value) {
         if (value != StaticObject.NULL && value instanceof StaticObject) {
             Klass klass = null;
             try {

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

@@ -1498,10 +1498,6 @@ private void checkPoisonPill(Meta meta) {
             }
         }
 
-        public int getCodeSize() {
-            return getOriginalCode() != null ? getOriginalCode().length : 0;
-        }
-
         public LineNumberTableAttribute getLineNumberTableAttribute() {
             if (codeAttribute != null) {
                 LineNumberTableAttribute lineNumberTable = codeAttribute.getLineNumberTableAttribute();

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

@@ -163,7 +163,7 @@ public void setObject(StaticObject obj, Object value, boolean forceVolatile) {
             getCompatibleField().setObject(obj, value, forceVolatile);
         } else {
             if (getDeclaringKlass().getContext().anyHierarchyChanged()) {
-                checkSetValueValifity(value);
+                checkSetValueValidity(value);
             }
             FieldStorageObject storageObject = getStorageObject(obj);
             if (forceVolatile) {

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/Meta.java

@@ -1054,8 +1054,8 @@ public Meta(EspressoContext context) {
             java_util_regex_IntHashSet = null;
         }
 
-        java_util_concurrent_locks_abstractOwnableSynchronizer = knownKlass(Type.java_util_concurrent_locks_AbstractOwnableSynchronizer);
-        java_util_concurrent_locks_AbstractOwnableSynchronizer_exclusiveOwnerThread = java_util_concurrent_locks_abstractOwnableSynchronizer.requireDeclaredField(Name.exclusiveOwnerThread,
+        java_util_concurrent_locks_AbstractOwnableSynchronizer = knownKlass(Type.java_util_concurrent_locks_AbstractOwnableSynchronizer);
+        java_util_concurrent_locks_AbstractOwnableSynchronizer_exclusiveOwnerThread = java_util_concurrent_locks_AbstractOwnableSynchronizer.requireDeclaredField(Name.exclusiveOwnerThread,
                         Type.java_lang_Thread);
         java_util_concurrent_locks_ReentrantLock_Sync = knownKlass(Type.java_util_concurrent_locks_ReentrantLock_Sync);
         java_util_concurrent_locks_ReentrantReadWriteLock_Sync = knownKlass(Type.java_util_concurrent_locks_ReentrantReadWriteLock_Sync);
@@ -1888,7 +1888,7 @@ private DiffVersionLoadHelper diff() {
     public final Field java_util_regex_Matcher_requireEnd;
     public final Method java_util_regex_Matcher_groupCount;
 
-    public final ObjectKlass java_util_concurrent_locks_abstractOwnableSynchronizer;
+    public final ObjectKlass java_util_concurrent_locks_AbstractOwnableSynchronizer;
     public final Field java_util_concurrent_locks_AbstractOwnableSynchronizer_exclusiveOwnerThread;
     public final ObjectKlass java_util_concurrent_locks_ReentrantLock_Sync;
     public final ObjectKlass java_util_concurrent_locks_ReentrantReadWriteLock_Sync;