From 8e6ed44db37da337cb3087b570c39530b6e232ac Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Mon, 9 Apr 2018 15:41:07 +0300 Subject: [PATCH] Turned on devirtualization + fix in ObjCExport --- .../src/org/jetbrains/kotlin/backend/konan/KonanPhases.kt | 2 +- runtime/src/main/cpp/ObjCExport.mm | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPhases.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPhases.kt index bf2716c3249..6b9b22da8fb 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPhases.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPhases.kt @@ -64,7 +64,7 @@ enum class KonanPhase(val description: String, /* ... ... */ BUILD_DFG("Data flow graph building"), /* ... ... */ SERIALIZE_DFG("Data flow graph serializing", BUILD_DFG), /* ... ... */ DESERIALIZE_DFG("Data flow graph deserializing"), - /* ... ... */ DEVIRTUALIZATION("Devirtualization", BUILD_DFG, DESERIALIZE_DFG, enabled = false), + /* ... ... */ DEVIRTUALIZATION("Devirtualization", BUILD_DFG, DESERIALIZE_DFG), /* ... ... */ ESCAPE_ANALYSIS("Escape analysis", BUILD_DFG, DESERIALIZE_DFG, enabled = false), /* ... ... */ CODEGEN("Code Generation"), /* ... ... */ BITCODE_LINKER("Bitcode linking"), diff --git a/runtime/src/main/cpp/ObjCExport.mm b/runtime/src/main/cpp/ObjCExport.mm index 6a59a1ab3eb..5ce0e843dff 100644 --- a/runtime/src/main/cpp/ObjCExport.mm +++ b/runtime/src/main/cpp/ObjCExport.mm @@ -922,4 +922,11 @@ static void checkLoadedOnce() { } } +#else + +extern "C" ALWAYS_INLINE id Kotlin_Interop_refToObjC(ObjHeader* obj) { + RuntimeAssert(false, "Unavailable operation"); + return nullptr; +} + #endif // KONAN_OBJC_INTEROP