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

Fixed shared globals deinit

Browse Source
This commit is contained in:
Igor Chevdar
2018-03-28 17:19:29 +03:00
parent 6fa9ca8888
commit c76c39fafd
6 changed files with 77 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
+20 -26
View File
@@ -46,7 +46,7 @@ internal class CodeGenerator(override val context: Context) : ContextUtils {
fun functionEntryPointAddress(descriptor: FunctionDescriptor) = descriptor.entryPointAddress.llvm
fun functionHash(descriptor: FunctionDescriptor): LLVMValueRef = descriptor.functionName.localHash.llvm
fun getObjectInstanceStorage(descriptor: ClassDescriptor): LLVMValueRef {
fun getObjectInstanceStorage(descriptor: ClassDescriptor, shared: Boolean): LLVMValueRef {
assert (!descriptor.isUnit())
val llvmGlobal = if (!isExternal(descriptor)) {
context.llvmDeclarations.forSingleton(descriptor).instanceFieldRef
@@ -56,10 +56,13 @@ internal class CodeGenerator(override val context: Context) : ContextUtils {
descriptor.objectInstanceFieldSymbolName,
llvmType,
origin = descriptor.llvmSymbolOrigin,
threadLocal = !descriptor.symbol.objectIsShared
threadLocal = !shared
)
}
context.llvm.objects += llvmGlobal
if (shared)
context.llvm.sharedObjects += llvmGlobal
else
context.llvm.objects += llvmGlobal
return llvmGlobal
}
@@ -593,40 +596,31 @@ internal class FunctionGenerationContext(val function: LLVMValueRef,
return codegen.theUnitInstanceRef.llvm
}
val args = mutableListOf<LLVMValueRef>()
val objectPtr = codegen.getObjectInstanceStorage(descriptor)
args += objectPtr
val objectPtr = codegen.getObjectInstanceStorage(descriptor, shared)
val bbCurrent = currentBlock
val bbFirstCheck = basicBlock(if (shared) "label_check_shadow" else "label_init", locationInfo)
val bbInit = basicBlock("label_init", locationInfo)
val bbExit = basicBlock("label_continue", locationInfo)
val objectVal = loadSlot(objectPtr, false)
val objectInitialized = icmpUGt(ptrToInt(objectVal, codegen.intPtrType), codegen.immOneIntPtrType)
condBr(objectInitialized, bbExit, bbFirstCheck)
positionAtEnd(bbExit)
val valuePhi = phi(codegen.getLLVMType(descriptor.defaultType))
positionAtEnd(bbFirstCheck)
if (shared) {
val shadowObjectPtr = codegen.getObjectInstanceShadowStorage(descriptor)
args += shadowObjectPtr
val shadowObjectVal = loadSlot(shadowObjectPtr, false)
val shadowNotNull = icmpNe(bitcast(int8TypePtr, shadowObjectVal), kNullInt8Ptr)
val bbInit = basicBlock("label_init", locationInfo)
condBr(shadowNotNull, bbExit, bbInit)
addPhiIncoming(valuePhi, bbFirstCheck to shadowObjectVal)
positionAtEnd(bbInit)
}
condBr(objectInitialized, bbExit, bbInit)
positionAtEnd(bbInit)
val typeInfo = codegen.typeInfoForAllocation(descriptor)
val defaultConstructor = descriptor.constructors.first { it.valueParameters.size == 0 }
args += codegen.typeInfoForAllocation(descriptor)
args += codegen.llvmFunction(defaultConstructor)
val initFunction = if (shared) context.llvm.initSharedInstanceFunction else context.llvm.initInstanceFunction
val ctor = codegen.llvmFunction(defaultConstructor)
val (initFunction, args) =
if (shared) {
val shadowObjectPtr = codegen.getObjectInstanceShadowStorage(descriptor)
context.llvm.initSharedInstanceFunction to listOf(objectPtr, shadowObjectPtr, typeInfo, ctor)
} else {
context.llvm.initInstanceFunction to listOf(objectPtr, typeInfo, ctor)
}
val newValue = call(initFunction, args, Lifetime.GLOBAL, exceptionHandler)
val bbInitResult = currentBlock
br(bbExit)
positionAtEnd(bbExit)
val valuePhi = phi(codegen.getLLVMType(descriptor.defaultType))
addPhiIncoming(valuePhi, bbCurrent to objectVal, bbInitResult to newValue)
return valuePhi
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt
+1
View File
@@ -477,6 +477,7 @@ internal class Llvm(val context: Context, val llvmModule: LLVMModuleRef) {
val staticInitializers = mutableListOf<LLVMValueRef>()
val fileInitializers = mutableListOf<IrField>()
val objects = mutableSetOf<LLVMValueRef>()
val sharedObjects = mutableSetOf<LLVMValueRef>()
private object lazyRtFunction {
operator fun provideDelegate(
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
+23 -4
View File
@@ -358,15 +358,28 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
val kNodeInitType = LLVMGetTypeByName(context.llvmModule, "struct.InitNode")!!
//-------------------------------------------------------------------------//
val INIT_GLOBALS = 0
val DEINIT_THREAD_LOCAL_GLOBALS = 1
val DEINIT_GLOBALS = 2
private fun createInitBody(): LLVMValueRef {
val initFunction = LLVMAddFunction(context.llvmModule, "", kInitFuncType)!!
generateFunction(codegen, initFunction) {
using(FunctionScope(initFunction, "init_body", it)) {
val bbInit = basicBlock("init", null)
val bbDeinit = basicBlock("deinit", null)
condBr(functionGenerationContext.icmpEq(LLVMGetParam(initFunction, 0)!!, kImmZero), bbDeinit, bbInit)
val bbLocalDeinit = basicBlock("local_deinit", null)
val bbGlobalDeinit = basicBlock("global_deinit", null)
val bbDefault = basicBlock("default", null) {
unreachable()
}
appendingTo(bbDeinit) {
switch(LLVMGetParam(initFunction, 0)!!,
listOf(Int32(INIT_GLOBALS).llvm to bbInit,
Int32(DEINIT_THREAD_LOCAL_GLOBALS).llvm to bbLocalDeinit,
Int32(DEINIT_GLOBALS).llvm to bbGlobalDeinit),
bbDefault)
appendingTo(bbLocalDeinit) {
context.llvm.fileInitializers.forEach {
val descriptor = it
if (descriptor.type.isValueType())
@@ -378,6 +391,11 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
ret(null)
}
appendingTo(bbGlobalDeinit) {
context.llvm.sharedObjects.forEach { storeAny(codegen.kNullObjHeaderPtr, it) }
ret(null)
}
appendingTo(bbInit) {
context.llvm.fileInitializers
.forEach {
@@ -424,11 +442,12 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
// TODO: collect those two in one place.
context.llvm.fileInitializers.clear()
context.llvm.objects.clear()
context.llvm.sharedObjects.clear()
using(FileScope(declaration)) {
declaration.acceptChildrenVoid(this)
if (context.llvm.fileInitializers.isEmpty() && context.llvm.objects.isEmpty())
if (context.llvm.fileInitializers.isEmpty() && context.llvm.objects.isEmpty() && context.llvm.sharedObjects.isEmpty())
return
// Create global initialization records.
runtime/src/main/cpp/Atomic.h
+15
View File
@@ -0,0 +1,15 @@
#ifndef RUNTIME_ATOMIC_H
#define RUNTIME_ATOMIC_H
#include "Common.h"
ALWAYS_INLINE inline int atomicAdd(int* where, int what) {
#ifndef KONAN_NO_THREADS
return __sync_add_and_fetch(where, what);
#else
return *where += what;
#endif
}
#endif // RUNTIME_ATOMIC_H
runtime/src/main/cpp/Memory.cpp
+1 -8
View File
@@ -26,6 +26,7 @@
#include "MemoryPrivate.hpp"
#include "Natives.h"
#include "Porting.h"
#include "Atomic.h"
// If garbage collection algorithm for cyclic garbage to be used.
// We are using the Bacon's algorithm for GC, see
@@ -56,14 +57,6 @@ constexpr container_size_t kObjectAlignment = 8;
#define MEMORY_LOG(...)
#endif
inline int atomicAdd(int* where, int what) {
#ifndef KONAN_NO_THREADS
return __sync_add_and_fetch(where, what);
#else
return *where += what;
#endif
}
#if USE_GC
// Collection threshold default (collect after having so many elements in the
// release candidates set).
runtime/src/main/cpp/Runtime.cpp
+17 -6
View File
@@ -19,6 +19,7 @@
#include "Memory.h"
#include "Porting.h"
#include "Runtime.h"
#include "Atomic.h"
struct RuntimeState {
MemoryState* memoryState;
@@ -35,6 +36,12 @@ namespace {
InitNode* initHeadNode = nullptr;
InitNode* initTailNode = nullptr;
enum {
INIT_GLOBALS = 0,
DEINIT_THREAD_LOCAL_GLOBALS = 1,
DEINIT_GLOBALS = 2
};
void InitOrDeinitGlobalVariables(int initialize) {
InitNode *currNode = initHeadNode;
while (currNode != nullptr) {
@@ -45,23 +52,27 @@ void InitOrDeinitGlobalVariables(int initialize) {
THREAD_LOCAL_VARIABLE RuntimeState* runtimeState = nullptr;
int aliveRuntimesCount = 0;
RuntimeState* initRuntime() {
SetKonanTerminateHandler();
RuntimeState* result = konanConstructInstance<RuntimeState>();
if (!result) return nullptr;
result->memoryState = InitMemory();
// Keep global variables in state as well.
InitOrDeinitGlobalVariables(true);
InitOrDeinitGlobalVariables(INIT_GLOBALS);
konan::consoleInit();
atomicAdd(&aliveRuntimesCount, 1);
return result;
}
void deinitRuntime(RuntimeState* state) {
if (state != nullptr) {
InitOrDeinitGlobalVariables(false);
DeinitMemory(state->memoryState);
konanDestructInstance(state);
}
bool lastRuntime = atomicAdd(&aliveRuntimesCount, -1) == 0;
InitOrDeinitGlobalVariables(DEINIT_THREAD_LOCAL_GLOBALS);
if (lastRuntime)
InitOrDeinitGlobalVariables(DEINIT_GLOBALS);
DeinitMemory(state->memoryState);
konanDestructInstance(state);
}
} // namespace