Skip to content

Commit daa6625

Browse files
committed
logical value for CharSXPWrapper added
1 parent 68cdf48 commit daa6625

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RDetailsProvider.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,15 @@ public class RDetailsProvider extends DetailsProvider.Basic {
5858
private static final String RS4OBJECT_MASK = "com.oracle.truffle.r.runtime.data.RS4Object"; // NOI18N
5959
private static final String RNULL_MASK = "com.oracle.truffle.r.runtime.data.RNull"; // NOI18N
6060
private static final String RENVIRONMENT_MASK = "com.oracle.truffle.r.runtime.env.REnvironment+"; // NOI18N
61+
private static final String CHARSXPWRAPPER_FQN = "com.oracle.truffle.r.runtime.data.CharSXPWrapper"; // NOI18N
6162

6263
private static final byte LOGICAL_TRUE = 1;
6364
private static final byte LOGICAL_FALSE = 0;
6465
private static final byte LOGICAL_NA = -1;
6566

6667
public RDetailsProvider() {
6768
super(RVECTOR_MASK, RABSTRACT_VECTOR_MASK, RSCALAR_VECTOR_MASK, RINT_SEQUENCE_FQN, RWRAPPER_MASK,
68-
RSYMBOL_MASK, RFUNCTION_MASK, RS4OBJECT_MASK, RNULL_MASK, RENVIRONMENT_MASK);
69+
RSYMBOL_MASK, RFUNCTION_MASK, RS4OBJECT_MASK, RNULL_MASK, RENVIRONMENT_MASK, CHARSXPWRAPPER_FQN);
6970
}
7071

7172
public String getDetailsString(String className, Instance instance, Heap heap) {
@@ -200,7 +201,10 @@ public String getDetailsString(String className, Instance instance, Heap heap) {
200201
return name;
201202
}
202203
}
203-
return null;
204+
if (CHARSXPWRAPPER_FQN.equals(className)) {
205+
return DetailsUtils.getInstanceFieldString(instance, "contents", heap); // NOI18N
206+
}
207+
return null;
204208
}
205209

206210
private String getRClassName(Instance instance, Heap heap) {

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RObject.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ class RObject extends TruffleObject.InstanceBased {
9292
"RPromise", "promise", // NOI18N
9393
"RExternalPtr", "externalptr", // NOI18N
9494
"StdConnections", "connection", // NOI18N
95-
"RS4Object", "S4"}; // NOI18N
95+
"RS4Object", "S4", // NOI18N
96+
"CharSXPWrapper", "charsxp_wrapper"}; // NOI18N
9697

9798
private static Map<String,String> typeMap;
9899

0 commit comments

Comments
 (0)