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

     1.1 --- a/src/share/vm/opto/escape.cpp	Thu Oct 08 09:38:24 2015 +0200
     1.2 +++ b/src/share/vm/opto/escape.cpp	Mon Aug 31 17:20:08 2015 +0200
     1.3 @@ -3183,7 +3183,7 @@
     1.4      // Note 2: MergeMem may already contains instance memory slices added
     1.5      // during find_inst_mem() call when memory nodes were processed above.
     1.6      igvn->hash_delete(nmm);
     1.7 -    uint nslices = nmm->req();
     1.8 +    uint nslices = MIN2(nmm->req(), new_index_start);
     1.9      for (uint i = Compile::AliasIdxRaw+1; i < nslices; i++) {
    1.10        Node* mem = nmm->in(i);
    1.11        Node* cur = NULL;