--- old/src/java.base/share/classes/java/lang/invoke/VarHandles.java	2018-12-07 12:57:54.000000000 -0800
+++ new/src/java.base/share/classes/java/lang/invoke/VarHandles.java	2018-12-07 12:57:54.000000000 -0800
@@ -33,7 +33,7 @@
         if (!f.isStatic()) {
             long foffset = MethodHandleNatives.objectFieldOffset(f);
             if (!type.isPrimitive()) {
-                if (f.isFlatValue()) {
+                if (f.isFlattened()) {
                     return f.isFinal() && !isWriteAllowedOnFinalFields
                         ? new VarHandleObjects.FlatValueFieldInstanceReadOnly(refc, foffset, type)
                         : new VarHandleObjects.FlatValueFieldInstanceReadWrite(refc, foffset, type);
@@ -100,7 +100,7 @@
             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 VarHandleObjects.FieldStaticReadOnly(base, foffset, type)
                         : new VarHandleObjects.FieldStaticReadWrite(base, foffset, type, f.canBeNull());