1.1 --- a/src/share/vm/gc_interface/collectedHeap.hpp Fri Jan 30 14:17:52 2009 -0800
1.2 +++ b/src/share/vm/gc_interface/collectedHeap.hpp Sat Jan 31 00:15:00 2009 -0800
1.3 @@ -42,6 +42,7 @@
1.4 class CollectedHeap : public CHeapObj {
1.5 friend class VMStructs;
1.6 friend class IsGCActiveMark; // Block structured external access to _is_gc_active
1.7 + friend class constantPoolCacheKlass; // allocate() method inserts is_conc_safe
1.8
1.9 #ifdef ASSERT
1.10 static int _fire_out_of_memory_count;
1.11 @@ -82,8 +83,6 @@
1.12 // Reinitialize tlabs before resuming mutators.
1.13 virtual void resize_all_tlabs();
1.14
1.15 - debug_only(static void check_for_valid_allocation_state();)
1.16 -
1.17 protected:
1.18 // Allocate from the current thread's TLAB, with broken-out slow path.
1.19 inline static HeapWord* allocate_from_tlab(Thread* thread, size_t size);
1.20 @@ -142,6 +141,7 @@
1.21 PRODUCT_RETURN;
1.22 virtual void check_for_non_bad_heap_word_value(HeapWord* addr, size_t size)
1.23 PRODUCT_RETURN;
1.24 + debug_only(static void check_for_valid_allocation_state();)
1.25
1.26 public:
1.27 enum Name {
