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

     1.1 --- a/src/share/vm/opto/escape.cpp	Wed Apr 20 09:29:00 2011 -0700
     1.2 +++ b/src/share/vm/opto/escape.cpp	Wed Apr 20 18:29:35 2011 -0700
     1.3 @@ -1437,7 +1437,10 @@
     1.4  
     1.5    // Update the memory inputs of MemNodes with the value we computed
     1.6    // in Phase 2 and move stores memory users to corresponding memory slices.
     1.7 -#ifdef ASSERT
     1.8 +
     1.9 +  // Disable memory split verification code until the fix for 6984348.
    1.10 +  // Currently it produces false negative results since it does not cover all cases.
    1.11 +#if 0 // ifdef ASSERT
    1.12    visited.Reset();
    1.13    Node_Stack old_mems(arena, _compile->unique() >> 2);
    1.14  #endif
    1.15 @@ -1447,7 +1450,7 @@
    1.16        Node *n = ptnode_adr(i)->_node;
    1.17        assert(n != NULL, "sanity");
    1.18        if (n->is_Mem()) {
    1.19 -#ifdef ASSERT
    1.20 +#if 0 // ifdef ASSERT
    1.21          Node* old_mem = n->in(MemNode::Memory);
    1.22          if (!visited.test_set(old_mem->_idx)) {
    1.23            old_mems.push(old_mem, old_mem->outcnt());
    1.24 @@ -1469,13 +1472,13 @@
    1.25        }
    1.26      }
    1.27    }
    1.28 -#ifdef ASSERT
    1.29 +#if 0 // ifdef ASSERT
    1.30    // Verify that memory was split correctly
    1.31    while (old_mems.is_nonempty()) {
    1.32      Node* old_mem = old_mems.node();
    1.33      uint  old_cnt = old_mems.index();
    1.34      old_mems.pop();
    1.35 -    assert(old_cnt = old_mem->outcnt(), "old mem could be lost");
    1.36 +    assert(old_cnt == old_mem->outcnt(), "old mem could be lost");
    1.37    }
    1.38  #endif
    1.39  }