diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index 1fcba9377a9..be3aaf207ee 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -729,6 +729,7 @@ public class DescriptorResolver { } else { getterDescriptor = createDefaultGetter(propertyDescriptor); + getterDescriptor.initialize(propertyDescriptor.getOutType()); } return getterDescriptor; } diff --git a/compiler/testData/codegen/regressions/kt1165.kt b/compiler/testData/codegen/regressions/kt1165.kt new file mode 100644 index 00000000000..37825bd22d2 --- /dev/null +++ b/compiler/testData/codegen/regressions/kt1165.kt @@ -0,0 +1,13 @@ +public abstract class VirtualFile() { + public abstract val size : Long +} + +public class PhysicalVirtualFile : VirtualFile() { + public override val size: Long + get() = 11 +} + +fun box() : String { + PhysicalVirtualFile() + return "OK" +} \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java index 39df82172b6..bec68856d79 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java @@ -254,15 +254,19 @@ public class ClassGenTest extends CodegenTestCase { blackBoxFile("classes/selfcreate.kt"); } - public void testkt1134() throws Exception { + public void testKt1134() throws Exception { blackBoxFile("regressions/kt1134.kt"); } - public void testkt1157() throws Exception { + public void testKt1157() throws Exception { blackBoxFile("regressions/kt1157.kt"); } - public void testkt471() throws Exception { + public void testKt471() throws Exception { blackBoxFile("regressions/kt471.kt"); } + + public void testKt1165() throws Exception { + blackBoxFile("regressions/kt1165.kt"); + } }