Skip to content

Commit f90bda6

Browse files
committed
recognize renamed LanguageCache class
1 parent 7c1fee3 commit f90bda6

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleLanguage.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ public Icon createLanguageIcon(Icon icon) {
109109

110110
private static final String LANGUAGE_INFO_FQN = "com.oracle.truffle.api.nodes.LanguageInfo"; // NOI18N
111111
private static final String LANGUAGE_CACHE_FQN = "com.oracle.truffle.api.vm.LanguageCache"; // NOI18N
112+
private static final String LANGUAGE_CACHE1_FQN = "com.oracle.truffle.polyglot.LanguageCache"; // NOI18N
112113
private static final String NAME_FIELD = "name"; // NOI18N
113114

114115
protected static Instance getLanguageInfo(Heap heap, String languageID) {
@@ -119,7 +120,10 @@ protected static Instance getLanguageInfo(Heap heap, String languageID) {
119120
JavaClass langInfoClass = heap.getJavaClassByName(LANGUAGE_INFO_FQN);
120121
if (!checkLangClass(langInfoClass)) {
121122
langInfoClass = heap.getJavaClassByName(LANGUAGE_CACHE_FQN);
122-
if (!checkLangClass(langInfoClass)) return null;
123+
if (!checkLangClass(langInfoClass)) {
124+
langInfoClass = heap.getJavaClassByName(LANGUAGE_CACHE1_FQN);
125+
if (!checkLangClass(langInfoClass)) return null;
126+
}
123127
}
124128

125129
// search the language

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,15 @@ public class TruffleDetailsProvider extends DetailsProvider.Basic {
4343
private static final String ENT_OPTIMIZED_CALL_TARGET_MASK = "com.oracle.graal.truffle.OptimizedCallTarget"; // NOI18N
4444
private static final String LANG_INFO_MASK = "com.oracle.truffle.api.nodes.LanguageInfo"; // NOI18N
4545
private static final String LANG_CACHE_MASK = "com.oracle.truffle.api.vm.LanguageCache"; // NOI18N
46+
private static final String LANG_CACHE1_MASK = "com.oracle.truffle.polyglot.LanguageCache"; // NOI18N
4647
private static final String POLYGLOT_MASK = "com.oracle.truffle.api.vm.PolyglotLanguage"; // NOI18N
4748
private static final String INSTRUMENT_INFO_MASK = "com.oracle.truffle.api.InstrumentInfo"; // NOI18N
4849
private static final String NATIVE_ROOT_MASK = "com.oracle.truffle.nfi.LibFFIFunctionMessageResolutionForeign$ExecuteLibFFIFunctionSubNode$EXECUTERootNode"; // NOI18N
4950

5051
public TruffleDetailsProvider() {
5152
super(DEFAULT_CALL_TARGET_MASK, OPTIMIZED_CALL_TARGET_MASK, OPTIMIZED_CALL_TARGET1_MASK,
5253
ENT_OPTIMIZED_CALL_TARGET_MASK, LANG_INFO_MASK, LANG_CACHE_MASK,
53-
POLYGLOT_MASK, INSTRUMENT_INFO_MASK, NATIVE_ROOT_MASK);
54+
LANG_CACHE1_MASK, POLYGLOT_MASK, INSTRUMENT_INFO_MASK, NATIVE_ROOT_MASK);
5455
}
5556

5657
public String getDetailsString(String className, Instance instance, Heap heap) {
@@ -81,7 +82,8 @@ public String getDetailsString(String className, Instance instance, Heap heap) {
8182
return DetailsUtils.getInstanceFieldString(instance, "name", heap); // NOI18N
8283
}
8384
}
84-
if (LANG_INFO_MASK.equals(className) || LANG_CACHE_MASK.equals(className)) {
85+
if (LANG_INFO_MASK.equals(className) || LANG_CACHE_MASK.equals(className)
86+
|| LANG_CACHE1_MASK.equals(className)) {
8587
String name = DetailsUtils.getInstanceFieldString(instance, "name", heap); // NOI18N
8688
String version = DetailsUtils.getInstanceFieldString(instance, "version", heap); // NOI18N
8789

0 commit comments

Comments
 (0)