1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Wed Jun 15 10:18:04 2011 -0700 1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Thu Jun 16 15:51:57 2011 -0400 1.3 @@ -446,8 +446,7 @@ 1.4 // * All allocation requests for new TLABs should go to 1.5 // allocate_new_tlab(). 1.6 // 1.7 - // * All non-TLAB allocation requests should go to mem_allocate() 1.8 - // and mem_allocate() should never be called with is_tlab == true. 1.9 + // * All non-TLAB allocation requests should go to mem_allocate(). 1.10 // 1.11 // * If either call cannot satisfy the allocation request using the 1.12 // current allocating region, they will try to get a new one. If 1.13 @@ -467,8 +466,6 @@ 1.14 virtual HeapWord* allocate_new_tlab(size_t word_size); 1.15 1.16 virtual HeapWord* mem_allocate(size_t word_size, 1.17 - bool is_noref, 1.18 - bool is_tlab, /* expected to be false */ 1.19 bool* gc_overhead_limit_was_exceeded); 1.20 1.21 // The following three methods take a gc_count_before_ret 1.22 @@ -1304,10 +1301,6 @@ 1.23 return true; 1.24 } 1.25 1.26 - // The boundary between a "large" and "small" array of primitives, in 1.27 - // words. 1.28 - virtual size_t large_typearray_limit(); 1.29 - 1.30 // Returns "true" iff the given word_size is "very large". 1.31 static bool isHumongous(size_t word_size) { 1.32 // Note this has to be strictly greater-than as the TLABs