Skip to content
Permalink
Browse files
8262426: Change TRAPS to Thread* for find_constrained_instance_or_arr…
…ay_klass()

Reviewed-by: coleenp
  • Loading branch information
Harold Seigel committed Feb 26, 2021
1 parent d06d6f5 commit 05c11bcb32c0393dd6ab4d3a83b12fddb0dcdc62
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
@@ -445,8 +445,7 @@ ciKlass* ciEnv::get_klass_by_name_impl(ciKlass* accessing_klass,
MutexLocker ml(Compile_lock);
Klass* kls;
if (!require_local) {
kls = SystemDictionary::find_constrained_instance_or_array_klass(sym, loader,
CHECK_AND_CLEAR_(fail_type));
kls = SystemDictionary::find_constrained_instance_or_array_klass(sym, loader, THREAD);
} else {
kls = SystemDictionary::find_instance_or_array_klass(sym, loader, domain);
}
@@ -1888,7 +1888,7 @@ void SystemDictionary::update_dictionary(unsigned int hash,
// loader constraints might know about a class that isn't fully loaded
// yet and these will be ignored.
Klass* SystemDictionary::find_constrained_instance_or_array_klass(
Symbol* class_name, Handle class_loader, TRAPS) {
Symbol* class_name, Handle class_loader, Thread* THREAD) {

// First see if it has been loaded directly.
// Force the protection domain to be null. (This removes protection checks.)
@@ -171,7 +171,7 @@ class SystemDictionary : AllStatic {
// to local linkage and access checks.
static Klass* find_constrained_instance_or_array_klass(Symbol* class_name,
Handle class_loader,
TRAPS);
Thread* THREAD);

static void classes_do(MetaspaceClosure* it);
// Iterate over all methods in all klasses
@@ -1160,7 +1160,7 @@ Klass* JVMCIRuntime::get_klass_by_name_impl(Klass*& accessing_klass,
ttyUnlocker ttyul; // release tty lock to avoid ordering problems
MutexLocker ml(Compile_lock);
if (!require_local) {
found_klass = SystemDictionary::find_constrained_instance_or_array_klass(sym, loader, CHECK_NULL);
found_klass = SystemDictionary::find_constrained_instance_or_array_klass(sym, loader, THREAD);
} else {
found_klass = SystemDictionary::find_instance_or_array_klass(sym, loader, domain);
}

0 comments on commit 05c11bc

Please sign in to comment.