From 04f3aae72bdf8f4ecf87881412e8f0d6547c5e58 Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Fri, 23 Aug 2019 18:57:52 +0300 Subject: [PATCH] Fixed a typo --- .../jetbrains/kotlin/backend/konan/llvm/IntrinsicGenerator.kt | 4 ++-- runtime/src/main/kotlin/kotlin/native/internal/Coroutines.kt | 2 +- .../src/main/kotlin/kotlin/native/internal/IntrinsicType.kt | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IntrinsicGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IntrinsicGenerator.kt index 991b838bb93..873a82ec6fb 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IntrinsicGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IntrinsicGenerator.kt @@ -65,7 +65,7 @@ internal enum class IntrinsicType { INIT_INSTANCE, // Coroutines GET_CONTINUATION, - RETURN_IF_SUSPEND, + RETURN_IF_SUSPENDED, COROUTINE_LAUNCHPAD, // Interop INTEROP_READ_BITS, @@ -238,7 +238,7 @@ internal class IntrinsicGenerator(private val environment: IntrinsicGeneratorEnv IntrinsicType.IDENTITY -> emitIdentity(args) IntrinsicType.GET_CONTINUATION -> emitGetContinuation() IntrinsicType.INTEROP_MEMORY_COPY -> emitMemoryCopy(callSite, args) - IntrinsicType.RETURN_IF_SUSPEND, + IntrinsicType.RETURN_IF_SUSPENDED, IntrinsicType.INTEROP_BITS_TO_FLOAT, IntrinsicType.INTEROP_BITS_TO_DOUBLE, IntrinsicType.INTEROP_SIGN_EXTEND, diff --git a/runtime/src/main/kotlin/kotlin/native/internal/Coroutines.kt b/runtime/src/main/kotlin/kotlin/native/internal/Coroutines.kt index 2101e5bc12f..4ac467ec2cd 100644 --- a/runtime/src/main/kotlin/kotlin/native/internal/Coroutines.kt +++ b/runtime/src/main/kotlin/kotlin/native/internal/Coroutines.kt @@ -22,7 +22,7 @@ internal external fun getContinuation(): Continuation internal inline suspend fun getCoroutineContext(): CoroutineContext = getContinuation().context -@TypedIntrinsic(IntrinsicType.RETURN_IF_SUSPEND) +@TypedIntrinsic(IntrinsicType.RETURN_IF_SUSPENDED) @PublishedApi internal external suspend fun returnIfSuspended(@Suppress("UNUSED_PARAMETER") argument: Any?): T diff --git a/runtime/src/main/kotlin/kotlin/native/internal/IntrinsicType.kt b/runtime/src/main/kotlin/kotlin/native/internal/IntrinsicType.kt index 0ec8488a539..6a283a8a7f6 100644 --- a/runtime/src/main/kotlin/kotlin/native/internal/IntrinsicType.kt +++ b/runtime/src/main/kotlin/kotlin/native/internal/IntrinsicType.kt @@ -54,8 +54,9 @@ class IntrinsicType { const val IMMUTABLE_BLOB = "IMMUTABLE_BLOB" const val INIT_INSTANCE = "INIT_INSTANCE" + // Coroutines const val GET_CONTINUATION = "GET_CONTINUATION" - const val RETURN_IF_SUSPEND = "RETURN_IF_SUSPEND" + const val RETURN_IF_SUSPENDED = "RETURN_IF_SUSPENDED" const val COROUTINE_LAUNCHPAD = "COROUTINE_LAUNCHPAD" // Interop