--- a/src/hotspot/share/classfile/javaClasses.cpp Thu Sep 20 18:39:53 2018 +0200
+++ b/src/hotspot/share/classfile/javaClasses.cpp Tue Sep 18 21:47:14 2018 -0700
@@ -241,7 +241,7 @@
return h_obj;
}
-Handle java_lang_String::create_from_unicode(jchar* unicode, int length, TRAPS) {
+Handle java_lang_String::create_from_unicode(const jchar* unicode, int length, TRAPS) {
bool is_latin1 = CompactStrings && UNICODE::is_latin1(unicode, length);
Handle h_obj = basic_create(length, is_latin1, CHECK_NH);
typeArrayOop buffer = value(h_obj());
@@ -271,7 +271,7 @@
return h_obj;
}
-oop java_lang_String::create_oop_from_unicode(jchar* unicode, int length, TRAPS) {
+oop java_lang_String::create_oop_from_unicode(const jchar* unicode, int length, TRAPS) {
Handle h_obj = create_from_unicode(unicode, length, CHECK_0);
return h_obj();
}
@@ -643,7 +643,7 @@
}
}
-bool java_lang_String::equals(oop java_string, jchar* chars, int len) {
+bool java_lang_String::equals(oop java_string, const jchar* chars, int len) {
assert(java_string->klass() == SystemDictionary::String_klass(),
"must be java_string");
typeArrayOop value = java_lang_String::value_no_keepalive(java_string);
@@ -2569,7 +2569,7 @@
// Fill in class name
ResourceMark rm(THREAD);
const char* str = holder->external_name();
- oop classname = StringTable::intern((char*) str, CHECK);
+ oop classname = StringTable::intern(str, CHECK);
java_lang_StackTraceElement::set_declaringClass(element(), classname);
java_lang_StackTraceElement::set_declaringClassObject(element(), holder->java_mirror());