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

Fix regression after migrating to release coroutines:

Browse Source 
createCoroutinesOnManualInstances.kt test.

Also remove obsolete references to kotlin.coroutines.experimental
This commit is contained in:
Svyatoslav Scherbina
2018-10-15 11:20:00 +03:00
committed by SvyatoslavScherbina
parent 147e6c7a93
commit f654db4205
4 changed files with 4 additions and 13 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/ir/Ir.kt
+3
View File
@@ -368,6 +368,9 @@ internal class KonanSymbols(context: Context, val symbolTable: SymbolTable, val
private val coroutinesPackage = context.builtIns.builtInsModule.getPackage(
context.config.configuration.languageVersionSettings.coroutinesPackageFqName()).memberScope
val continuationClassDescriptor = coroutinesPackage
.getContributedClassifier(Name.identifier("Continuation"), NoLookupLocation.FROM_BACKEND) as ClassDescriptor
val coroutineContextGetter = coroutinesPackage
.getContributedVariables(Name.identifier("coroutineContext"), NoLookupLocation.FROM_BACKEND)
.single()
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt
+1 -5
View File
@@ -127,13 +127,9 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass
private class BuiltFunctionReference(val functionReferenceClass: IrClass,
val functionReferenceConstructor: IrConstructor)
private val COROUTINES_FQ_NAME = FqName.fromSegments(listOf("kotlin", "coroutines", "experimental"))
private val VOLATILE_LAMBDA_FQ_NAME = FqName.fromSegments(listOf("kotlin", "native", "internal", "VolatileLambda"))
private val coroutinesScope = context.irModule!!.descriptor.getPackage(COROUTINES_FQ_NAME).memberScope
private val continuationClassDescriptor = coroutinesScope
.getContributedClassifier(Name.identifier("Continuation"), NoLookupLocation.FROM_BACKEND) as ClassDescriptor
private val continuationClassDescriptor = context.ir.symbols.continuationClassDescriptor
private val getContinuationSymbol = context.ir.symbols.getContinuation
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/SuspendFunctionsLowering.kt
-7
View File
@@ -34,7 +34,6 @@ import org.jetbrains.kotlin.ir.symbols.impl.IrVariableSymbolImpl
import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.ir.visitors.*
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.storage.LockBasedStorageManager
@@ -252,12 +251,6 @@ internal class SuspendFunctionsLowering(val context: Context): FileLoweringPass
val coroutineConstructor: IrConstructor,
val invokeSuspendFunction: IrFunction)
private val COROUTINES_FQ_NAME = FqName.fromSegments(listOf("kotlin", "coroutines", "experimental"))
private val KOTLIN_FQ_NAME = FqName("kotlin")
private val coroutinesScope = context.irModule!!.descriptor.getPackage(COROUTINES_FQ_NAME).memberScope
private val kotlinPackageScope = context.irModule!!.descriptor.getPackage(KOTLIN_FQ_NAME).memberScope
private inner class CoroutineBuilder(val irFunction: IrFunction, val functionReference: IrFunctionReference?) {
private val functionParameters = irFunction.explicitParameters
runtime/src/main/kotlin/kotlin/sequences/Sequences.kt
-1
View File
@@ -6,7 +6,6 @@
package kotlin.sequences
import kotlin.comparisons.*
import kotlin.coroutines.experimental.*
import kotlin.native.internal.FixmeConcurrency
@FixmeConcurrency