test/hotspot/gtest/gc/shared/test_oopStorage.cpp

*** 528,538 ****
      EXPECT_EQ(OopStorage::INVALID_ENTRY, _storage.allocation_status(ptr));
    }
  }
  #endif // DISABLE_GARBAGE_ALLOCATION_STATUS_TESTS
  
! class OopStorageTest::CountingIterateClosure VALUE_OBJ_CLASS_SPEC {
  public:
    size_t _const_count;
    size_t _const_non_null;
    size_t _non_const_count;
    size_t _non_const_non_null;
--- 528,538 ----
      EXPECT_EQ(OopStorage::INVALID_ENTRY, _storage.allocation_status(ptr));
    }
  }
  #endif // DISABLE_GARBAGE_ALLOCATION_STATUS_TESTS
  
! class OopStorageTest::CountingIterateClosure {
  public:
    size_t _const_count;
    size_t _const_non_null;
    size_t _non_const_count;
    size_t _non_const_non_null;
*** 670,680 ****
  const unsigned char OopStorageTestIteration::mark_released;
  const unsigned char OopStorageTestIteration::mark_invalid;
  const unsigned char OopStorageTestIteration::mark_const;
  const unsigned char OopStorageTestIteration::mark_non_const;
  
! class OopStorageTestIteration::VerifyState VALUE_OBJ_CLASS_SPEC {
  public:
    unsigned char _expected_mark;
    const oop* const* _entries;
    unsigned char (&_states)[_max_workers][_max_entries];
  
--- 670,680 ----
  const unsigned char OopStorageTestIteration::mark_released;
  const unsigned char OopStorageTestIteration::mark_invalid;
  const unsigned char OopStorageTestIteration::mark_const;
  const unsigned char OopStorageTestIteration::mark_non_const;
  
! class OopStorageTestIteration::VerifyState {
  public:
    unsigned char _expected_mark;
    const oop* const* _entries;
    unsigned char (&_states)[_max_workers][_max_entries];
  
*** 740,750 ****
      }
      return false;
    }
  };
  
! class OopStorageTestIteration::VerifyFn VALUE_OBJ_CLASS_SPEC {
  public:
    VerifyFn(VerifyState* state, uint worker_id = 0) :
      _state(state),
      _worker_id(worker_id)
    {}
--- 740,750 ----
      }
      return false;
    }
  };
  
! class OopStorageTestIteration::VerifyFn {
  public:
    VerifyFn(VerifyState* state, uint worker_id = 0) :
      _state(state),
      _worker_id(worker_id)
    {}
*** 760,770 ****
  private:
    VerifyState* _state;
    uint _worker_id;
  };
  
! class OopStorageTestIteration::VerifyClosure VALUE_OBJ_CLASS_SPEC {
  public:
    VerifyClosure(VerifyState* state, uint worker_id = 0) :
      _state(state),
      _worker_id(worker_id)
    {}
--- 760,770 ----
  private:
    VerifyState* _state;
    uint _worker_id;
  };
  
! class OopStorageTestIteration::VerifyClosure {
  public:
    VerifyClosure(VerifyState* state, uint worker_id = 0) :
      _state(state),
      _worker_id(worker_id)
    {}