[GR-31508] Remove redundant state in Member.

PullRequest: graal/8990

Author: javeleon

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,14 +53,18 @@ public final class Field extends Member<Type> implements FieldRef {
 
     @CompilationFinal private Symbol<ModifiedUTF8> genericSignature = null;
 
-    public Field(ObjectKlass holder, LinkedField linkedField, boolean hidden) {
-        super(hidden ? null : linkedField.getType(), linkedField.getName());
+    public Field(ObjectKlass holder, LinkedField linkedField) {
         this.linkedField = linkedField;
         this.holder = holder;
     }
 
+    @Override
+    public Symbol<Name> getName() {
+        return linkedField.getName();
+    }
+
     public Symbol<Type> getType() {
-        return descriptor;
+        return linkedField.getType();
     }
 
     public Attribute[] getAttributes() {
@@ -80,7 +84,7 @@ public Symbol<ModifiedUTF8> getGenericSignature() {
     }
 
     public boolean isHidden() {
-        return getDescriptor() == null;
+        return linkedField.isHidden();
     }
 
     public JavaKind getKind() {
@@ -616,12 +620,12 @@ public byte getTagConstant() {
 
     @Override
     public String getNameAsString() {
-        return super.getName().toString();
+        return getName().toString();
     }
 
     @Override
     public String getTypeAsString() {
-        return super.getDescriptor().toString();
+        return getType().toString();
     }
 
     @Override

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

@@ -39,10 +39,6 @@ final class LinkedField extends StaticProperty {
         this.slot = slot;
     }
 
-    public static LinkedField createHidden(Symbol<Name> name, int slot) {
-        return new LinkedField(new ParserField(ParserField.HIDDEN, name, Type.java_lang_Object, null), slot);
-    }
-
     /**
      * This method is required by the Static Object Model. In Espresso we should rather call
      * `getName()` and use Symbols.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,21 +29,7 @@
 
 public abstract class Member<T extends Descriptor> implements ModifiersProvider {
 
-    protected final Symbol<Name> name;
-    protected final Symbol<T> descriptor;
-
-    protected Member(Symbol<T> descriptor, Symbol<Name> name) {
-        this.name = name;
-        this.descriptor = descriptor;
-    }
-
-    public Symbol<Name> getName() {
-        return name;
-    }
-
-    public final Symbol<T> getDescriptor() {
-        return descriptor;
-    }
+    public abstract Symbol<Name> getName();
 
     public abstract ObjectKlass getDeclaringKlass();
 }

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

@@ -131,24 +131,32 @@ public final class Method extends Member<Signature> implements TruffleObject, Co
     private final Method proxy;
     private String genericSignature;
 
+    // always null unless the raw signature exposed for this method should be
+    // different from the one in the linkedKlass
+    private final Symbol<Signature> rawSignature;
+
     // the parts of the method that can change when it's redefined
     // are encapsulated within the methodVersion
     @CompilationFinal private volatile MethodVersion methodVersion;
 
     private final Assumption removedByRedefinition = Truffle.getRuntime().createAssumption();
 
-    public Method identity() {
-        return proxy == null ? this : proxy;
-    }
-
     // Multiple maximally-specific interface methods. Fail on call.
     @CompilationFinal private boolean poisonPill = false;
 
     // Whether we need to use an additional frame slot for monitor unlock on kill.
     @CompilationFinal private byte usesMonitors = -1;
 
-    // can have a different constant pool than it's declaring class
+    public Method identity() {
+        return proxy == null ? this : proxy;
+    }
+
+    @Override
+    public Symbol<Name> getName() {
+        return getLinkedMethod().getName();
+    }
 
+    // can have a different constant pool than it's declaring class
     public ConstantPool getConstantPool() {
         return getRuntimeConstantPool();
     }
@@ -171,7 +179,10 @@ public ObjectKlass getDeclaringKlass() {
     }
 
     public Symbol<Signature> getRawSignature() {
-        return descriptor;
+        if (rawSignature != null) {
+            return rawSignature;
+        }
+        return getLinkedMethod().getRawSignature();
     }
 
     public Symbol<Type>[] getParsedSignature() {
@@ -182,7 +193,7 @@ public Symbol<Type>[] getParsedSignature() {
     private Source source;
 
     Method(Method method) {
-        super(method.getRawSignature(), method.getName());
+        this.rawSignature = method.rawSignature;
         this.declaringKlass = method.declaringKlass;
         this.methodVersion = new MethodVersion(method.getRuntimeConstantPool(), method.getLinkedMethod(), method.getCodeAttribute());
 
@@ -205,7 +216,7 @@ public Symbol<Type>[] getParsedSignature() {
     }
 
     private Method(Method method, CodeAttribute split) {
-        super(method.getRawSignature(), method.getName());
+        this.rawSignature = method.rawSignature;
         this.declaringKlass = method.declaringKlass;
         this.methodVersion = new MethodVersion(method.getRuntimeConstantPool(), method.getLinkedMethod(), split);
 
@@ -231,9 +242,9 @@ private Method(Method method, CodeAttribute split) {
     }
 
     Method(ObjectKlass declaringKlass, LinkedMethod linkedMethod, Symbol<Signature> rawSignature, RuntimeConstantPool pool) {
-        super(rawSignature, linkedMethod.getName());
         this.methodVersion = new MethodVersion(pool, linkedMethod, (CodeAttribute) linkedMethod.getAttribute(CodeAttribute.NAME));
         this.declaringKlass = declaringKlass;
+        this.rawSignature = rawSignature;
 
         try {
             this.parsedSignature = getSignatures().parsed(this.getRawSignature());

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

@@ -163,11 +163,11 @@ public ObjectKlass(EspressoContext context, LinkedKlass linkedKlass, ObjectKlass
         System.arraycopy(skFieldTable, 0, fieldTable, 0, skFieldTable.length);
         localFieldTableIndex = skFieldTable.length;
         for (int i = 0; i < lkInstanceFields.length; i++) {
-            Field instanceField = new Field(this, lkInstanceFields[i], lkInstanceFields[i].isHidden());
+            Field instanceField = new Field(this, lkInstanceFields[i]);
             fieldTable[localFieldTableIndex + i] = instanceField;
         }
         for (int i = 0; i < lkStaticFields.length; i++) {
-            Field staticField = new Field(this, lkStaticFields[i], false);
+            Field staticField = new Field(this, lkStaticFields[i]);
             staticFieldTable[i] = staticField;
         }
 
@@ -1117,7 +1117,7 @@ public void redefineClass(ChangePacket packet, List<ObjectKlass> refreshSubClass
                         for (LinkedField instanceField : instanceFields) {
                             if (instanceField.getName().equals(outerField.getName())) {
                                 // replace with new field
-                                fieldTable[i] = new Field(this, instanceField, false);
+                                fieldTable[i] = new Field(this, instanceField);
                             }
                         }
                     }