RVECTOR_MASK - fallback to logical value of 'data' field

thurka · thurka · commit bde9b6cdadd8 · 2020-06-17T11:46:38.000+02:00
diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RDetailsProvider.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RDetailsProvider.java
@@ -131,7 +131,11 @@ public String getDetailsString(String className, Instance instance, Heap heap) {
                 }
                 return "Size: " + size + (complete && size>0 ? ", no NAs" : "") +  refString; // NOI18N
             }
-            return getScalar(instance, heap);
+            String scalar = getScalar(instance, heap);
+            if (scalar != null) {
+                return scalar;
+            }
+            return DetailsUtils.getInstanceFieldString(instance, "data", heap);
         }
         if (RSYMBOL_MASK.equals(className)) {
             Instance name = (Instance) instance.getValueOfField("name");   // NOI18N

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,11 @@ public String getDetailsString(String className, Instance instance, Heap heap) {`
`131`	`131`	`}`
`132`	`132`	`return "Size: " + size + (complete && size>0 ? ", no NAs" : "") + refString; // NOI18N`
`133`	`133`	`}`
`134`		`- return getScalar(instance, heap);`
	`134`	`+ String scalar = getScalar(instance, heap);`
	`135`	`+ if (scalar != null) {`
	`136`	`+ return scalar;`
	`137`	`+ }`
	`138`	`+ return DetailsUtils.getInstanceFieldString(instance, "data", heap);`
`135`	`139`	`}`
`136`	`140`	`if (RSYMBOL_MASK.equals(className)) {`
`137`	`141`	`Instance name = (Instance) instance.getValueOfField("name"); // NOI18N`