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

Remove soft keyword coroutine & isCoroutine from ValueParameterDescriptor.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/Util.kt
+1 -1
View File
@@ -44,5 +44,5 @@ fun CallableMemberDescriptor.createValueParameter(index: Int, name: String, type
Annotations.EMPTY,
Name.identifier(name),
type,
false, false, false, false, null, SourceElement.NO_SOURCE
false, false, false, null, SourceElement.NO_SOURCE
)
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceLowering.kt
+2 -2
View File
@@ -110,12 +110,12 @@ class InterfaceLowering(val state: GenerationState) : IrElementTransformerVoid()
val dispatchReceiver =
ValueParameterDescriptorImpl.createWithDestructuringDeclarations(
newFunction, null, 0, AnnotationsImpl(emptyList()), Name.identifier("this"),
interfaceDescriptor.defaultType, false, false, false, false, null, interfaceDescriptor.source, null)
interfaceDescriptor.defaultType, false, false, false, null, interfaceDescriptor.source, null)
val oldExtensionReceiver = descriptor.extensionReceiverParameter
val extensionReceiver = if (oldExtensionReceiver != null )
ValueParameterDescriptorImpl.createWithDestructuringDeclarations(
newFunction, null, 1, AnnotationsImpl(emptyList()), Name.identifier("receiver"),
oldExtensionReceiver.value.type, false, false, false, false, null, oldExtensionReceiver.source, null)
oldExtensionReceiver.value.type, false, false, false, null, oldExtensionReceiver.source, null)
else null
val valueParameters = listOf(dispatchReceiver, extensionReceiver).filterNotNull() +
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/LocalFunctionsLowering.kt
+1 -1
View File
@@ -314,7 +314,7 @@ class LocalFunctionsLowering(val context: JvmBackendContext): ClassLoweringPass
valueDescriptor.annotations,
suggestNameForCapturedValueParameter(valueDescriptor),
valueDescriptor.type,
false, false, false, false, null, valueDescriptor.source
false, false, false, null, valueDescriptor.source
)
private fun createUnsubstitutedParameter(
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/descriptorUtils.kt
+2 -2
View File
@@ -38,14 +38,14 @@ fun FunctionDescriptor.toStatic(
offset++
ValueParameterDescriptorImpl.createWithDestructuringDeclarations(
newFunction, null, 0, AnnotationsImpl(emptyList()), Name.identifier("this"),
dispatchReceiverClass!!.defaultType, false, false, false, false, null, dispatchReceiverClass.source, null)
dispatchReceiverClass!!.defaultType, false, false, false, null, dispatchReceiverClass.source, null)
}
val extensionReceiver = extensionReceiverParameter?.let {
offset++
ValueParameterDescriptorImpl.createWithDestructuringDeclarations(
newFunction, null, 1, AnnotationsImpl(emptyList()), Name.identifier("receiver"),
it.value.type, false, false, false, false, null, it.source, null)
it.value.type, false, false, false, null, it.source, null)
}
val valueParameters = listOf(dispatchReceiver, extensionReceiver).filterNotNull() +
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt
+1 -1
View File
@@ -75,7 +75,7 @@ class IrBuiltIns(val builtIns: KotlinBuiltIns) {
val valueParameterName = ValueParameterDescriptorImpl(
this, null, 0, Annotations.EMPTY, Name.identifier("name"), builtIns.stringType,
false, false, false, false, null, org.jetbrains.kotlin.descriptors.SourceElement.NO_SOURCE
false, false, false, null, org.jetbrains.kotlin.descriptors.SourceElement.NO_SOURCE
)
val returnType = KotlinTypeFactory.simpleType(Annotations.EMPTY, typeParameterT.typeConstructor, listOf(), false)
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltinFunctionDescriptor.kt
-1
View File
@@ -98,7 +98,6 @@ class IrBuiltinValueParameterDescriptorImpl(
override fun declaresDefaultValue(): Boolean = false
override fun getOriginal(): ValueParameterDescriptor = this
override fun getOverriddenDescriptors(): Collection<ValueParameterDescriptor> = emptyList()
override val isCoroutine: Boolean get() = false
override val isCrossinline: Boolean get() = false
override val isNoinline: Boolean get() = false
override val varargElementType: KotlinType? get() = null