azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N] Fix finalizer handling with mimalloc ^KT-63423

Browse Source
This commit is contained in:
Alexander Shabalin
2024-01-18 13:07:00 +01:00
committed by Space Team
parent 50203adb72
commit 266208c500
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/runtime/src/alloc/legacy/cpp/ObjectFactorySweep.hpp
+1 -1
View File
@@ -59,7 +59,7 @@ SegregatedFinalizerQueue<typename Traits::ObjectFactory::FinalizerQueue> Sweep(
sweepHandle.addSweptObject(); sweepHandle.addSweptObject();
if (HasFinalizers(objHeader)) { if (HasFinalizers(objHeader)) {
auto* extraObject = mm::ExtraObjectData::Get(objHeader); auto* extraObject = mm::ExtraObjectData::Get(objHeader);
if (compiler::objcDisposeOnMain() && extraObject->getFlag(mm::ExtraObjectData::FLAGS_RELEASE_ON_MAIN_QUEUE)) { if (compiler::objcDisposeOnMain() && extraObject && extraObject->getFlag(mm::ExtraObjectData::FLAGS_RELEASE_ON_MAIN_QUEUE)) {
objectFactoryIter.MoveAndAdvance(finalizerQueue.mainThread, it); objectFactoryIter.MoveAndAdvance(finalizerQueue.mainThread, it);
} else { } else {
objectFactoryIter.MoveAndAdvance(finalizerQueue.regular, it); objectFactoryIter.MoveAndAdvance(finalizerQueue.regular, it);