From 7ecf52167fb21da473d87073b9cc98b78d848c3b Mon Sep 17 00:00:00 2001
From: jcoomes <unknown>
Date: Wed, 27 Aug 2008 15:41:58 -0700
Subject: [PATCH] 6742207: jdk7 32-bit windows build failed running pack200
 Summary: 6730514 inadvertently disabled perm gen expansion; reenable
 Reviewed-by: ysr

---
 src/share/vm/memory/compactingPermGenGen.cpp | 24 --------------------
 src/share/vm/memory/compactingPermGenGen.hpp |  2 --
 2 files changed, 26 deletions(-)

diff --git a/src/share/vm/memory/compactingPermGenGen.cpp b/src/share/vm/memory/compactingPermGenGen.cpp
index af94649ed..e1de54e38 100644
--- a/src/share/vm/memory/compactingPermGenGen.cpp
+++ b/src/share/vm/memory/compactingPermGenGen.cpp
@@ -421,30 +421,6 @@ size_t CompactingPermGenGen::max_capacity() const {
 }
 
 
-
-bool CompactingPermGenGen::grow_by(size_t bytes) {
-  // Don't allow _virtual_size to expand into shared spaces.
-  size_t max_bytes = _virtual_space.uncommitted_size() - _shared_space_size;
-  if (bytes > _shared_space_size) {
-    bytes = _shared_space_size;
-  }
-  return OneContigSpaceCardGeneration::grow_by(bytes);
-}
-
-
-bool CompactingPermGenGen::grow_to_reserved() {
-  // Don't allow _virtual_size to expand into shared spaces.
-  bool success = false;
-  if (_virtual_space.uncommitted_size() > _shared_space_size) {
-    size_t remaining_bytes =
-      _virtual_space.uncommitted_size() - _shared_space_size;
-    success = OneContigSpaceCardGeneration::grow_by(remaining_bytes);
-    DEBUG_ONLY(if (!success) warning("grow to reserved failed");)
-  }
-  return success;
-}
-
-
 // No young generation references, clear this generation's main space's
 // card table entries.  Do NOT clear the card table entries for the
 // read-only space (always clear) or the read-write space (valuable
diff --git a/src/share/vm/memory/compactingPermGenGen.hpp b/src/share/vm/memory/compactingPermGenGen.hpp
index 4d76e473b..3a12a8848 100644
--- a/src/share/vm/memory/compactingPermGenGen.hpp
+++ b/src/share/vm/memory/compactingPermGenGen.hpp
@@ -183,8 +183,6 @@ public:
   void compact();
   void post_compact();
   size_t contiguous_available() const;
-  bool grow_by(size_t bytes);
-  virtual bool grow_to_reserved();
 
   void clear_remembered_set();
   void invalidate_remembered_set();
-- 
GitLab