From c809962c1825311982617c45c981448b4929f5c7 Mon Sep 17 00:00:00 2001
From: lhc <liuhongchen5@huawei.com>
Date: Sat, 9 Aug 2025 20:35:35 +0800
Subject: [PATCH] Synchronous difference code

Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/ICS70N

Signed-off-by: lhc <liuhongchen5@huawei.com>
Change-Id: I29e1d76cb15cc4c386c823778edbcd0e22a679e9
---
 ecmascript/mem/free_object_list.cpp          | 69 +++++++++++++++-----
 ecmascript/mem/free_object_list.h            |  6 +-
 ecmascript/tests/concurrent_marking_test.cpp |  5 --
 3 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/ecmascript/mem/free_object_list.cpp b/ecmascript/mem/free_object_list.cpp
index d2451c6b70..85c33a4cc5 100644
--- a/ecmascript/mem/free_object_list.cpp
+++ b/ecmascript/mem/free_object_list.cpp
@@ -14,14 +14,28 @@
  */
 
 #include "ecmascript/mem/free_object_list.h"
-
 #include "ecmascript/free_object.h"
 #include "ecmascript/mem/jit_fort.h"
 
 namespace panda::ecmascript {
 template <typename T>
-FreeObjectList<T>::FreeObjectList(JitFort * fort) : sets_(new FreeObjectSet<T> *[NUMBER_OF_SETS](), NUMBER_OF_SETS),
-    lastSets_(new FreeObjectSet<T> *[NUMBER_OF_SETS](), NUMBER_OF_SETS), jitFort_(fort)
+FreeObjectList<T>::FreeObjectList() : sets_(new FreeObjectSet<T> *[NUMBER_OF_SETS](), NUMBER_OF_SETS),
+    lastSets_(new FreeObjectSet<T> *[NUMBER_OF_SETS](), NUMBER_OF_SETS)
+{
+    for (int i = 0; i < NUMBER_OF_SETS; i++) {
+        sets_[i] = nullptr;
+        lastSets_[i] = nullptr;
+    }
+    noneEmptySetBitMap_ = 0;
+}
+template FreeObjectList<FreeObject>::FreeObjectList();
+template FreeObjectList<MemDesc>::FreeObjectList();
+
+template <>
+FreeObjectList<MemDesc>::FreeObjectList(JitFort *fort)
+    : sets_(new FreeObjectSet<MemDesc> *[NUMBER_OF_SETS](), NUMBER_OF_SETS),
+    lastSets_(new FreeObjectSet<MemDesc> *[NUMBER_OF_SETS](), NUMBER_OF_SETS),
+    jitFort_(fort)
 {
     for (int i = 0; i < NUMBER_OF_SETS; i++) {
         sets_[i] = nullptr;
@@ -29,8 +43,6 @@ FreeObjectList<T>::FreeObjectList(JitFort * fort) : sets_(new FreeObjectSet<T> *
     }
     noneEmptySetBitMap_ = 0;
 }
-template FreeObjectList<FreeObject>::FreeObjectList(JitFort* fort);
-template FreeObjectList<MemDesc>::FreeObjectList(JitFort* fort);
 
 template <typename T>
 FreeObjectList<T>::~FreeObjectList()
@@ -125,25 +137,25 @@ T *FreeObjectList<T>::LookupSuitableFreeObject(size_t size)
 template FreeObject *FreeObjectList<FreeObject>::LookupSuitableFreeObject(size_t);
 
 template <typename T>
-template <typename U>
-void FreeObjectList<T>::FreeImpl(U* region, uintptr_t start, size_t size, bool isAdd)
+void FreeObjectList<T>::Free(uintptr_t start, size_t size, bool isAdd)
 {
     if (UNLIKELY(start == 0)) { // LCOV_EXCL_BR_LINE
         return;
     }
     if (UNLIKELY(size < MIN_SIZE)) { // LCOV_EXCL_BR_LINE
+        Region *region = Region::ObjectAddressToRange(reinterpret_cast<TaggedObject *>(start));
         region->IncreaseWasted(size);
         if (isAdd) {
             wasted_ += size;
         }
         return;
     }
-
     SetType type = SelectSetType(size);
     if (type == FreeObjectSet<T>::INVALID_SET_TYPE) {
         return;
     }
 
+    Region *region = Region::ObjectAddressToRange(reinterpret_cast<TaggedObject *>(start));
     auto set = region->GetFreeObjectSet(type);
     if (set == nullptr) { // LCOV_EXCL_BR_LINE
         LOG_FULL(FATAL) << "The set of region is nullptr";
@@ -159,15 +171,6 @@ void FreeObjectList<T>::FreeImpl(U* region, uintptr_t start, size_t size, bool i
         }
     }
 }
-template void FreeObjectList<FreeObject>::FreeImpl<Region>(Region* region, uintptr_t start, size_t size, bool isAdd);
-template void FreeObjectList<MemDesc>::FreeImpl<JitFortRegion>(JitFortRegion* region,
-    uintptr_t start, size_t size, bool isAdd);
-
-template <typename T>
-void FreeObjectList<T>::Free(uintptr_t start, size_t size, bool isAdd)
-{
-    return FreeImpl<Region>(Region::ObjectAddressToRange(reinterpret_cast<TaggedObject *>(start)), start, size, isAdd);
-}
 
 // template class instance for non JitFort space uses FreeObject and Region.
 template void FreeObjectList<FreeObject>::Free(uintptr_t, size_t, bool);
@@ -175,7 +178,37 @@ template void FreeObjectList<FreeObject>::Free(uintptr_t, size_t, bool);
 template <>
 void FreeObjectList<MemDesc>::Free(uintptr_t start, size_t size, bool isAdd)
 {
-    return FreeImpl<JitFortRegion>(jitFort_->ObjectAddressToRange(start), start, size, isAdd);
+    if (UNLIKELY(start == 0)) {
+        return;
+    }
+    if (UNLIKELY(size < MIN_SIZE)) {
+        JitFortRegion *region = jitFort_->ObjectAddressToRange(start);
+        region->IncreaseWasted(size);
+        if (isAdd) {
+            wasted_ += size;
+        }
+        return;
+    }
+    SetType type = SelectSetType(size);
+    if (type == FreeObjectSet<MemDesc>::INVALID_SET_TYPE) {
+        return;
+    }
+
+    JitFortRegion *region = jitFort_->ObjectAddressToRange(start);
+    auto set = region->GetFreeObjectSet(type);
+    if (set == nullptr) {
+        LOG_FULL(FATAL) << "The set of region is nullptr";
+        return;
+    }
+    set->Free(start, size);
+
+    if (isAdd) {
+        if (set->isAdded_ == 0) {
+            AddSet(set);
+        } else {
+            available_ += size;
+        }
+    }
 }
 
 template <typename T>
diff --git a/ecmascript/mem/free_object_list.h b/ecmascript/mem/free_object_list.h
index ed26c9104c..3f9f75e390 100644
--- a/ecmascript/mem/free_object_list.h
+++ b/ecmascript/mem/free_object_list.h
@@ -28,7 +28,8 @@ class JitFort;
 template <typename T>
 class FreeObjectList {
 public:
-    FreeObjectList(JitFort* fort = nullptr);
+    FreeObjectList();
+    FreeObjectList(JitFort *fort);
     ~FreeObjectList();
 
     T *Allocate(size_t size);
@@ -80,9 +81,6 @@ public:
         return NUMBER_OF_SETS;
     }
 
-    template<typename U>
-    void FreeImpl(U* region, uintptr_t start, size_t size, bool isAdd);
-
 private:
     static constexpr int NUMBER_OF_SETS = 39;
     static constexpr size_t MIN_SIZE = 16;
diff --git a/ecmascript/tests/concurrent_marking_test.cpp b/ecmascript/tests/concurrent_marking_test.cpp
index d82cc99d5d..8cdb2f2a99 100644
--- a/ecmascript/tests/concurrent_marking_test.cpp
+++ b/ecmascript/tests/concurrent_marking_test.cpp
@@ -167,9 +167,4 @@ HWTEST_F_L0(ConcurrentMarkingTest, ConcurrentMarkingWithFreshRegion)
         heap->GetConcurrentMarker()->HandleMarkingFinished();
     }
 }
-
-HWTEST_F_L0(ConcurrentMarkingTest, ConcurrentMarkingRequestBySharedSize)
-{
-    SharedHeap::GetInstance()->TryTriggerLocalConcurrentMarking();
-}
 }  // namespace panda::test
-- 
Gitee