# HG changeset patch
# User jcm
# Date 1548314650 28800
# Node ID ca6f11c5acda49871533eb7aeec8ba6aff57916b
# Parent  7ad61dce3825b5b61dd1276c49e6567e7162caee
8213825: assert(false) failed: Non-balanced monitor enter/exit! Likely JNI locking
Summary: skip sfpt optimization for Load is removed for Java Object's Markword Load.
Reviewed-by: kvn, dlong

diff -r 7ad61dce3825 -r ca6f11c5acda src/hotspot/share/opto/memnode.cpp
--- a/src/hotspot/share/opto/memnode.cpp	Wed Jan 23 20:25:30 2019 -0800
+++ b/src/hotspot/share/opto/memnode.cpp	Wed Jan 23 23:24:10 2019 -0800
@@ -1532,10 +1532,14 @@
   Node* address = in(MemNode::Address);
   bool progress = false;
 
+  bool addr_mark = ((phase->type(address)->isa_oopptr() || phase->type(address)->isa_narrowoop()) &&
+         phase->type(address)->is_ptr()->offset() == oopDesc::mark_offset_in_bytes());
+
   // Skip up past a SafePoint control.  Cannot do this for Stores because
   // pointer stores & cardmarks must stay on the same side of a SafePoint.
   if( ctrl != NULL && ctrl->Opcode() == Op_SafePoint &&
-      phase->C->get_alias_index(phase->type(address)->is_ptr()) != Compile::AliasIdxRaw ) {
+      phase->C->get_alias_index(phase->type(address)->is_ptr()) != Compile::AliasIdxRaw  &&
+      !addr_mark ) {
     ctrl = ctrl->in(0);
     set_req(MemNode::Control,ctrl);
     progress = true;