Skip to content

Commit c406da1

Browse files
committed
8276943: Backout JDK-8274338 11u backport
Reviewed-by: goetz, sgehwolf
1 parent a15fa7a commit c406da1

File tree

3 files changed

+0
-9
lines changed

3 files changed

+0
-9
lines changed

src/hotspot/share/classfile/classLoaderData.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,9 +342,6 @@ void ClassLoaderData::methods_do(void f(Method*)) {
342342
}
343343

344344
void ClassLoaderData::loaded_classes_do(KlassClosure* klass_closure) {
345-
// To call this, one must have the MultiArray_lock held, but the _klasses list still has lock free reads.
346-
assert_locked_or_safepoint(MultiArray_lock);
347-
348345
// Lock-free access requires load_acquire
349346
for (Klass* k = OrderAccess::load_acquire(&_klasses); k != NULL; k = k->next_link()) {
350347
// Do not filter ArrayKlass oops here...

src/hotspot/share/memory/metaspaceShared.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1627,9 +1627,6 @@ void MetaspaceShared::link_and_cleanup_shared_classes(TRAPS) {
16271627
// We need to iterate because verification may cause additional classes
16281628
// to be loaded.
16291629
LinkSharedClassesClosure link_closure(THREAD);
1630-
// To get a consistent list of classes we need MultiArray_lock to ensure
1631-
// array classes aren't created.
1632-
MutexLocker locker(MultiArray_lock);
16331630
do {
16341631
link_closure.reset();
16351632
ClassLoaderDataGraph::loaded_classes_do(&link_closure);

src/hotspot/share/oops/instanceKlass.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,9 +2378,6 @@ void InstanceKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handl
23782378
constants()->restore_unshareable_info(CHECK);
23792379

23802380
if (array_klasses() != NULL) {
2381-
// To get a consistent list of classes we need MultiArray_lock to ensure
2382-
// array classes aren't observed while they are being restored.
2383-
MutexLocker ml(MultiArray_lock);
23842381
// Array classes have null protection domain.
23852382
// --> see ArrayKlass::complete_create_array_klass()
23862383
array_klasses()->restore_unshareable_info(ClassLoaderData::the_null_class_loader_data(), Handle(), CHECK);

0 commit comments

Comments
 (0)