Fix regression after migrating to release coroutines:
createCoroutinesOnManualInstances.kt test. Also remove obsolete references to kotlin.coroutines.experimental
This commit is contained in:
committed by
SvyatoslavScherbina
parent
147e6c7a93
commit
f654db4205
+3
@@ -368,6 +368,9 @@ internal class KonanSymbols(context: Context, val symbolTable: SymbolTable, val
|
|||||||
private val coroutinesPackage = context.builtIns.builtInsModule.getPackage(
|
private val coroutinesPackage = context.builtIns.builtInsModule.getPackage(
|
||||||
context.config.configuration.languageVersionSettings.coroutinesPackageFqName()).memberScope
|
context.config.configuration.languageVersionSettings.coroutinesPackageFqName()).memberScope
|
||||||
|
|
||||||
|
val continuationClassDescriptor = coroutinesPackage
|
||||||
|
.getContributedClassifier(Name.identifier("Continuation"), NoLookupLocation.FROM_BACKEND) as ClassDescriptor
|
||||||
|
|
||||||
val coroutineContextGetter = coroutinesPackage
|
val coroutineContextGetter = coroutinesPackage
|
||||||
.getContributedVariables(Name.identifier("coroutineContext"), NoLookupLocation.FROM_BACKEND)
|
.getContributedVariables(Name.identifier("coroutineContext"), NoLookupLocation.FROM_BACKEND)
|
||||||
.single()
|
.single()
|
||||||
|
|||||||
+1
-5
@@ -127,13 +127,9 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass
|
|||||||
private class BuiltFunctionReference(val functionReferenceClass: IrClass,
|
private class BuiltFunctionReference(val functionReferenceClass: IrClass,
|
||||||
val functionReferenceConstructor: IrConstructor)
|
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 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 = context.ir.symbols.continuationClassDescriptor
|
||||||
|
|
||||||
private val continuationClassDescriptor = coroutinesScope
|
|
||||||
.getContributedClassifier(Name.identifier("Continuation"), NoLookupLocation.FROM_BACKEND) as ClassDescriptor
|
|
||||||
|
|
||||||
private val getContinuationSymbol = context.ir.symbols.getContinuation
|
private val getContinuationSymbol = context.ir.symbols.getContinuation
|
||||||
|
|
||||||
|
|||||||
-7
@@ -34,7 +34,6 @@ import org.jetbrains.kotlin.ir.symbols.impl.IrVariableSymbolImpl
|
|||||||
import org.jetbrains.kotlin.ir.types.*
|
import org.jetbrains.kotlin.ir.types.*
|
||||||
import org.jetbrains.kotlin.ir.util.*
|
import org.jetbrains.kotlin.ir.util.*
|
||||||
import org.jetbrains.kotlin.ir.visitors.*
|
import org.jetbrains.kotlin.ir.visitors.*
|
||||||
import org.jetbrains.kotlin.name.FqName
|
|
||||||
import org.jetbrains.kotlin.name.Name
|
import org.jetbrains.kotlin.name.Name
|
||||||
import org.jetbrains.kotlin.storage.LockBasedStorageManager
|
import org.jetbrains.kotlin.storage.LockBasedStorageManager
|
||||||
|
|
||||||
@@ -252,12 +251,6 @@ internal class SuspendFunctionsLowering(val context: Context): FileLoweringPass
|
|||||||
val coroutineConstructor: IrConstructor,
|
val coroutineConstructor: IrConstructor,
|
||||||
val invokeSuspendFunction: IrFunction)
|
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 inner class CoroutineBuilder(val irFunction: IrFunction, val functionReference: IrFunctionReference?) {
|
||||||
|
|
||||||
private val functionParameters = irFunction.explicitParameters
|
private val functionParameters = irFunction.explicitParameters
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
package kotlin.sequences
|
package kotlin.sequences
|
||||||
|
|
||||||
import kotlin.comparisons.*
|
import kotlin.comparisons.*
|
||||||
import kotlin.coroutines.experimental.*
|
|
||||||
import kotlin.native.internal.FixmeConcurrency
|
import kotlin.native.internal.FixmeConcurrency
|
||||||
|
|
||||||
@FixmeConcurrency
|
@FixmeConcurrency
|
||||||
|
|||||||
Reference in New Issue
Block a user