Mercurial > hg > openjdk > hsx16
changeset 860:36b5611220a7
6863216: Clean up debugging debris inadvertently pushed with 6700789
Summary: Anti-delta for debugging debris that was inadvertently pushed.
Reviewed-by: kvn, tonyp
| author | ysr |
|---|---|
| date | Wed, 22 Jul 2009 18:25:00 -0700 |
| parents | 45d97a99715b |
| children | 0a83664f978b |
| files | src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp src/share/vm/opto/cfgnode.cpp |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Wed Jul 22 02:46:55 2009 -0700 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Wed Jul 22 18:25:00 2009 -0700 @@ -1655,9 +1655,8 @@ // Computes the sum of the storage used by the various regions. size_t G1CollectedHeap::used() const { - // Temporarily, until 6859911 is fixed. XXX - // assert(Heap_lock->owner() != NULL, - // "Should be owned on this thread's behalf."); + assert(Heap_lock->owner() != NULL, + "Should be owned on this thread's behalf."); size_t result = _summary_bytes_used; // Read only once in case it is set to NULL concurrently HeapRegion* hr = _cur_alloc_region;
--- a/src/share/vm/opto/cfgnode.cpp Wed Jul 22 02:46:55 2009 -0700 +++ b/src/share/vm/opto/cfgnode.cpp Wed Jul 22 18:25:00 2009 -0700 @@ -1789,7 +1789,7 @@ #ifdef _LP64 // Push DecodeN down through phi. // The rest of phi graph will transform by split EncodeP node though phis up. - if (UseNewCode && UseCompressedOops && can_reshape && progress == NULL) { + if (UseCompressedOops && can_reshape && progress == NULL) { bool may_push = true; bool has_decodeN = false; Node* in_decodeN = NULL;