stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8217522: Missing barriers in some java_lang_String assertion code after JDK-8217442

Browse Source 
Reviewed-by: shade, redestad
This commit is contained in:
Zhengyu Gu 2019-01-23 10:50:27 -05:00
parent c99285ea9e
commit d783c7a2d8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hotspot/share/classfile/javaClasses.cpp
View File

@ -578,7 +578,7 @@ Symbol* java_lang_String::as_symbol_or_null(oop java_string) {
}
int java_lang_String::utf8_length(oop java_string, typeArrayOop value) {
assert(oopDesc::equals_raw(value, java_lang_String::value(java_string)),
assert(oopDesc::equals(value, java_lang_String::value(java_string)),
"value must be same as java_lang_String::value(java_string)");
int length = java_lang_String::length(java_string, value);
if (length == 0) {
@ -610,7 +610,7 @@ char* java_lang_String::as_utf8_string(oop java_string) {
}
char* java_lang_String::as_utf8_string(oop java_string, typeArrayOop value, char* buf, int buflen) {
assert(oopDesc::equals_raw(value, java_lang_String::value(java_string)),
assert(oopDesc::equals(value, java_lang_String::value(java_string)),
"value must be same as java_lang_String::value(java_string)");
int length = java_lang_String::length(java_string, value);
bool is_latin1 = java_lang_String::is_latin1(java_string);
@ -642,7 +642,7 @@ char* java_lang_String::as_utf8_string(oop java_string, int start, int len) {
}
char* java_lang_String::as_utf8_string(oop java_string, typeArrayOop value, int start, int len, char* buf, int buflen) {
assert(oopDesc::equals_raw(value, java_lang_String::value(java_string)),
assert(oopDesc::equals(value, java_lang_String::value(java_string)),
"value must be same as java_lang_String::value(java_string)");
assert(start + len <= java_lang_String::length(java_string), "just checking");
bool is_latin1 = java_lang_String::is_latin1(java_string);

2
src/hotspot/share/classfile/javaClasses.inline.hpp
View File

@ -74,7 +74,7 @@ bool java_lang_String::is_latin1(oop java_string) {
int java_lang_String::length(oop java_string, typeArrayOop value) {
assert(initialized, "Must be initialized");
assert(is_instance(java_string), "must be java_string");
assert(oopDesc::equals_raw(value, java_lang_String::value(java_string)),
assert(oopDesc::equals(value, java_lang_String::value(java_string)),
"value must be same as java_lang_String::value(java_string)");
if (value == NULL) {
return 0;