openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-10-07 16:13:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix the crash problem when enable thread check

Browse Source 
Signed-off-by: xiongluo <xiongluo@huawei.com>
Change-Id: Ibacda12e0d0b9ee4f6483eea0c806e8ddc1b9912
This commit is contained in:
xiongluo 2023-06-19 15:46:02 +08:00
parent 8ad645dea4
commit 289dffde73
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ecmascript/ecma_context.cpp
View File

@ -611,23 +611,21 @@ void EcmaContext::Iterate(const RootVisitor &v, const RootRangeVisitor &rv)
if (propertiesCache_ != nullptr) {
propertiesCache_->Clear();
}
if (vm_->GetJSOptions().EnableGlobalLeakCheck()) {
IterateHandle(rv);
} else {
if (currentHandleStorageIndex_ != -1) {
int32_t nid = currentHandleStorageIndex_;
for (int32_t i = 0; i <= nid; ++i) {
auto node = handleStorageNodes_.at(i);
auto start = node->data();
auto end = (i != nid) ? &(node->data()[NODE_BLOCK_SIZE]) : handleScopeStorageNext_;
rv(ecmascript::Root::ROOT_HANDLE, ObjectSlot(ToUintPtr(start)), ObjectSlot(ToUintPtr(end)));
}
if (!vm_->GetJSOptions().EnableGlobalLeakCheck() && currentHandleStorageIndex_ != -1) {
// IterateHandle when disableGlobalLeakCheck.
int32_t nid = currentHandleStorageIndex_;
for (int32_t i = 0; i <= nid; ++i) {
auto node = handleStorageNodes_.at(i);
auto start = node->data();
auto end = (i != nid) ? &(node->data()[NODE_BLOCK_SIZE]) : handleScopeStorageNext_;
rv(ecmascript::Root::ROOT_HANDLE, ObjectSlot(ToUintPtr(start)), ObjectSlot(ToUintPtr(end)));
}
}
}
size_t EcmaContext::IterateHandle(const RootRangeVisitor &rangeVisitor)
{
// EnableGlobalLeakCheck.
size_t handleCount = 0;
if (currentHandleStorageIndex_ != -1) {
int32_t nid = currentHandleStorageIndex_;