提交 7ecf5216 编写于 作者: J jcoomes

6742207: jdk7 32-bit windows build failed running pack200

Summary: 6730514 inadvertently disabled perm gen expansion; reenable
Reviewed-by: ysr
上级 f50a0412
...@@ -421,30 +421,6 @@ size_t CompactingPermGenGen::max_capacity() const { ...@@ -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 // No young generation references, clear this generation's main space's
// card table entries. Do NOT clear the card table entries for the // card table entries. Do NOT clear the card table entries for the
// read-only space (always clear) or the read-write space (valuable // read-only space (always clear) or the read-write space (valuable
......
...@@ -183,8 +183,6 @@ public: ...@@ -183,8 +183,6 @@ public:
void compact(); void compact();
void post_compact(); void post_compact();
size_t contiguous_available() const; size_t contiguous_available() const;
bool grow_by(size_t bytes);
virtual bool grow_to_reserved();
void clear_remembered_set(); void clear_remembered_set();
void invalidate_remembered_set(); void invalidate_remembered_set();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册