src/share/vm/memory/universe.hpp

*** 103,116 ****
  
   public:
    Method* get_Method();
  };
  
! // For UseCompressedOops and UseCompressedKlassPointers.
  struct NarrowPtrStruct {
!   // Base address for oop/klass-within-java-object materialization.
!   // NULL if using wide oops/klasses or zero based narrow oops/klasses.
    address _base;
    // Number of shift bits for encoding/decoding narrow ptrs.
    // 0 if using wide ptrs or zero based unscaled narrow ptrs,
    // LogMinObjAlignmentInBytes/LogKlassAlignmentInBytes otherwise.
    int     _shift;
--- 103,116 ----
  
   public:
    Method* get_Method();
  };
  
! // For UseCompressedOops.
  struct NarrowPtrStruct {
!   // Base address for oop-within-java-object materialization.
!   // NULL if using wide oops or zero based narrow oops.
    address _base;
    // Number of shift bits for encoding/decoding narrow ptrs.
    // 0 if using wide ptrs or zero based unscaled narrow ptrs,
    // LogMinObjAlignmentInBytes/LogKlassAlignmentInBytes otherwise.
    int     _shift;
*** 134,143 ****
--- 134,144 ----
    friend class ClassLoader;
    friend class Arguments;
    friend class SystemDictionary;
    friend class VMStructs;
    friend class VM_PopulateDumpSharedSpace;
+   friend class Metaspace;
  
    friend jint  universe_init();
    friend void  universe2_init();
    friend bool  universe_post_init();
  
*** 212,224 ****
    static struct NarrowPtrStruct _narrow_oop;
    // For UseCompressedKlassPointers.
    static struct NarrowPtrStruct _narrow_klass;
    static address _narrow_ptrs_base;
  
-   // Aligned size of the metaspace.
-   static size_t _class_metaspace_size;
- 
    // array of dummy objects used with +FullGCAlot
    debug_only(static objArrayOop _fullgc_alot_dummy_array;)
    // index of next entry to clear
    debug_only(static int         _fullgc_alot_dummy_next;)
  
--- 213,222 ----
*** 266,284 ****
    }
    static void     set_narrow_oop_use_implicit_null_checks(bool use) {
      assert(UseCompressedOops, "no compressed ptrs?");
      _narrow_oop._use_implicit_null_checks   = use;
    }
-   static bool     reserve_metaspace_helper(bool with_base = false);
-   static ReservedHeapSpace reserve_heap_metaspace(size_t heap_size, size_t alignment, bool& contiguous);
- 
-   static size_t  class_metaspace_size() {
-     return _class_metaspace_size;
-   }
-   static void    set_class_metaspace_size(size_t metaspace_size) {
-     _class_metaspace_size = metaspace_size;
-   }
  
    // Debugging
    static int _verify_count;                           // number of verifies done
    // True during call to verify().  Should only be set/cleared in verify().
    static bool _verify_in_progress;
--- 264,273 ----