Mercurial > hg > truffle
comparison src/share/vm/runtime/thread.cpp @ 693:2c1dbb844832
Merge
author | acorn |
---|---|
date | Thu, 02 Apr 2009 18:17:03 -0400 |
parents | eca19a8425b5 |
children | b9fba36710f2 |
comparison
equal
deleted
inserted
replaced
692:23276f80d930 | 693:2c1dbb844832 |
---|---|
3005 k()->bool_field_put(fd.offset(), true); | 3005 k()->bool_field_put(fd.offset(), true); |
3006 } | 3006 } |
3007 } | 3007 } |
3008 | 3008 |
3009 if (UseStringCache) { | 3009 if (UseStringCache) { |
3010 // Forcibly initialize java/lang/String and mutate the private | 3010 // Forcibly initialize java/lang/StringValue and mutate the private |
3011 // static final "stringCacheEnabled" field before we start creating instances | 3011 // static final "stringCacheEnabled" field before we start creating instances |
3012 klassOop k_o = SystemDictionary::resolve_or_null(vmSymbolHandles::java_lang_String(), Handle(), Handle(), CHECK_0); | 3012 klassOop k_o = SystemDictionary::resolve_or_null(vmSymbolHandles::java_lang_StringValue(), Handle(), Handle(), CHECK_0); |
3013 KlassHandle k = KlassHandle(THREAD, k_o); | 3013 // Possible that StringValue isn't present: if so, silently don't break |
3014 guarantee(k.not_null(), "Must find java/lang/String"); | 3014 if (k_o != NULL) { |
3015 instanceKlassHandle ik = instanceKlassHandle(THREAD, k()); | 3015 KlassHandle k = KlassHandle(THREAD, k_o); |
3016 ik->initialize(CHECK_0); | 3016 instanceKlassHandle ik = instanceKlassHandle(THREAD, k()); |
3017 fieldDescriptor fd; | 3017 ik->initialize(CHECK_0); |
3018 // Possible we might not find this field; if so, don't break | 3018 fieldDescriptor fd; |
3019 if (ik->find_local_field(vmSymbols::stringCacheEnabled_name(), vmSymbols::bool_signature(), &fd)) { | 3019 // Possible we might not find this field: if so, silently don't break |
3020 k()->bool_field_put(fd.offset(), true); | 3020 if (ik->find_local_field(vmSymbols::stringCacheEnabled_name(), vmSymbols::bool_signature(), &fd)) { |
3021 k()->bool_field_put(fd.offset(), true); | |
3022 } | |
3021 } | 3023 } |
3022 } | 3024 } |
3023 } | 3025 } |
3024 | 3026 |
3025 // Initialize java_lang.System (needed before creating the thread) | 3027 // Initialize java_lang.System (needed before creating the thread) |