Skip to content

Commit fdb1690

Browse files
committed
Use the valhalla enabled option when retrieving instance fields.
1 parent ced28d6 commit fdb1690

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -860,10 +860,10 @@ public int compare(ResolvedJavaField a, ResolvedJavaField b) {
860860

861861
@Override
862862
public ResolvedJavaField[] getInstanceFields(boolean includeSuperclasses) {
863-
return getInstanceFields(includeSuperclasses, true);
863+
return getInstanceFields(includeSuperclasses, config().valhallaEnabled);
864864
}
865865

866-
public ResolvedJavaField[] getInstanceFields(boolean includeSuperclasses, boolean flat) {
866+
public ResolvedJavaField[] getInstanceFields(boolean includeSuperclasses, boolean valhallaEnabled) {
867867
if (instanceFields == null) {
868868
if (isArray() || isInterface()) {
869869
instanceFields = NO_FIELDS;
@@ -872,7 +872,7 @@ public ResolvedJavaField[] getInstanceFields(boolean includeSuperclasses, boolea
872872
if (getSuperclass() != null) {
873873
prepend = (HotSpotResolvedJavaField[]) getSuperclass().getInstanceFields(true);
874874
}
875-
if (flat) {
875+
if (valhallaEnabled) {
876876
instanceFields = getFlattenedFields(prepend);
877877
} else {
878878
instanceFields = getFields(false, prepend);

0 commit comments

Comments
 (0)