Skip to content

Commit 0648470

Browse files
committed
rely on hidden property from LikedField
1 parent 296ccad commit 0648470

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,12 @@ public final class Field extends Member<Type> implements FieldRef {
5050
private final LinkedField linkedField;
5151
private final ObjectKlass holder;
5252
private volatile Klass typeKlassCache;
53-
private final boolean hidden;
5453

5554
@CompilationFinal private Symbol<ModifiedUTF8> genericSignature = null;
5655

57-
public Field(ObjectKlass holder, LinkedField linkedField, boolean hidden) {
56+
public Field(ObjectKlass holder, LinkedField linkedField) {
5857
this.linkedField = linkedField;
5958
this.holder = holder;
60-
this.hidden = hidden;
6159
}
6260

6361
@Override
@@ -66,9 +64,6 @@ public Symbol<Name> getName() {
6664
}
6765

6866
public Symbol<Type> getType() {
69-
if (hidden) {
70-
return null;
71-
}
7267
return linkedField.getType();
7368
}
7469

@@ -89,7 +84,7 @@ public Symbol<ModifiedUTF8> getGenericSignature() {
8984
}
9085

9186
public boolean isHidden() {
92-
return hidden;
87+
return linkedField.isHidden();
9388
}
9489

9590
public JavaKind getKind() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ public ObjectKlass(EspressoContext context, LinkedKlass linkedKlass, ObjectKlass
163163
System.arraycopy(skFieldTable, 0, fieldTable, 0, skFieldTable.length);
164164
localFieldTableIndex = skFieldTable.length;
165165
for (int i = 0; i < lkInstanceFields.length; i++) {
166-
Field instanceField = new Field(this, lkInstanceFields[i], lkInstanceFields[i].isHidden());
166+
Field instanceField = new Field(this, lkInstanceFields[i]);
167167
fieldTable[localFieldTableIndex + i] = instanceField;
168168
}
169169
for (int i = 0; i < lkStaticFields.length; i++) {
170-
Field staticField = new Field(this, lkStaticFields[i], false);
170+
Field staticField = new Field(this, lkStaticFields[i]);
171171
staticFieldTable[i] = staticField;
172172
}
173173

@@ -1117,7 +1117,7 @@ public void redefineClass(ChangePacket packet, List<ObjectKlass> refreshSubClass
11171117
for (LinkedField instanceField : instanceFields) {
11181118
if (instanceField.getName().equals(outerField.getName())) {
11191119
// replace with new field
1120-
fieldTable[i] = new Field(this, instanceField, false);
1120+
fieldTable[i] = new Field(this, instanceField);
11211121
}
11221122
}
11231123
}

0 commit comments

Comments
 (0)