archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 01:24:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8261127: Cleanup THREAD/TRAPS/CHECK usage in CDS code

Browse source 
Reviewed-by: iklam, coleenp
This commit is contained in:
David Holmes 2021-02-08 23:16:47 +00:00
parent 7451962849
commit f03e839e48
9 changed files with 69 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/hotspot/share/classfile/stringTable.cpp
View file

@ -717,18 +717,18 @@ oop StringTable::lookup_shared(const jchar* name, int len, unsigned int hash) {
return _shared_table.lookup(name, hash, len);
}
oop StringTable::create_archived_string(oop s, Thread* THREAD) {
oop StringTable::create_archived_string(oop s) {
assert(DumpSharedSpaces, "this function is only used with -Xshare:dump");
assert(java_lang_String::is_instance(s), "sanity");
assert(!HeapShared::is_archived_object(s), "sanity");
oop new_s = NULL;
typeArrayOop v = java_lang_String::value_no_keepalive(s);
typeArrayOop new_v = (typeArrayOop)HeapShared::archive_heap_object(v, THREAD);
typeArrayOop new_v = (typeArrayOop)HeapShared::archive_heap_object(v);
if (new_v == NULL) {
return NULL;
}
new_s = HeapShared::archive_heap_object(s, THREAD);
new_s = HeapShared::archive_heap_object(s);
if (new_s == NULL) {
return NULL;
}
@ -745,7 +745,7 @@ public:
bool do_entry(oop s, bool value_ignored) {
assert(s != NULL, "sanity");
unsigned int hash = java_lang_String::hash_code(s);
oop new_s = StringTable::create_archived_string(s, Thread::current());
oop new_s = StringTable::create_archived_string(s);
if (new_s == NULL) {
return true;
}