# HG changeset patch
# User ysr
# Date 1219256638 25200
# Node ID 331eaa715e58f133ad165a1cd3af1550a75288b7
# Parent  92e12124e774d574cf9a8ffab4213ada882488b8# Parent  1e5d20c344083174cf6edf67bc17cf8087d1a369
Merge

diff -r 92e12124e774 -r 331eaa715e58 src/share/vm/memory/compactingPermGenGen.cpp
--- a/src/share/vm/memory/compactingPermGenGen.cpp	Wed Aug 20 01:30:32 2008 -0700
+++ b/src/share/vm/memory/compactingPermGenGen.cpp	Wed Aug 20 11:23:58 2008 -0700
@@ -421,30 +421,6 @@
 }
 
 
-
-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 -r 92e12124e774 -r 331eaa715e58 src/share/vm/memory/compactingPermGenGen.hpp
--- a/src/share/vm/memory/compactingPermGenGen.hpp	Wed Aug 20 01:30:32 2008 -0700
+++ b/src/share/vm/memory/compactingPermGenGen.hpp	Wed Aug 20 11:23:58 2008 -0700
@@ -183,8 +183,6 @@
   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();