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

Improve support for using frozen objects from other threads (#2202)

Browse Source
This commit is contained in:
SvyatoslavScherbina
2018-10-12 09:28:09 +03:00
committed by GitHub
parent 6cb4d0c241
commit 973cc7bbdb
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/Memory.cpp
+10 -9
View File
@@ -27,6 +27,7 @@
#include "MemoryPrivate.hpp" #include "MemoryPrivate.hpp"
#include "Natives.h" #include "Natives.h"
#include "Porting.h" #include "Porting.h"
#include "Runtime.h"
// If garbage collection algorithm for cyclic garbage to be used. // If garbage collection algorithm for cyclic garbage to be used.
// We are using the Bacon's algorithm for GC, see // We are using the Bacon's algorithm for GC, see
@@ -351,11 +352,6 @@ namespace {
// TODO: can we pass this variable as an explicit argument? // TODO: can we pass this variable as an explicit argument?
THREAD_LOCAL_VARIABLE MemoryState* memoryState = nullptr; THREAD_LOCAL_VARIABLE MemoryState* memoryState = nullptr;
// TODO: use widely.
inline void EnsureRuntimeInitialized() {
RuntimeCheck(memoryState != nullptr, "Unable to execute Kotlin code on uninitialized thread");
}
constexpr int kFrameOverlaySlots = sizeof(FrameOverlay) / sizeof(ObjHeader**); constexpr int kFrameOverlaySlots = sizeof(FrameOverlay) / sizeof(ObjHeader**);
inline bool isFreeable(const ContainerHeader* header) { inline bool isFreeable(const ContainerHeader* header) {
@@ -420,10 +416,15 @@ void KRefSharedHolder::initRefOwner() {
void KRefSharedHolder::verifyRefOwner() const { void KRefSharedHolder::verifyRefOwner() const {
// Note: checking for 'permanentOrFrozen()' and retrieving 'type_info()' // Note: checking for 'permanentOrFrozen()' and retrieving 'type_info()'
// are supposed to be correct even for unowned object. // are supposed to be correct even for unowned object.
if (owner_ != memoryState && !obj_->container()->permanentOrFrozen()) { if (owner_ != memoryState) {
EnsureRuntimeInitialized(); // Initialized runtime is required to throw the exception below
// TODO: add some info about the owner. // or to provide proper execution context for shared objects:
ThrowIllegalObjectSharingException(obj_->type_info(), obj_); if (memoryState == nullptr) Kotlin_initRuntimeIfNeeded();
if (!obj_->container()->permanentOrFrozen()) {
// TODO: add some info about the owner.
ThrowIllegalObjectSharingException(obj_->type_info(), obj_);
}
} }
} }