Mercurial > hg > openjdk > hsx14

changeset 510:b8b99c79a6b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6810653: Change String cache class used by Hotspot from String to StringValue Summary: Change String to StringValue when enabling UseStringCache. Reviewed-by: coleenp, never
author phh
date Thu, 26 Feb 2009 19:59:04 -0500
parents 71c275bfba43
children ee8007011fd0 69f370534475
files src/share/vm/classfile/vmSymbols.hpp src/share/vm/runtime/thread.cpp
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/vmSymbols.hpp	Wed Feb 25 21:40:24 2009 -0800
+++ b/src/share/vm/classfile/vmSymbols.hpp	Thu Feb 26 19:59:04 2009 -0500
@@ -49,6 +49,7 @@
   template(java_lang_Object,                          "java/lang/Object")                         \
   template(java_lang_Class,                           "java/lang/Class")                          \
   template(java_lang_String,                          "java/lang/String")                         \
+  template(java_lang_StringValue,                     "java/lang/StringValue")                    \
   template(java_lang_Thread,                          "java/lang/Thread")                         \
   template(java_lang_ThreadGroup,                     "java/lang/ThreadGroup")                    \
   template(java_lang_Cloneable,                       "java/lang/Cloneable")                      \
--- a/src/share/vm/runtime/thread.cpp	Wed Feb 25 21:40:24 2009 -0800
+++ b/src/share/vm/runtime/thread.cpp	Thu Feb 26 19:59:04 2009 -0500
@@ -3007,11 +3007,11 @@
       }
 
       if (UseStringCache) {
-        // Forcibly initialize java/lang/String and mutate the private
+        // Forcibly initialize java/lang/StringValue and mutate the private
         // static final "stringCacheEnabled" field before we start creating instances
-        klassOop k_o = SystemDictionary::resolve_or_null(vmSymbolHandles::java_lang_String(), Handle(), Handle(), CHECK_0);
+        klassOop k_o = SystemDictionary::resolve_or_null(vmSymbolHandles::java_lang_StringValue(), Handle(), Handle(), CHECK_0);
         KlassHandle k = KlassHandle(THREAD, k_o);
-        guarantee(k.not_null(), "Must find java/lang/String");
+        guarantee(k.not_null(), "Must find java/lang/StringValue");
         instanceKlassHandle ik = instanceKlassHandle(THREAD, k());
         ik->initialize(CHECK_0);
         fieldDescriptor fd;