src/share/vm/runtime/objectMonitor.inline.hpp

rev 8961 : [mq]: diff-shenandoah.patch

@@ -64,19 +64,27 @@
   _object = NULL;
 }
 
 
 inline void* ObjectMonitor::object() const {
+  /*
+  if (_object != (cast_to_oop<intptr_t>(-1))) {
+    assert(oop(_object) == oopDesc::bs()->resolve_and_maybe_copy_oop(oop(_object)), "expect to-space copy");
+  }
+  */
   return _object;
 }
 
 inline void* ObjectMonitor::object_addr() {
   return (void *)(&_object);
 }
 
 inline void ObjectMonitor::set_object(void* obj) {
   _object = obj;
+  if (_object != (cast_to_oop<intptr_t>(-1))) {
+    assert(oop(_object) == oopDesc::bs()->resolve_and_maybe_copy_oop(oop(_object)), "expect to-space copy");
+  }
 }
 
 inline bool ObjectMonitor::check(TRAPS) {
   if (THREAD != _owner) {
     if (THREAD->is_lock_owned((address) _owner)) {