Remove experimental coroutines support. Part 2

This commit is contained in:
Ilmir Usmanov
2021-08-24 13:15:49 +02:00
committed by TeamCityServer
parent 0ae18372c5
commit 1f8dd45c2b
22 changed files with 4 additions and 790 deletions
@@ -81,14 +81,10 @@ class JavaResolverComponents(
}
interface JavaResolverSettings {
val isReleaseCoroutines: Boolean
val correctNullabilityForNotNullTypeParameter: Boolean
val typeEnhancementImprovementsInStrictMode: Boolean
object Default : JavaResolverSettings {
override val isReleaseCoroutines: Boolean
get() = false
override val correctNullabilityForNotNullTypeParameter: Boolean
get() = false
@@ -98,12 +94,10 @@ interface JavaResolverSettings {
companion object {
fun create(
isReleaseCoroutines: Boolean,
correctNullabilityForNotNullTypeParameter: Boolean,
typeEnhancementImprovementsInStrictMode: Boolean
): JavaResolverSettings =
object : JavaResolverSettings {
override val isReleaseCoroutines get() = isReleaseCoroutines
override val correctNullabilityForNotNullTypeParameter get() = correctNullabilityForNotNullTypeParameter
override val typeEnhancementImprovementsInStrictMode get() = typeEnhancementImprovementsInStrictMode
}
@@ -26,8 +26,6 @@ interface TypeMappingConfiguration<out T : Any> {
// returns null when type doesn't need to be preprocessed
fun preprocessType(kotlinType: KotlinType): KotlinType? = null
fun releaseCoroutines(): Boolean = true
}
fun <T : Any> mapType(
@@ -170,11 +170,6 @@ class MemberDeserializer(private val c: DeserializationContext) {
)
}
private fun DeserializedMemberDescriptor.versionAndReleaseCoroutinesMismatch(): Boolean =
versionRequirements.none {
it.version == VersionRequirement.Version(1, 3) && it.kind == ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION
}
private fun loadOldFlags(oldFlags: Int): Int {
val lowSixBits = oldFlags and 0x3f
val rest = (oldFlags shr 8) shl 6