--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Fri Sep 05 12:36:37 2014 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Tue Sep 09 00:05:25 2014 +0200
@@ -322,9 +322,10 @@
HeapRegion::HeapRegion(uint hrm_index,
G1BlockOffsetSharedArray* sharedOffsetArray,
- MemRegion mr, AllocationContext_t context) :
+ MemRegion mr) :
G1OffsetTableContigSpace(sharedOffsetArray, mr),
- _hrm_index(hrm_index), _allocation_context(context),
+ _hrm_index(hrm_index),
+ _allocation_context(AllocationContext::system()),
_humongous_start_region(NULL),
_in_collection_set(false),
_next_in_special_set(NULL),