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

     1.1 --- a/src/share/vm/gc_interface/collectedHeap.inline.hpp	Wed Jun 15 10:18:04 2011 -0700
     1.2 +++ b/src/share/vm/gc_interface/collectedHeap.inline.hpp	Thu Jun 16 15:51:57 2011 -0400
     1.3 @@ -122,7 +122,7 @@
     1.4    post_allocation_notify(klass, (oop)obj);
     1.5  }
     1.6  
     1.7 -HeapWord* CollectedHeap::common_mem_allocate_noinit(size_t size, bool is_noref, TRAPS) {
     1.8 +HeapWord* CollectedHeap::common_mem_allocate_noinit(size_t size, TRAPS) {
     1.9  
    1.10    // Clear unhandled oops for memory allocation.  Memory allocation might
    1.11    // not take out a lock if from tlab, so clear here.
    1.12 @@ -133,7 +133,6 @@
    1.13      return NULL;  // caller does a CHECK_0 too
    1.14    }
    1.15  
    1.16 -  // We may want to update this, is_noref objects might not be allocated in TLABs.
    1.17    HeapWord* result = NULL;
    1.18    if (UseTLAB) {
    1.19      result = CollectedHeap::allocate_from_tlab(THREAD, size);
    1.20 @@ -145,8 +144,6 @@
    1.21    }
    1.22    bool gc_overhead_limit_was_exceeded = false;
    1.23    result = Universe::heap()->mem_allocate(size,
    1.24 -                                          is_noref,
    1.25 -                                          false,
    1.26                                            &gc_overhead_limit_was_exceeded);
    1.27    if (result != NULL) {
    1.28      NOT_PRODUCT(Universe::heap()->
    1.29 @@ -183,8 +180,8 @@
    1.30    }
    1.31  }
    1.32  
    1.33 -HeapWord* CollectedHeap::common_mem_allocate_init(size_t size, bool is_noref, TRAPS) {
    1.34 -  HeapWord* obj = common_mem_allocate_noinit(size, is_noref, CHECK_NULL);
    1.35 +HeapWord* CollectedHeap::common_mem_allocate_init(size_t size, TRAPS) {
    1.36 +  HeapWord* obj = common_mem_allocate_noinit(size, CHECK_NULL);
    1.37    init_obj(obj, size);
    1.38    return obj;
    1.39  }
    1.40 @@ -255,7 +252,7 @@
    1.41    debug_only(check_for_valid_allocation_state());
    1.42    assert(!Universe::heap()->is_gc_active(), "Allocation during gc not allowed");
    1.43    assert(size >= 0, "int won't convert to size_t");
    1.44 -  HeapWord* obj = common_mem_allocate_init(size, false, CHECK_NULL);
    1.45 +  HeapWord* obj = common_mem_allocate_init(size, CHECK_NULL);
    1.46    post_allocation_setup_obj(klass, obj, size);
    1.47    NOT_PRODUCT(Universe::heap()->check_for_bad_heap_word_value(obj, size));
    1.48    return (oop)obj;
    1.49 @@ -268,20 +265,7 @@
    1.50    debug_only(check_for_valid_allocation_state());
    1.51    assert(!Universe::heap()->is_gc_active(), "Allocation during gc not allowed");
    1.52    assert(size >= 0, "int won't convert to size_t");
    1.53 -  HeapWord* obj = common_mem_allocate_init(size, false, CHECK_NULL);
    1.54 -  post_allocation_setup_array(klass, obj, size, length);
    1.55 -  NOT_PRODUCT(Universe::heap()->check_for_bad_heap_word_value(obj, size));
    1.56 -  return (oop)obj;
    1.57 -}
    1.58 -
    1.59 -oop CollectedHeap::large_typearray_allocate(KlassHandle klass,
    1.60 -                                            int size,
    1.61 -                                            int length,
    1.62 -                                            TRAPS) {
    1.63 -  debug_only(check_for_valid_allocation_state());
    1.64 -  assert(!Universe::heap()->is_gc_active(), "Allocation during gc not allowed");
    1.65 -  assert(size >= 0, "int won't convert to size_t");
    1.66 -  HeapWord* obj = common_mem_allocate_init(size, true, CHECK_NULL);
    1.67 +  HeapWord* obj = common_mem_allocate_init(size, CHECK_NULL);
    1.68    post_allocation_setup_array(klass, obj, size, length);
    1.69    NOT_PRODUCT(Universe::heap()->check_for_bad_heap_word_value(obj, size));
    1.70    return (oop)obj;