Commit3a35158

committed

8274338: com/sun/jdi/RedefineCrossEvent.java failed "assert(m != __null) failed: NULL mirror"

Reviewed-by: phhBackport-of: 172aed1a2d75756b140cb723133ac5fb67f7745e

1 parent1d2fee0 commit3a35158Copy full SHA for 3a35158

File tree

-0

lines changed

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,9 @@ void ClassLoaderData::methods_do(void f(Method*)) {`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`voidClassLoaderData::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`	`+`
`345`	`348`	`// Lock-free access requires load_acquire`
`346`	`349`	`for (Klass* k =OrderAccess::load_acquire(&_klasses); k !=NULL; k = k->next_link()) {`
`347`	`350`	`// Do not filter ArrayKlass oops here...`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1627,6 +1627,9 @@ void MetaspaceShared::link_and_cleanup_shared_classes(TRAPS) {`
`1627`	`1627`	`// We need to iterate because verification may cause additional classes`
`1628`	`1628`	`// to be loaded.`
`1629`	`1629`	`LinkSharedClassesClosurelink_closure(THREAD);`
	`1630`	`+// To get a consistent list of classes we need MultiArray_lock to ensure`
	`1631`	`+// array classes aren't created.`
	`1632`	`+ MutexLockerlocker(MultiArray_lock);`
`1630`	`1633`	`do {`
`1631`	`1634`	`link_closure.reset();`
`1632`	`1635`	`ClassLoaderDataGraph::loaded_classes_do(&link_closure);`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2378,6 +2378,9 @@ void InstanceKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handl`
`2378`	`2378`	`constants()->restore_unshareable_info(CHECK);`
`2379`	`2379`
`2380`	`2380`	`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`	`+ MutexLockerml(MultiArray_lock);`
`2381`	`2384`	`// Array classes have null protection domain.`
`2382`	`2385`	`// --> see ArrayKlass::complete_create_array_klass()`
`2383`	`2386`	`array_klasses()->restore_unshareable_info(ClassLoaderData::the_null_class_loader_data(),Handle(), CHECK);`

Comments

(0)