Mercurial > hg > graal-jvmci-8

comparison src/share/vm/opto/escape.cpp @ 23660:b5f3a471e646

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Doug Simon <doug.simon@oracle.com>
date Wed, 01 Jun 2016 00:11:44 +0200
parents dd9cc155639c 3f47111161d7
children f13e777eb255
comparison
equal deleted inserted replaced
23411:d7cf78885a3a 23660:b5f3a471e646
3181 // Note: we don't want to use MergeMemStream here because we only want to 3181 // Note: we don't want to use MergeMemStream here because we only want to
3182 // scan inputs which exist at the start, not ones we add during processing. 3182 // scan inputs which exist at the start, not ones we add during processing.
3183 // Note 2: MergeMem may already contains instance memory slices added 3183 // Note 2: MergeMem may already contains instance memory slices added
3184 // during find_inst_mem() call when memory nodes were processed above. 3184 // during find_inst_mem() call when memory nodes were processed above.
3185 igvn->hash_delete(nmm); 3185 igvn->hash_delete(nmm);
3186 uint nslices = nmm->req(); 3186 uint nslices = MIN2(nmm->req(), new_index_start);
3187 for (uint i = Compile::AliasIdxRaw+1; i < nslices; i++) { 3187 for (uint i = Compile::AliasIdxRaw+1; i < nslices; i++) {
3188 Node* mem = nmm->in(i); 3188 Node* mem = nmm->in(i);
3189 Node* cur = NULL; 3189 Node* cur = NULL;
3190 if (mem == NULL || mem->is_top()) 3190 if (mem == NULL || mem->is_top())
3191 continue; 3191 continue;