src/share/vm/memory/binaryTreeDictionary.cpp

rev 3861 : imported patch gcc47.patch

*** 288,308 ****
  void TreeList<Chunk_t, FreeList_t>::return_chunk_at_tail(TreeChunk<Chunk_t, FreeList_t>* chunk) {
    assert(chunk != NULL, "returning NULL chunk");
    assert(chunk->list() == this, "list should be set for chunk");
    assert(tail() != NULL, "The tree list is embedded in the first chunk");
    // which means that the list can never be empty.
!   assert(!verify_chunk_in_free_list(chunk), "Double entry");
    assert(head() == NULL || head()->prev() == NULL, "list invariant");
    assert(tail() == NULL || tail()->next() == NULL, "list invariant");
  
    Chunk_t* fc = tail();
    fc->link_after(chunk);
    this->link_tail(chunk);
  
    assert(!tail() || size() == tail()->size(), "Wrong sized chunk in list");
    FreeList_t<Chunk_t>::increment_count();
!   debug_only(increment_returned_bytes_by(chunk->size()*sizeof(HeapWord));)
    assert(head() == NULL || head()->prev() == NULL, "list invariant");
    assert(tail() == NULL || tail()->next() == NULL, "list invariant");
  }
  
  // Add this chunk at the head of the list.  "At the head of the list"
--- 288,308 ----
  void TreeList<Chunk_t, FreeList_t>::return_chunk_at_tail(TreeChunk<Chunk_t, FreeList_t>* chunk) {
    assert(chunk != NULL, "returning NULL chunk");
    assert(chunk->list() == this, "list should be set for chunk");
    assert(tail() != NULL, "The tree list is embedded in the first chunk");
    // which means that the list can never be empty.
!   assert(! this->verify_chunk_in_free_list(chunk), "Double entry");
    assert(head() == NULL || head()->prev() == NULL, "list invariant");
    assert(tail() == NULL || tail()->next() == NULL, "list invariant");
  
    Chunk_t* fc = tail();
    fc->link_after(chunk);
    this->link_tail(chunk);
  
    assert(!tail() || size() == tail()->size(), "Wrong sized chunk in list");
    FreeList_t<Chunk_t>::increment_count();
!   debug_only(this->increment_returned_bytes_by(chunk->size()*sizeof(HeapWord));)
    assert(head() == NULL || head()->prev() == NULL, "list invariant");
    assert(tail() == NULL || tail()->next() == NULL, "list invariant");
  }
  
  // Add this chunk at the head of the list.  "At the head of the list"
*** 312,322 ****
  template <class Chunk_t, template <class> class FreeList_t>
  void TreeList<Chunk_t, FreeList_t>::return_chunk_at_head(TreeChunk<Chunk_t, FreeList_t>* chunk) {
    assert(chunk->list() == this, "list should be set for chunk");
    assert(head() != NULL, "The tree list is embedded in the first chunk");
    assert(chunk != NULL, "returning NULL chunk");
!   assert(!verify_chunk_in_free_list(chunk), "Double entry");
    assert(head() == NULL || head()->prev() == NULL, "list invariant");
    assert(tail() == NULL || tail()->next() == NULL, "list invariant");
  
    Chunk_t* fc = head()->next();
    if (fc != NULL) {
--- 312,322 ----
  template <class Chunk_t, template <class> class FreeList_t>
  void TreeList<Chunk_t, FreeList_t>::return_chunk_at_head(TreeChunk<Chunk_t, FreeList_t>* chunk) {
    assert(chunk->list() == this, "list should be set for chunk");
    assert(head() != NULL, "The tree list is embedded in the first chunk");
    assert(chunk != NULL, "returning NULL chunk");
!   assert(! this->verify_chunk_in_free_list(chunk), "Double entry");
    assert(head() == NULL || head()->prev() == NULL, "list invariant");
    assert(tail() == NULL || tail()->next() == NULL, "list invariant");
  
    Chunk_t* fc = head()->next();
    if (fc != NULL) {
*** 326,336 ****
      this->link_tail(chunk);
    }
    head()->link_after(chunk);
    assert(!head() || size() == head()->size(), "Wrong sized chunk in list");
    FreeList_t<Chunk_t>::increment_count();
!   debug_only(increment_returned_bytes_by(chunk->size()*sizeof(HeapWord));)
    assert(head() == NULL || head()->prev() == NULL, "list invariant");
    assert(tail() == NULL || tail()->next() == NULL, "list invariant");
  }
  
  template <class Chunk_t, template <class> class FreeList_t>
--- 326,336 ----
      this->link_tail(chunk);
    }
    head()->link_after(chunk);
    assert(!head() || size() == head()->size(), "Wrong sized chunk in list");
    FreeList_t<Chunk_t>::increment_count();
!   debug_only(this->increment_returned_bytes_by(chunk->size()*sizeof(HeapWord));)
    assert(head() == NULL || head()->prev() == NULL, "list invariant");
    assert(tail() == NULL || tail()->next() == NULL, "list invariant");
  }
  
  template <class Chunk_t, template <class> class FreeList_t>