Mercurial > hg > graal-compiler

comparison src/share/vm/gc_implementation/g1/heapRegion.cpp @ 10408:836a62f43af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents c92949b1ec8a 3a4805ad0005
children 6b0fd0964b87
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
137 _failures = true; 137 _failures = true;
138 failed = true; 138 failed = true;
139 _n_failures++; 139 _n_failures++;
140 } 140 }
141 141
142 if (!_g1h->full_collection()) { 142 if (!_g1h->full_collection() || G1VerifyRSetsDuringFullGC) {
143 HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); 143 HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
144 HeapRegion* to = _g1h->heap_region_containing(obj); 144 HeapRegion* to = _g1h->heap_region_containing(obj);
145 if (from != NULL && to != NULL && 145 if (from != NULL && to != NULL &&
146 from != to && 146 from != to &&
147 !to->isHumongous()) { 147 !to->isHumongous()) {