Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/opto/cfgnode.cpp	Mon May 06 19:49:23 2013 -0700
     1.2 +++ b/src/share/vm/opto/cfgnode.cpp	Wed May 08 15:08:01 2013 -0700
     1.3 @@ -806,7 +806,7 @@
     1.4        Node *in = ophi->in(i);
     1.5        if (in == NULL || igvn->type(in) == Type::TOP)
     1.6          continue;
     1.7 -      Node *opt = MemNode::optimize_simple_memory_chain(in, at, igvn);
     1.8 +      Node *opt = MemNode::optimize_simple_memory_chain(in, t_oop, NULL, igvn);
     1.9        PhiNode *optphi = opt->is_Phi() ? opt->as_Phi() : NULL;
    1.10        if (optphi != NULL && optphi->adr_type() == TypePtr::BOTTOM) {
    1.11          opt = node_map[optphi->_idx];
    1.12 @@ -1921,7 +1921,7 @@
    1.13      const TypePtr* at = adr_type();
    1.14      for( uint i=1; i<req(); ++i ) {// For all paths in
    1.15        Node *ii = in(i);
    1.16 -      Node *new_in = MemNode::optimize_memory_chain(ii, at, phase);
    1.17 +      Node *new_in = MemNode::optimize_memory_chain(ii, at, NULL, phase);
    1.18        if (ii != new_in ) {
    1.19          set_req(i, new_in);
    1.20          progress = this;