diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/WrappedDescriptors.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/WrappedDescriptors.kt index 46a39d1fa8d..9df7a932815 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/WrappedDescriptors.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/WrappedDescriptors.kt @@ -88,6 +88,8 @@ abstract class WrappedCallableDescriptor( override fun getUserData(key: CallableDescriptor.UserDataKey?): V? = null } +// TODO: (Roman Artemev) do not create this kind of descriptor for dispatch receiver parameters +// WrappedReceiverParameterDescriptor should be used instead open class WrappedValueParameterDescriptor( annotations: Annotations = Annotations.EMPTY, sourceElement: SourceElement = SourceElement.NO_SOURCE diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt index edf3e583ee8..68fdc00522f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt @@ -815,8 +815,7 @@ internal class DescriptorRendererImpl( renderModifier(builder, valueParameter.isCrossinline, "crossinline") renderModifier(builder, valueParameter.isNoinline, "noinline") - val containingDeclaration = valueParameter.containingDeclaration - if (renderAnnotationPropertiesInPrimaryConstructor && containingDeclaration.isAnnotationConstructor()) { + if (renderAnnotationPropertiesInPrimaryConstructor && valueParameter.containingDeclaration.isAnnotationConstructor()) { renderModifier(builder, actualPropertiesInPrimaryConstructor, "actual") renderModifier(builder, true, "val") }