Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Wed Jul 22 02:46:55 2009 -0700
     1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Wed Jul 22 18:25:00 2009 -0700
     1.3 @@ -1655,9 +1655,8 @@
     1.4  // Computes the sum of the storage used by the various regions.
     1.5  
     1.6  size_t G1CollectedHeap::used() const {
     1.7 -  // Temporarily, until 6859911 is fixed. XXX
     1.8 -  // assert(Heap_lock->owner() != NULL,
     1.9 -  //        "Should be owned on this thread's behalf.");
    1.10 +  assert(Heap_lock->owner() != NULL,
    1.11 +         "Should be owned on this thread's behalf.");
    1.12    size_t result = _summary_bytes_used;
    1.13    // Read only once in case it is set to NULL concurrently
    1.14    HeapRegion* hr = _cur_alloc_region;

     2.1 --- a/src/share/vm/opto/cfgnode.cpp	Wed Jul 22 02:46:55 2009 -0700
     2.2 +++ b/src/share/vm/opto/cfgnode.cpp	Wed Jul 22 18:25:00 2009 -0700
     2.3 @@ -1789,7 +1789,7 @@
     2.4  #ifdef _LP64
     2.5    // Push DecodeN down through phi.
     2.6    // The rest of phi graph will transform by split EncodeP node though phis up.
     2.7 -  if (UseNewCode && UseCompressedOops && can_reshape && progress == NULL) {
     2.8 +  if (UseCompressedOops && can_reshape && progress == NULL) {
     2.9      bool may_push = true;
    2.10      bool has_decodeN = false;
    2.11      Node* in_decodeN = NULL;