1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp Wed Jun 15 10:18:04 2011 -0700
1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp Thu Jun 16 15:51:57 2011 -0400
1.3 @@ -182,12 +182,12 @@
1.4
1.5 // Allocation. We report all successful allocations to the size policy
1.6 // Note that the perm gen does not use this method, and should not!
1.7 -HeapWord* PSOldGen::allocate(size_t word_size, bool is_tlab) {
1.8 +HeapWord* PSOldGen::allocate(size_t word_size) {
1.9 assert_locked_or_safepoint(Heap_lock);
1.10 - HeapWord* res = allocate_noexpand(word_size, is_tlab);
1.11 + HeapWord* res = allocate_noexpand(word_size);
1.12
1.13 if (res == NULL) {
1.14 - res = expand_and_allocate(word_size, is_tlab);
1.15 + res = expand_and_allocate(word_size);
1.16 }
1.17
1.18 // Allocations in the old generation need to be reported
1.19 @@ -199,13 +199,12 @@
1.20 return res;
1.21 }
1.22
1.23 -HeapWord* PSOldGen::expand_and_allocate(size_t word_size, bool is_tlab) {
1.24 - assert(!is_tlab, "TLAB's are not supported in PSOldGen");
1.25 +HeapWord* PSOldGen::expand_and_allocate(size_t word_size) {
1.26 expand(word_size*HeapWordSize);
1.27 if (GCExpandToAllocateDelayMillis > 0) {
1.28 os::sleep(Thread::current(), GCExpandToAllocateDelayMillis, false);
1.29 }
1.30 - return allocate_noexpand(word_size, is_tlab);
1.31 + return allocate_noexpand(word_size);
1.32 }
1.33
1.34 HeapWord* PSOldGen::expand_and_cas_allocate(size_t word_size) {
