Skip to content
Snippets Groups Projects
Commit 3aa5d4ca authored by Rico Wind's avatar Rico Wind
Browse files

Version 1.3.0-dev.7.11

svn merge -c 34647 https://dart.googlecode.com/svn/branches/bleeding_edge trunk

git-svn-id: http://dart.googlecode.com/svn/trunk@34756 260f80e4-7a28-3924-810f-c04153c831b5
parent 6afcfde5
No related merge requests found
......@@ -207,7 +207,7 @@ void Heap::CollectGarbage(Space space, ApiCallbacks api_callbacks) {
new_space_->Scavenge(invoke_api_callbacks);
RecordAfterGC();
PrintStats();
if (new_space_->HadPromotionFailure()) {
if (new_space_->HadPromotionFailure() || old_space_->NeedExternalGC()) {
// Old collections should call the API callbacks.
CollectGarbage(kOld, kInvokeApiCallbacks);
}
......
......@@ -221,6 +221,10 @@ class PageSpace {
return page_space_controller_.is_enabled();
}
bool NeedExternalGC() {
return used_in_words_ + ExternalInWords() > max_capacity_in_words_;
}
void WriteProtect(bool read_only);
void AddGCTime(int64_t micros) {
......
......@@ -28,4 +28,4 @@ MAJOR 1
MINOR 3
PATCH 0
PRERELEASE 7
PRERELEASE_PATCH 10
PRERELEASE_PATCH 11
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment