src/share/vm/memory/universe.hpp

rev 5190 : 8015107: NPG: Use consistent naming for metaspace concepts

*** 179,189 ****
    // The particular choice of collected heap.
    static CollectedHeap* _collectedHeap;
  
    // For UseCompressedOops.
    static struct NarrowPtrStruct _narrow_oop;
!   // For UseCompressedKlassPointers.
    static struct NarrowPtrStruct _narrow_klass;
    static address _narrow_ptrs_base;
  
    // array of dummy objects used with +FullGCAlot
    debug_only(static objArrayOop _fullgc_alot_dummy_array;)
--- 179,189 ----
    // The particular choice of collected heap.
    static CollectedHeap* _collectedHeap;
  
    // For UseCompressedOops.
    static struct NarrowPtrStruct _narrow_oop;
!   // For UseCompressedClassPointers.
    static struct NarrowPtrStruct _narrow_klass;
    static address _narrow_ptrs_base;
  
    // array of dummy objects used with +FullGCAlot
    debug_only(static objArrayOop _fullgc_alot_dummy_array;)
*** 227,237 ****
    static void     set_narrow_oop_base(address base) {
      assert(UseCompressedOops, "no compressed oops?");
      _narrow_oop._base    = base;
    }
    static void     set_narrow_klass_base(address base) {
!     assert(UseCompressedKlassPointers, "no compressed klass ptrs?");
      _narrow_klass._base   = base;
    }
    static void     set_narrow_oop_use_implicit_null_checks(bool use) {
      assert(UseCompressedOops, "no compressed ptrs?");
      _narrow_oop._use_implicit_null_checks   = use;
--- 227,237 ----
    static void     set_narrow_oop_base(address base) {
      assert(UseCompressedOops, "no compressed oops?");
      _narrow_oop._base    = base;
    }
    static void     set_narrow_klass_base(address base) {
!     assert(UseCompressedClassPointers, "no compressed klass ptrs?");
      _narrow_klass._base   = base;
    }
    static void     set_narrow_oop_use_implicit_null_checks(bool use) {
      assert(UseCompressedOops, "no compressed ptrs?");
      _narrow_oop._use_implicit_null_checks   = use;
*** 351,361 ****
    static address  narrow_oop_base()                       { return  _narrow_oop._base; }
    static bool  is_narrow_oop_base(void* addr)             { return (narrow_oop_base() == (address)addr); }
    static int      narrow_oop_shift()                      { return  _narrow_oop._shift; }
    static bool     narrow_oop_use_implicit_null_checks()   { return  _narrow_oop._use_implicit_null_checks; }
  
!   // For UseCompressedKlassPointers
    static address  narrow_klass_base()                     { return  _narrow_klass._base; }
    static bool  is_narrow_klass_base(void* addr)           { return (narrow_klass_base() == (address)addr); }
    static int      narrow_klass_shift()                    { return  _narrow_klass._shift; }
    static bool     narrow_klass_use_implicit_null_checks() { return  _narrow_klass._use_implicit_null_checks; }
  
--- 351,361 ----
    static address  narrow_oop_base()                       { return  _narrow_oop._base; }
    static bool  is_narrow_oop_base(void* addr)             { return (narrow_oop_base() == (address)addr); }
    static int      narrow_oop_shift()                      { return  _narrow_oop._shift; }
    static bool     narrow_oop_use_implicit_null_checks()   { return  _narrow_oop._use_implicit_null_checks; }
  
!   // For UseCompressedClassPointers
    static address  narrow_klass_base()                     { return  _narrow_klass._base; }
    static bool  is_narrow_klass_base(void* addr)           { return (narrow_klass_base() == (address)addr); }
    static int      narrow_klass_shift()                    { return  _narrow_klass._shift; }
    static bool     narrow_klass_use_implicit_null_checks() { return  _narrow_klass._use_implicit_null_checks; }