src/share/vm/opto/compile.cpp

*** 2015,2025 ****
          Node* r  = C->root();
          uint cnt = r->outcnt();
          for (uint i = 0; i < cnt; i++) {
            Node* m = r->raw_out(i);
            if (m!= NULL && m->Opcode() == Op_ConN &&
!               m->bottom_type()->is_narrowoop()->make_oopptr() == t) {
              nn = m;
              break;
            }
          }
          if (nn != NULL) {
--- 2015,2025 ----
          Node* r  = C->root();
          uint cnt = r->outcnt();
          for (uint i = 0; i < cnt; i++) {
            Node* m = r->raw_out(i);
            if (m!= NULL && m->Opcode() == Op_ConN &&
!               m->bottom_type()->make_ptr() == t) {
              nn = m;
              break;
            }
          }
          if (nn != NULL) {
*** 2068,2078 ****
              if (i >= in1->outcnt()) {
                in2 = ConNode::make(C, TypeNarrowOop::NULL_PTR);
              }
            }
          } else if (t->isa_oopptr()) {
!           in2 = ConNode::make(C, t->is_oopptr()->make_narrowoop());
          }
        }
        if( in2 != NULL ) {
          Node* cmpN = new (C, 3) CmpNNode(n->in(1)->in(1), in2);
          n->subsume_by( cmpN );
--- 2068,2078 ----
              if (i >= in1->outcnt()) {
                in2 = ConNode::make(C, TypeNarrowOop::NULL_PTR);
              }
            }
          } else if (t->isa_oopptr()) {
!           in2 = ConNode::make(C, t->make_narrowoop());
          }
        }
        if( in2 != NULL ) {
          Node* cmpN = new (C, 3) CmpNNode(n->in(1)->in(1), in2);
          n->subsume_by( cmpN );