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

Handle nullptr in StablePointer API (#4671)

Browse Source
This commit is contained in:
Alexander Shabalin
2021-02-02 09:24:37 +03:00
committed by Vasily Levchenko
parent 9295d7cf60
commit 3bf1f55990
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/runtime/src/mm/cpp/Memory.cpp
+12
View File
@@ -292,23 +292,35 @@ extern "C" RUNTIME_NOTHROW bool ClearSubgraphReferences(ObjHeader* root, bool ch
} }
extern "C" RUNTIME_NOTHROW void* CreateStablePointer(ObjHeader* object) { extern "C" RUNTIME_NOTHROW void* CreateStablePointer(ObjHeader* object) {
if (!object)
return nullptr;
auto* threadData = mm::ThreadRegistry::Instance().CurrentThreadData(); auto* threadData = mm::ThreadRegistry::Instance().CurrentThreadData();
return mm::StableRefRegistry::Instance().RegisterStableRef(threadData, object); return mm::StableRefRegistry::Instance().RegisterStableRef(threadData, object);
} }
extern "C" RUNTIME_NOTHROW void DisposeStablePointer(void* pointer) { extern "C" RUNTIME_NOTHROW void DisposeStablePointer(void* pointer) {
if (!pointer)
return;
auto* threadData = mm::ThreadRegistry::Instance().CurrentThreadData(); auto* threadData = mm::ThreadRegistry::Instance().CurrentThreadData();
auto* node = static_cast<mm::StableRefRegistry::Node*>(pointer); auto* node = static_cast<mm::StableRefRegistry::Node*>(pointer);
mm::StableRefRegistry::Instance().UnregisterStableRef(threadData, node); mm::StableRefRegistry::Instance().UnregisterStableRef(threadData, node);
} }
extern "C" RUNTIME_NOTHROW OBJ_GETTER(DerefStablePointer, void* pointer) { extern "C" RUNTIME_NOTHROW OBJ_GETTER(DerefStablePointer, void* pointer) {
if (!pointer)
RETURN_OBJ(nullptr);
auto* node = static_cast<mm::StableRefRegistry::Node*>(pointer); auto* node = static_cast<mm::StableRefRegistry::Node*>(pointer);
ObjHeader* object = **node; ObjHeader* object = **node;
RETURN_OBJ(object); RETURN_OBJ(object);
} }
extern "C" RUNTIME_NOTHROW OBJ_GETTER(AdoptStablePointer, void* pointer) { extern "C" RUNTIME_NOTHROW OBJ_GETTER(AdoptStablePointer, void* pointer) {
if (!pointer)
RETURN_OBJ(nullptr);
auto* threadData = mm::ThreadRegistry::Instance().CurrentThreadData(); auto* threadData = mm::ThreadRegistry::Instance().CurrentThreadData();
auto* node = static_cast<mm::StableRefRegistry::Node*>(pointer); auto* node = static_cast<mm::StableRefRegistry::Node*>(pointer);
ObjHeader* object = **node; ObjHeader* object = **node;