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

[K/N] Fix SafePointSlowPath in STMS

Browse Source 
^KT-48537

Merge-request: KT-MR-5257
This commit is contained in:
Alexander Shabalin
2021-12-15 07:54:07 +00:00
committed by Space
parent e36cc87b19
commit 7eb0798d64
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/runtime/src/gc/stms/cpp/SameThreadMarkAndSweep.cpp
+11 -6
View File
@@ -103,12 +103,17 @@ ALWAYS_INLINE void gc::SameThreadMarkAndSweep::ThreadData::SafePointRegular(size
} }
NO_INLINE void gc::SameThreadMarkAndSweep::ThreadData::SafePointSlowPath(SafepointFlag flag) noexcept { NO_INLINE void gc::SameThreadMarkAndSweep::ThreadData::SafePointSlowPath(SafepointFlag flag) noexcept {
RuntimeAssert(flag != SafepointFlag::kNone, "Must've been handled by the caller"); switch (flag) {
// No need to check for kNeedsSuspend, because `suspendIfRequested` checks for its own atomic. case SafepointFlag::kNone:
threadData_.suspensionData().suspendIfRequested(); RuntimeAssert(false, "Must've been handled by the caller");
if (flag == SafepointFlag::kNeedsGC) { return;
RuntimeLogDebug({kTagGC}, "Attempt to GC at SafePoint"); case SafepointFlag::kNeedsSuspend:
ScheduleAndWaitFullGC(); threadData_.suspensionData().suspendIfRequested();
return;
case SafepointFlag::kNeedsGC:
RuntimeLogDebug({kTagGC}, "Attempt to GC at SafePoint");
ScheduleAndWaitFullGC();
return;
} }
} }