< prev index next >

src/hotspot/share/gc/parallel/psPromotionManager.hpp

Print this page

        

@@ -49,14 +49,11 @@
 class PSOldGen;
 class ParCompactionManager;
 
 class PSPromotionManager {
   friend class PSScavenge;
-  friend class ScavengeRootsTask;
   friend class PSRefProcTaskExecutor;
-  friend class PSRefProcTask;
-
  private:
   static PaddedEnd<PSPromotionManager>* _manager_array;
   static OopStarTaskQueueSet*           _stack_array_depth;
   static PreservedMarksSet*             _preserved_marks_set;
   static PSOldGen*                      _old_gen;

@@ -176,11 +173,11 @@
   bool old_gen_is_full()               { return _old_gen_is_full; }
   void set_old_gen_is_full(bool state) { _old_gen_is_full = state; }
 
   // Promotion methods
   template<bool promote_immediately> oop copy_to_survivor_space(oop o);
-  oop oop_promotion_failed(oop obj, markWord obj_mark);
+  oop oop_promotion_failed(oop obj, markOop obj_mark);
 
   void reset();
   void register_preserved_marks(PreservedMarks* preserved_marks);
   static void restore_preserved_marks();
 
< prev index next >