8379925: [lworld] Several SA HeapDump tests fail with Unrecognized heap dump sub-record type: XX with --enable-preview

8377387: [lworld] serviceability/sa/TestHeapDumpForInvokeDynamic.java test fails with --enable-preview

Reviewed-by: sspitsyn

Author: plummercj

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Field.java

@@ -220,6 +220,7 @@ public int getFieldIndex() {
   public boolean isGeneric()                 { return fieldIsGeneric(values.fieldFlags); }
   public boolean isStable()                  { return fieldIsStable(values.fieldFlags); }
   public boolean isContended()               { return fieldIsContended(values.fieldFlags); }
+  public boolean isFlat()                    { return fieldIsFlat(values.fieldFlags); }
 
   public boolean equals(Object obj) {
      if (obj == null) {

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java

@@ -1203,7 +1203,11 @@ private void writeField(Field field, Oop oop) throws IOException {
             break;
         case JVM_SIGNATURE_CLASS:
         case JVM_SIGNATURE_ARRAY: {
-            if (VM.getVM().isCompressedOopsEnabled()) {
+            if (field.isFlat()) {
+              // FIXME - we don't handle flattened fields yet. Just treat them
+              // as a null reference. See JDK-8381370.
+              writeObjectID(null);
+            } else if (VM.getVM().isCompressedOopsEnabled()) {
               OopHandle handle = ((NarrowOopField)field).getValueAsOopHandle(oop);
               writeObjectID(getAddressValue(handle));
             } else {

test/hotspot/jtreg/ProblemList-enable-preview.txt

@@ -41,7 +41,3 @@ compiler/stable/TestStableArrayMembars.java
 
 # Serviceability:
 vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java                        8375069 generic-all
-serviceability/sa/ClhsdbDumpheap.java                                                            8379925 generic-all
-serviceability/sa/TestHeapDumpForInvokeDynamic.java                                              8377387 generic-all
-serviceability/sa/TestJmapCore.java                                                              8379925 generic-all
-serviceability/sa/TestJmapCoreMetaspace.java                                                     8379925 generic-all

test/jdk/ProblemList-enable-preview.txt

@@ -32,7 +32,3 @@
 
 # Valhalla failures start here:
 com/sun/jdi/EATests.java#id0                                       8372831 generic-all
-
-sun/tools/jhsdb/HeapDumpTest.java                                  8379925 generic-all
-sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java                 8379925 generic-all
-sun/tools/jhsdb/JShellHeapDumpTest.java                            8379925 generic-all