test/hotspot/gtest/memory/test_virtualspace.cpp

*** 102,112 ****
      ASSERT_PRED2(is_size_aligned, size, os::vm_allocation_granularity()) << "Must be at least AG aligned";
      ASSERT_PRED2(is_size_aligned, size, alignment) << "Must be at least AG aligned";
  
      bool large = maybe_large && UseLargePages && size >= os::large_page_size();
  
!     ReservedSpace rs(size, alignment, large, false);
      MemoryReleaser releaser(&rs);
  
      EXPECT_TRUE(rs.base() != NULL) << "rs.special: " << rs.special();
      EXPECT_EQ(size, rs.size()) << "rs.special: " << rs.special();
  
--- 102,112 ----
      ASSERT_PRED2(is_size_aligned, size, os::vm_allocation_granularity()) << "Must be at least AG aligned";
      ASSERT_PRED2(is_size_aligned, size, alignment) << "Must be at least AG aligned";
  
      bool large = maybe_large && UseLargePages && size >= os::large_page_size();
  
!     ReservedSpace rs(size, alignment, large);
      MemoryReleaser releaser(&rs);
  
      EXPECT_TRUE(rs.base() != NULL) << "rs.special: " << rs.special();
      EXPECT_EQ(size, rs.size()) << "rs.special: " << rs.special();
  
*** 216,226 ****
          return ReservedSpace(reserve_size_aligned);
        case Disable:
        case Commit:
          return ReservedSpace(reserve_size_aligned,
                               os::vm_allocation_granularity(),
!                              /* large */ false, /* exec */ false);
      }
    }
  
    bool initialize_virtual_space(VirtualSpace& vs, ReservedSpace rs, TestLargePages mode) {
      switch(mode) {
--- 216,226 ----
          return ReservedSpace(reserve_size_aligned);
        case Disable:
        case Commit:
          return ReservedSpace(reserve_size_aligned,
                               os::vm_allocation_granularity(),
!                              /* large */ false);
      }
    }
  
    bool initialize_virtual_space(VirtualSpace& vs, ReservedSpace rs, TestLargePages mode) {
      switch(mode) {
*** 295,305 ****
      return;
    }
  
    size_t large_page_size = os::large_page_size();
  
!   ReservedSpace reserved(large_page_size, large_page_size, true, false);
    ReservedSpaceReleaser releaser(&reserved);
    ASSERT_TRUE(reserved.is_reserved());
  
    VirtualSpace vs;
    ASSERT_TRUE(vs.initialize(reserved, 0)) << "Failed to initialize VirtualSpace";
--- 295,305 ----
      return;
    }
  
    size_t large_page_size = os::large_page_size();
  
!   ReservedSpace reserved(large_page_size, large_page_size, true);
    ReservedSpaceReleaser releaser(&reserved);
    ASSERT_TRUE(reserved.is_reserved());
  
    VirtualSpace vs;
    ASSERT_TRUE(vs.initialize(reserved, 0)) << "Failed to initialize VirtualSpace";