Bug 581644 - Allow stack frames as pseudo-objects for HPROF snapshots

Fix up parsing of ExportHPROF files for ALL_METHODS_AS_CLASSES Change-Id: I858a061f5535f1eae160ff5e409d07f15aa521d2
eclipse-mat · Mar 29, 2023 · 025949e · 025949e
1 parent 17d1ca1
commit 025949e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/plugins/org.eclipse.mat.dtfj/src/org/eclipse/mat/dtfj/DTFJIndexBuilder.java b/plugins/org.eclipse.mat.dtfj/src/org/eclipse/mat/dtfj/DTFJIndexBuilder.java
@@ -7805,6 +7805,23 @@ else if (next instanceof JavaClass)
             al2.add(f);
         }
 
+        // Add declared methods as pseudo-fields
+        if (getExtraInfo2)
+        {
+            int mindex = 1;
+            for (Iterator<?> i = j2.getDeclaredMethods(); i.hasNext();)
+            {
+                Object next = i.next();
+                if (isCorruptData(next, listener, Messages.DTFJIndexBuilder_CorruptDataReadingDeclaredMethods, j2))
+                    continue;
+                JavaMethod jm = (JavaMethod) next;
+                long address = getMethodAddress(jm, listener);
+                ObjectReference val = new ObjectReference(null, address);
+                Field f = new Field("<method[" + (mindex++) + "]>", IObject.Type.OBJECT, val); //$NON-NLS-1$ //$NON-NLS-2$
+                al2.add(f);
+            }
+        }
+
         // Add the MAT descriptions of the fields
         Field[] statics = al2.toArray(new Field[al2.size()]);
         FieldDescriptor[] fld = al.toArray(new FieldDescriptor[al.size()]);

diff --git a/plugins/org.eclipse.mat.tests/src/org/eclipse/mat/tests/snapshot/GeneralSnapshotTests.java b/plugins/org.eclipse.mat.tests/src/org/eclipse/mat/tests/snapshot/GeneralSnapshotTests.java
@@ -1327,7 +1327,6 @@ public void exportHPROF(boolean compress, boolean chunked, boolean redact, long
         // Currently can't export PHD
         assumeThat(snapshot.getSnapshotInfo().getProperty("$heapFormat"), not(equalTo((Serializable)"DTFJ-PHD")));
         // Currently can't export methods as classes properly
-        assumeThat(hasMethods, not(equalTo(Methods.ALL_METHODS)));
         if (redact)
             assumeThat(hasMethods,equalTo(Methods.NONE));
         // HPROF parser can't handle adding links from classloader to classes for javacore