From 48967a4119862b6ff71256cf33537f5909ff74ba Mon Sep 17 00:00:00 2001 From: linxiang Date: Sat, 18 Sep 2021 16:10:05 +0800 Subject: [PATCH] modify GetHeapObjectSize() to GetCommittedSize() Signed-off-by: linxiang --- ecmascript/mem/heap.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/ecmascript/mem/heap.cpp b/ecmascript/mem/heap.cpp index be2844958c..38ba365dfd 100644 --- a/ecmascript/mem/heap.cpp +++ b/ecmascript/mem/heap.cpp @@ -152,10 +152,7 @@ void Heap::CollectGarbage(TriggerGCType gcType) SetNewSpaceMaximumCapacity(SEMI_SPACE_SIZE_CAPACITY); ResetAppStartup(); } else { - if (CheckAndTriggerCompressGC()) { - compressCollector_->RunPhases(); - RecomputeLimits(); - } else { + if (!CheckAndTriggerCompressGC()) { semiSpaceCollector_->RunPhases(); } } @@ -233,7 +230,7 @@ void Heap::RecomputeLimits() bool Heap::CheckAndTriggerOldGC() { - if (oldSpace_->GetHeapObjectSize() <= oldSpaceAllocLimit_) { + if (oldSpace_->GetCommittedSize() <= oldSpaceAllocLimit_) { return false; } CollectGarbage(TriggerGCType::OLD_GC); @@ -242,7 +239,7 @@ bool Heap::CheckAndTriggerOldGC() bool Heap::CheckAndTriggerCompressGC() { - if (oldSpace_->GetHeapObjectSize() <= oldSpaceAllocLimit_) { + if (oldSpace_->GetCommittedSize() <= oldSpaceAllocLimit_) { return false; } CollectGarbage(TriggerGCType::COMPRESS_FULL_GC); @@ -251,7 +248,7 @@ bool Heap::CheckAndTriggerCompressGC() bool Heap::CheckAndTriggerNonMovableGC() { - if (nonMovableSpace_->GetHeapObjectSize() <= DEFAULT_NON_MOVABLE_SPACE_LIMIT) { + if (nonMovableSpace_->GetCommittedSize() <= DEFAULT_NON_MOVABLE_SPACE_LIMIT) { return false; } CollectGarbage(TriggerGCType::NON_MOVE_GC); -- Gitee