heap.finalizables() fixed

Author: thurka

visualvm/libs.profiler/profiler.oql/src/org/graalvm/visualvm/lib/profiler/oql/engine/api/impl/Snapshot.java

@@ -298,21 +298,20 @@ public Iterator getReferees(Object obj, boolean includeWeak) {
 
     public Iterator getFinalizerObjects() {
         JavaClass clazz = findClass("java.lang.ref.Finalizer"); // NOI18N
-        Instance queue = ((ObjectFieldValue) clazz.getValueOfStaticField("queue")).getInstance(); // NOI18N
-        ObjectFieldValue headFld = (ObjectFieldValue) queue.getValueOfField("head"); // NOI18N
+        Instance queue = (Instance) clazz.getValueOfStaticField("queue"); // NOI18N
+        Instance head = (Instance) queue.getValueOfField("head"); // NOI18N
 
         List finalizables = new ArrayList();
-        if (headFld != null) {
-            Instance head = (Instance) headFld.getInstance();
+        if (head != null) {
             while (true) {
-                ObjectFieldValue referentFld = (ObjectFieldValue) head.getValueOfField("referent"); // NOI18N
-                ObjectFieldValue nextFld = (ObjectFieldValue) head.getValueOfField("next"); // NOI18N
+                Instance referent = (Instance) head.getValueOfField("referent"); // NOI18N
+                Instance next = (Instance) head.getValueOfField("next"); // NOI18N
 
-                if (nextFld == null || nextFld.getInstance().equals(head)) {
+                finalizables.add(referent);
+                if (next == null || next.equals(head)) {
                     break;
                 }
-                head = (Instance) nextFld.getInstance();
-                finalizables.add(referentFld.getInstance());
+                head = next;
             }
         }
         return finalizables.iterator();

visualvm/libs.profiler/profiler.oql/src/org/graalvm/visualvm/lib/profiler/oql/engine/api/impl/hat.js

@@ -784,7 +784,7 @@ function wrapHeapSnapshot(heap) {
          */
         finalizables: function() {
             var tmp = this.snapshot.getFinalizerObjects();
-            return wrapperIterator(tmp);
+            return wrapIterator(tmp);
         },
 
         /**