src/share/vm/opto/lcm.cpp

*** 56,65 ****
--- 56,68 ----
    } else {
      assert(_nodes[_nodes.size()-2] == proj, "proj is one or the other");
      not_null_block = _succs[0];
      null_block     = _succs[1];
    }
+   while (null_block->is_Empty() == Block::empty_with_goto) {
+     null_block     = null_block->_succs[0];
+   }
  
    // Search the exception block for an uncommon trap.
    // (See Parse::do_if and Parse::do_ifnull for the reason
    // we need an uncommon trap.  Briefly, we need a way to
    // detect failure of this optimization, as in 6366351.)
*** 147,156 ****
--- 150,163 ----
      {
        intptr_t offset = 0;
        const TypePtr *adr_type = NULL;  // Do not need this return value here
        const Node* base = mach->get_base_and_disp(offset, adr_type);
        if (base == NULL || base == NodeSentinel) {
+         // Narrow oop address doesn't have base, only index
+         if( val->bottom_type()->isa_narrowoop() &&
+             MacroAssembler::needs_explicit_null_check(offset) )
+           continue;             // Give up if offset is beyond page size
          // cannot reason about it; is probably not implicit null exception
        } else {
          const TypePtr* tptr = base->bottom_type()->is_ptr();
          // Give up if offset is not a compile-time constant
          if( offset == Type::OffsetBot || tptr->_offset == Type::OffsetBot )