diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt index 6d09f616c7d..fa3389dc317 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt @@ -34,7 +34,6 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils.* import org.jetbrains.kotlin.resolve.DescriptorResolver.* import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil -import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.resolve.scopes.WritableScope import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl import org.jetbrains.kotlin.resolve.source.toSourceElement @@ -192,7 +191,7 @@ class FunctionDescriptorResolver( // it parameter for lambda val valueParameterDescriptor = expectedValueParameters.first() val it = ValueParameterDescriptorImpl(functionDescriptor, null, 0, Annotations.EMPTY, Name.identifier("it"), - valueParameterDescriptor.getType(), valueParameterDescriptor.hasDefaultValue(), + valueParameterDescriptor.getType(), valueParameterDescriptor.declaresDefaultValue(), valueParameterDescriptor.getVarargElementType(), SourceElement.NO_SOURCE) trace.record(BindingContext.AUTO_CREATED_IT, it) return listOf(it) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt index 20553b7e5db..cbe0034a1be 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt @@ -60,9 +60,7 @@ public class ValueParameterResolver( jetParameter: JetParameter, context: ExpressionTypingContext ) { - if (!valueParameterDescriptor.hasDefaultValue()) { - return - } + if (!valueParameterDescriptor.declaresDefaultValue()) return val defaultValue = jetParameter.getDefaultValue() ?: return expressionTypingServices.getTypeInfo(defaultValue, context.replaceExpectedType(valueParameterDescriptor.getType())) if (DescriptorUtils.isAnnotationClass(DescriptorResolver.getContainingClass(context.scope))) {