Remove soft keyword coroutine & isCoroutine from ValueParameterDescriptor.

This commit is contained in:
Stanislav Erokhin
2016-12-15 06:14:21 +03:00
parent 55983a7808
commit 42440f50dc
42 changed files with 26 additions and 75 deletions
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.load.kotlin.JvmPackagePartSource
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassNotAny
import org.jetbrains.kotlin.resolve.descriptorUtil.module
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberDescriptor
import org.jetbrains.kotlin.types.KotlinType
@@ -51,7 +50,6 @@ fun copyValueParameters(
oldParameter.declaresDefaultValue(),
oldParameter.isCrossinline,
oldParameter.isNoinline,
oldParameter.isCoroutine,
if (oldParameter.varargElementType != null) newOwner.module.builtIns.getArrayElementType(newType) else null,
oldParameter.source
)
@@ -608,7 +608,6 @@ class LazyJavaClassMemberScope(
method.hasAnnotationParameterDefaultValue,
/* isCrossinline = */ false,
/* isNoinline = */ false,
/* isCoroutine = */ false,
// Nulls are not allowed in annotation arguments in Java
varargElementType?.let { TypeUtils.makeNotNullable(it) },
c.components.sourceElementFactory.source(method)
@@ -207,7 +207,6 @@ abstract class LazyJavaScope(protected val c: LazyJavaResolverContext) : MemberS
/* declaresDefaultValue = */ false,
/* isCrossinline = */ false,
/* isNoinline = */ false,
/* isCoroutine = */ false,
varargElementType,
c.components.sourceElementFactory.source(javaParameter)
)