handle renamed RubyObjectType

Author: thurka

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/ruby/RubyHeapFragment.java

@@ -24,11 +24,12 @@
  */
 package org.graalvm.visualvm.heapviewer.truffle.lang.ruby;
 
-import org.graalvm.visualvm.lib.jfluid.heap.Heap;
-import org.graalvm.visualvm.lib.jfluid.heap.Instance;
+import java.util.Iterator;
 import org.graalvm.visualvm.heapviewer.HeapContext;
 import org.graalvm.visualvm.heapviewer.truffle.dynamicobject.DynamicObjectLanguageHeapFragment;
-import java.util.Iterator;
+import org.graalvm.visualvm.lib.jfluid.heap.Heap;
+import org.graalvm.visualvm.lib.jfluid.heap.Instance;
+import org.graalvm.visualvm.lib.jfluid.heap.JavaClass;
 import org.openide.util.NbBundle;
 
 /**
@@ -41,12 +42,15 @@
 class RubyHeapFragment extends DynamicObjectLanguageHeapFragment<RubyObject, RubyType> {
 
     static final String RUBY_LANG_ID = "org.truffleruby.language.RubyObjectType"; // NOI18N
+    static final String RUBY_LANG_ID1 = "org.truffleruby.interop.RubyObjectType"; // NOI18N
 
     private static final String RUBY_HEAP_ID = "ruby_heap"; // NOI18N
 
+    private final String rubyLangId;
 
-    RubyHeapFragment(RubyLanguage language, Instance langID, Heap heap) {
+    RubyHeapFragment(RubyLanguage language, JavaClass rubyLangIdClass, Instance langID, Heap heap) {
         super(RUBY_HEAP_ID, Bundle.RubyHeapFragment_Name(), fragmentDescription(langID, heap), language, heap);
+        rubyLangId = rubyLangIdClass.getName();
     }
 
 
@@ -57,12 +61,12 @@ static RubyHeapFragment fromContext(HeapContext context) {
 
     @Override
     public Iterator<Instance> getInstancesIterator() {
-        return languageInstancesIterator(RUBY_LANG_ID);
+        return languageInstancesIterator(rubyLangId);
     }
 
     @Override
     public Iterator<RubyObject> getObjectsIterator() {
-        return languageObjectsIterator(RUBY_LANG_ID);
+        return languageObjectsIterator(rubyLangId);
     }
 
 

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/ruby/RubyLanguage.java

@@ -64,10 +64,15 @@ protected RubyHeapFragment createFragment(Heap heap) {
         Instance langID = getLanguageInfo(heap, RUBY_LANGINFO_ID);
         if (langID == null) return null;
 
-        JavaClass rubyMainClass = heap.getJavaClassByName(RubyHeapFragment.RUBY_LANG_ID);
-        if (rubyMainClass == null) return null;
+        JavaClass rubyMainClass = heap.getJavaClassByName(RubyHeapFragment.RUBY_LANG_ID1);
+        if (rubyMainClass == null) {
+            rubyMainClass = heap.getJavaClassByName(RubyHeapFragment.RUBY_LANG_ID);
+            if (rubyMainClass == null) {
+                return null;
+            }
+        }
 
-        return new RubyHeapFragment(this, langID, heap);
+        return new RubyHeapFragment(this, rubyMainClass, langID, heap);
     }
 
 

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/ruby/RubyObject.java

@@ -26,6 +26,7 @@
 
 import org.graalvm.visualvm.heapviewer.truffle.dynamicobject.DynamicObject;
 import org.graalvm.visualvm.lib.jfluid.heap.Instance;
+import org.graalvm.visualvm.lib.jfluid.heap.JavaClass;
 
 /**
  *
@@ -42,12 +43,18 @@ class RubyObject extends DynamicObject {
     }
 
     boolean isRubyObject() {
-        return RubyHeapFragment.RUBY_LANG_ID.equals(getLanguageId().getName());
+        return isRubyLangId(getLanguageId());
     }
 
     static boolean isRubyObject(Instance instance) {
         return DynamicObject.isDynamicObject(instance) &&
-               RubyHeapFragment.RUBY_LANG_ID.equals(DynamicObject.getLanguageId(instance).getName());
+               isRubyLangId(DynamicObject.getLanguageId(instance));
     }
 
+    private static boolean isRubyLangId(JavaClass langIdClass) {
+        String className = langIdClass.getName();
+
+        return RubyHeapFragment.RUBY_LANG_ID.equals(className) || RubyHeapFragment.RUBY_LANG_ID1.equals(className);
+    }
+
 }