8046210: Missing memory barrier when reading init_lock
Reviewed-by: fparain, dcubed, mdoerr
Contributed-by: Bill Pittore <bill.pittore@oracle.com>
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp Tue Sep 02 09:51:24 2014 -0700
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp Tue Sep 02 21:27:08 2014 -0400
@@ -460,6 +460,8 @@
oop InstanceKlass::init_lock() const {
// return the init lock from the mirror
oop lock = java_lang_Class::init_lock(java_mirror());
+ // Prevent reordering with any access of initialization state
+ OrderAccess::loadload();
assert((oop)lock != NULL || !is_not_initialized(), // initialized or in_error state
"only fully initialized state can have a null lock");
return lock;