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

Init runtime on singleton objects access in C interop. (#2658)

Browse Source
This commit is contained in:
Nikolay Igotti
2019-02-14 12:42:36 +03:00
committed by GitHub
parent 8539d9395e
commit 147c7d2c3e
2 changed files with 3 additions and 1 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/CAdapterGenerator.kt
+2
View File
@@ -349,6 +349,7 @@ private class ExportedElement(val kind: ElementKind,
|extern "C" KObjHeader* ${cname}_instance(KObjHeader**);
|static $objectClassC ${cname}_instance_impl(void) {
| KObjHolder result_holder;
| Kotlin_initRuntimeIfNeeded();
| KObjHeader* result = ${cname}_instance(result_holder.slot());
| return $objectClassC { .pinned = CreateStablePointer(result)};
|}
@@ -366,6 +367,7 @@ private class ExportedElement(val kind: ElementKind,
|extern "C" KObjHeader* $cname(KObjHeader**);
|static $enumClassC ${cname}_impl(void) {
| KObjHolder result_holder;
| Kotlin_initRuntimeIfNeeded();
| KObjHeader* result = $cname(result_holder.slot());
| return $enumClassC { .pinned = CreateStablePointer(result)};
|}
backend.native/tests/produce_dynamic/simple/main.c
+1 -1
View File
@@ -6,6 +6,7 @@
#define CAST(T, v) testlib_kref_ ## T { .pinned = v }
int main(void) {
T_(Singleton) singleton = __ kotlin.root.Singleton._instance();
T_(Base) base = __ kotlin.root.Base.Base();
T_(Child) child = __ kotlin.root.Child.Child();
T_(Impl1) impl1 = __ kotlin.root.Impl1.Impl1();
@@ -15,7 +16,6 @@ int main(void) {
T_(I) casted_impl2 = { .pinned = impl2.pinned };
T_(Enum) enum1 = __ kotlin.root.Enum.HUNDRED.get();
T_(Codeable) object1 = __ kotlin.root.get_an_object();
T_(Singleton) singleton = __ kotlin.root.Singleton._instance();
const char* string1 = __ kotlin.root.getString();
const char* string2 = __ kotlin.root.Singleton.toString(singleton);