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

Native: make debug interface handle uninitialized threads

Browse Source 
Generally, debug interface is not called from uninitialized threads,
but let's be on the safe side here.
This commit is contained in:
Svyatoslav Scherbina
2022-05-16 13:15:15 +03:00
committed by Space
parent 41b531db7c
commit 3f6b386681
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/runtime/src/debug/cpp/KDebug.cpp
+3 -1
View File
@@ -112,7 +112,9 @@ int Konan_DebugBufferSizeWithObjectImpl(KRef obj) {
int32_t Konan_DebugObjectToUtf8ArrayImpl(KRef obj, char* buffer, int32_t bufferSize) { int32_t Konan_DebugObjectToUtf8ArrayImpl(KRef obj, char* buffer, int32_t bufferSize) {
// We need the runnable thread state to call the Kotlin function 'KonanObjectToUtf8Array' and operate with it's result. // We need the runnable thread state to call the Kotlin function 'KonanObjectToUtf8Array' and operate with it's result.
// But the current thread can be in any state when this function is called by the debugger. So we use the reentrant state switch. // But the current thread can be in any state when this function is called by the debugger. So we use the reentrant state switch.
kotlin::ThreadStateGuard guard(kotlin::ThreadState::kRunnable, /* reentrant */ true); // Finally, let's be on the safe side and assume that current thread might be uninitialized,
// so use CalledFromNativeGuard instead of ThreadStateGuard.
kotlin::CalledFromNativeGuard guard(/* reentrant */ true);
ObjHolder stringHolder; ObjHolder stringHolder;
// Kotlin call. // Kotlin call.
ArrayHeader* data = KonanObjectToUtf8Array(obj, stringHolder.slot())->array(); ArrayHeader* data = KonanObjectToUtf8Array(obj, stringHolder.slot())->array();