GH-437 logical value for LLVMFunctionStartNode, LLVMForeignFunctionCallNode and subclasses of MethodDescriptorRoot added

Author: thurka

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/details/TruffleDetailsProvider.java

@@ -60,7 +60,8 @@ public class TruffleDetailsProvider extends DetailsProvider.Basic {
     private static final String TSTRING_MASK = "com.oracle.truffle.api.strings.AbstractTruffleString+"; // NOI18N
     private static final String TS_LONG_MASK = "com.oracle.truffle.api.strings.AbstractTruffleString$LazyLong"; // NOI18N
     private static final String TS_CONCAT_MASK = "com.oracle.truffle.api.strings.AbstractTruffleString$LazyConcat"; // NOI18N
-
+    private static final String LLVM_NODE_MASK = "com.oracle.truffle.llvm.runtime.nodes.func.LLVMFunctionStartNode"; // NOI18N
+    private static final String LLVM_FOREIGN_NODE_MASK = "com.oracle.truffle.llvm.runtime.interop.LLVMForeignFunctionCallNode"; // NOI18N
     private static final String TS_ENCODING_CLASS = "com.oracle.truffle.api.strings.TruffleString$Encoding"; // NOI18N
     private static final Object CACHE_LOCK = new Object();
     private static WeakHashMap<Heap,Map<Byte,Encoding>> CACHE;
@@ -69,7 +70,8 @@ public TruffleDetailsProvider() {
         super(DEFAULT_CALL_TARGET_MASK, OPTIMIZED_CALL_TARGET_MASK, OPTIMIZED_CALL_TARGET1_MASK,
                 ENT_OPTIMIZED_CALL_TARGET_MASK, LANG_INFO_MASK, LANG_CACHE_MASK,
                 LANG_CACHE1_MASK, POLYGLOT_MASK, INSTRUMENT_INFO_MASK, NATIVE_ROOT_MASK,
-                NODE_MASK, TSTRING_MASK, TS_LONG_MASK, TS_CONCAT_MASK);
+                NODE_MASK, TSTRING_MASK, TS_LONG_MASK, TS_CONCAT_MASK, LLVM_NODE_MASK,
+                LLVM_FOREIGN_NODE_MASK);
     }
 
     public String getDetailsString(String className, Instance instance) {
@@ -186,6 +188,19 @@ public String getDetailsString(String className, Instance instance) {
             }
             return value;
         }
+        if (LLVM_NODE_MASK.equals(className)) {
+            String name = DetailsUtils.getInstanceFieldString(instance, "originalName"); // NOI18N
+            if (name == null) name = DetailsUtils.getInstanceFieldString(instance, "name"); // NOI18N
+            return name;
+        }
+        if (LLVM_FOREIGN_NODE_MASK.equals(className)) {
+            Instance classNode = (Instance) instance.getValueOfField("callNode"); // NOI18N
+
+            if (classNode != null) {
+                String value = DetailsUtils.getInstanceFieldString(classNode, "callTarget");    // NOI18N
+                if (value != null) return "LLVM: "+value;        // NOI18N
+            }
+        }
         return null;
     }
 

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/python/PythonDetailsProvider.java

@@ -75,6 +75,7 @@ public class PythonDetailsProvider extends DetailsProvider.Basic {
     private static final String PGFROOT_MASK = "com.oracle.graal.python.nodes.generator.GeneratorFunctionRootNode"; // NOI18N
     private static final String PTFROOT_MASK = "com.oracle.graal.python.nodes.control.TopLevelExceptionHandler";    // NOI18N
     private static final String DICT_KEY_MASK = "com.oracle.graal.python.builtins.objects.common.EconomicMapStorage$DictKey";   // NOI18N
+    private static final String METHOD_NODE_MASK = "com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes$MethodDescriptorRoot+"; //NOI18N
 
     public PythonDetailsProvider() {
         super(PCLASS_MASK,PMANAGEDCLASS_MASK,PFUNCTION_MASK,PNONE_MASK,PLIST_MASK,
@@ -84,7 +85,7 @@ public PythonDetailsProvider() {
               PMETHOD_MASK, PDECORATEDMETHOD_MASK, PCELL_MASK, BYTE_STORAGE_MASK,
               GETSET_DESCRIPTOR_MASK,PBUILTIN_CLASSTYPE_MASK, PLAZY_STRING_MASK,
               PRANGE_MASK, PSOCKET_MASK, PFROOT_MASK, PBFROOT_MASK, PMFROOT_MASK,
-              PGFROOT_MASK, PTFROOT_MASK, DICT_KEY_MASK);
+              PGFROOT_MASK, PTFROOT_MASK, DICT_KEY_MASK, METHOD_NODE_MASK);
     }
 
     public String getDetailsString(String className, Instance instance) {
@@ -280,6 +281,9 @@ public String getDetailsString(String className, Instance instance) {
         if (DICT_KEY_MASK.equals(className)) {
             return DetailsUtils.getInstanceFieldString(instance, "value"); // NOI18N
         }
+        if (METHOD_NODE_MASK.equals(className)) {
+            return DetailsUtils.getInstanceFieldString(instance, "name"); // NOI18N
+        }
         return null;
     }