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

Fix race in cyclic collector

Browse Source 
Prevent cyclic collector from observing
newly allocated atomic root with RC = 0.
This commit is contained in:
Svyatoslav Scherbina
2020-04-15 17:49:50 +03:00
committed by SvyatoslavScherbina
parent 3dc1e9ffd2
commit dc8681cebf
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/Memory.cpp
+8 -5
View File
@@ -1940,11 +1940,6 @@ OBJ_GETTER(allocInstance, const TypeInfo* type_info) {
#endif // USE_GC #endif // USE_GC
auto container = ObjectContainer(state, type_info); auto container = ObjectContainer(state, type_info);
ObjHeader* obj = container.GetPlace(); ObjHeader* obj = container.GetPlace();
#if USE_CYCLIC_GC
if ((obj->type_info()->flags_ & TF_LEAK_DETECTOR_CANDIDATE) != 0) {
cyclicAddAtomicRoot(obj);
}
#endif // USE_CYCLIC_GC
#if USE_GC #if USE_GC
if (Strict) { if (Strict) {
rememberNewContainer(container.header()); rememberNewContainer(container.header());
@@ -1952,6 +1947,14 @@ OBJ_GETTER(allocInstance, const TypeInfo* type_info) {
makeShareable(container.header()); makeShareable(container.header());
} }
#endif // USE_GC #endif // USE_GC
#if USE_CYCLIC_GC
if ((obj->type_info()->flags_ & TF_LEAK_DETECTOR_CANDIDATE) != 0) {
// Note: this should be performed after [rememberNewContainer] (above).
// Otherwise cyclic collector can observe this atomic root with RC = 0,
// thus consider it garbage and then zero it after initialization.
cyclicAddAtomicRoot(obj);
}
#endif // USE_CYCLIC_GC
RETURN_OBJ(obj); RETURN_OBJ(obj);
} }