From d071c44126d28f3c8e5337bd2484ac9e0778e4dc Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 15 Dec 2014 21:43:22 +0300 Subject: [PATCH] Minor in Frontend: fix default getter return type. --- .../jet/lang/resolve/calls/tasks/dynamicCalls.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt index 60535588c48..603a207cee7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt @@ -118,10 +118,12 @@ object DynamicCallableDescriptors { createDynamicDispatchReceiverParameter(propertyDescriptor), null: JetType? ) - propertyDescriptor.initialize( - DescriptorFactory.createDefaultGetter(propertyDescriptor), - DescriptorFactory.createDefaultSetter(propertyDescriptor) - ) + + val getter = DescriptorFactory.createDefaultGetter(propertyDescriptor) + getter.initialize(propertyDescriptor.getType()) + val setter = DescriptorFactory.createDefaultSetter(propertyDescriptor) + + propertyDescriptor.initialize(getter, setter) return propertyDescriptor }