--- a/src/hotspot/share/classfile/javaClasses.cpp Tue May 14 11:28:44 2019 -0400
+++ b/src/hotspot/share/classfile/javaClasses.cpp Tue May 14 11:29:18 2019 -0400
@@ -569,19 +569,19 @@
return result;
}
-Symbol* java_lang_String::as_symbol(oop java_string, TRAPS) {
+Symbol* java_lang_String::as_symbol(oop java_string) {
typeArrayOop value = 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);
if (!is_latin1) {
jchar* base = (length == 0) ? NULL : value->char_at_addr(0);
- Symbol* sym = SymbolTable::lookup_unicode(base, length, THREAD);
+ Symbol* sym = SymbolTable::new_symbol(base, length);
return sym;
} else {
ResourceMark rm;
jbyte* position = (length == 0) ? NULL : value->byte_at_addr(0);
const char* base = UNICODE::as_utf8(position, length);
- Symbol* sym = SymbolTable::lookup(base, length, THREAD);
+ Symbol* sym = SymbolTable::new_symbol(base, length);
return sym;
}
}
@@ -1443,7 +1443,7 @@
if (is_instance) st->print(";");
}
-Symbol* java_lang_Class::as_signature(oop java_class, bool intern_if_not_found, TRAPS) {
+Symbol* java_lang_Class::as_signature(oop java_class, bool intern_if_not_found) {
assert(java_lang_Class::is_instance(java_class), "must be a Class object");
Symbol* name;
if (is_primitive(java_class)) {
@@ -1464,7 +1464,7 @@
if (!intern_if_not_found) {
name = SymbolTable::probe(sigstr, siglen);
} else {
- name = SymbolTable::new_symbol(sigstr, siglen, THREAD);
+ name = SymbolTable::new_symbol(sigstr, siglen);
}
}
}
@@ -1895,7 +1895,7 @@
PRESERVE_EXCEPTION_MARK; // Keep original exception
oop detailed_message = java_lang_Throwable::message(throwable);
if (detailed_message != NULL) {
- return java_lang_String::as_symbol(detailed_message, THREAD);
+ return java_lang_String::as_symbol(detailed_message);
}
return NULL;
}
@@ -3703,7 +3703,7 @@
java_lang_Class::print_signature(rtype(mt), st);
}
-Symbol* java_lang_invoke_MethodType::as_signature(oop mt, bool intern_if_not_found, TRAPS) {
+Symbol* java_lang_invoke_MethodType::as_signature(oop mt, bool intern_if_not_found) {
ResourceMark rm;
stringStream buffer(128);
print_signature(mt, &buffer);
@@ -3713,7 +3713,7 @@
if (!intern_if_not_found) {
name = SymbolTable::probe(sigstr, siglen);
} else {
- name = SymbolTable::new_symbol(sigstr, siglen, THREAD);
+ name = SymbolTable::new_symbol(sigstr, siglen);
}
return name;
}
@@ -4375,11 +4375,11 @@
bool JavaClasses::check_offset(const char *klass_name, int hardcoded_offset, const char *field_name, const char* field_sig) {
EXCEPTION_MARK;
fieldDescriptor fd;
- TempNewSymbol klass_sym = SymbolTable::new_symbol(klass_name, CATCH);
+ TempNewSymbol klass_sym = SymbolTable::new_symbol(klass_name);
Klass* k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH);
InstanceKlass* ik = InstanceKlass::cast(k);
- TempNewSymbol f_name = SymbolTable::new_symbol(field_name, CATCH);
- TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig, CATCH);
+ TempNewSymbol f_name = SymbolTable::new_symbol(field_name);
+ TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig);
if (!ik->find_local_field(f_name, f_sig, &fd)) {
tty->print_cr("Nonstatic field %s.%s not found", klass_name, field_name);
return false;