src/java.base/share/classes/java/lang/invoke/VarHandles.java

@@ -31,11 +31,11 @@
 
     static VarHandle makeFieldHandle(MemberName f, Class<?> refc, Class<?> type, boolean isWriteAllowedOnFinalFields) {
         if (!f.isStatic()) {
             long foffset = MethodHandleNatives.objectFieldOffset(f);
             if (!type.isPrimitive()) {
-                if (f.isFlatValue()) {
+                if (f.isFlattened()) {
                     return f.isFinal() && !isWriteAllowedOnFinalFields
                         ? new VarHandleReferences.FlatValueFieldInstanceReadOnly(refc, foffset, type)
                         : new VarHandleReferences.FlatValueFieldInstanceReadWrite(refc, foffset, type);
                 } else {
                     return f.isFinal() && !isWriteAllowedOnFinalFields

@@ -98,11 +98,11 @@
                 UNSAFE.ensureClassInitialized(refc);
 
             Object base = MethodHandleNatives.staticFieldBase(f);
             long foffset = MethodHandleNatives.staticFieldOffset(f);
             if (!type.isPrimitive()) {
-                assert(!f.isFlatValue());   // static field is not flattened
+                assert(!f.isFlattened());   // static field is not flattened
                 return f.isFinal() && !isWriteAllowedOnFinalFields
                        ? new VarHandleReferences.FieldStaticReadOnly(base, foffset, type)
                        : new VarHandleReferences.FieldStaticReadWrite(base, foffset, type, f.canBeNull());
             }
             else if (type == boolean.class) {