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

     1.1 --- a/src/share/vm/gc_interface/collectedHeap.cpp	Fri Mar 23 10:53:19 2012 -0400
     1.2 +++ b/src/share/vm/gc_interface/collectedHeap.cpp	Fri Mar 23 15:28:24 2012 +0100
     1.3 @@ -85,7 +85,7 @@
     1.4    const size_t max_len = size_t(arrayOopDesc::max_array_length(T_INT));
     1.5    const size_t elements_per_word = HeapWordSize / sizeof(jint);
     1.6    _filler_array_max_size = align_object_size(filler_array_hdr_size() +
     1.7 -                                             max_len * elements_per_word);
     1.8 +                                             max_len / elements_per_word);
     1.9  
    1.10    _barrier_set = NULL;
    1.11    _is_gc_active = false;
    1.12 @@ -303,10 +303,6 @@
    1.13    return align_object_size(filler_array_hdr_size()); // align to MinObjAlignment
    1.14  }
    1.15  
    1.16 -size_t CollectedHeap::filler_array_max_size() {
    1.17 -  return _filler_array_max_size;
    1.18 -}
    1.19 -
    1.20  #ifdef ASSERT
    1.21  void CollectedHeap::fill_args_check(HeapWord* start, size_t words)
    1.22  {
    1.23 @@ -333,6 +329,7 @@
    1.24  
    1.25    const size_t payload_size = words - filler_array_hdr_size();
    1.26    const size_t len = payload_size * HeapWordSize / sizeof(jint);
    1.27 +  assert((int)len >= 0, err_msg("size too large " SIZE_FORMAT " becomes %d", words, (int)len));
    1.28  
    1.29    // Set the length first for concurrent GC.
    1.30    ((arrayOop)start)->set_length((int)len);