diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index 4a1ba0bb331..ac86c421915 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -39,7 +39,6 @@ import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.TemporaryBindingTrace; -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; @@ -62,7 +61,6 @@ import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYN import static org.jetbrains.kotlin.resolve.BindingContext.VARIABLE; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; -import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.TraitImpl; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; import static org.jetbrains.org.objectweb.asm.Opcodes.*; @@ -366,16 +364,6 @@ public abstract class MemberCodegen pdResolvedCall = - bindingContext.get(BindingContext.DELEGATED_PROPERTY_PD_RESOLVED_CALL, propertyDescriptor); - if (pdResolvedCall != null) { - int index = PropertyCodegen.indexOfDelegatedProperty(property); - StackValue lastValue = PropertyCodegen.invokeDelegatedPropertyConventionMethod( - propertyDescriptor, codegen, typeMapper, pdResolvedCall, index, 0 - ); - lastValue.put(Type.VOID_TYPE, codegen.v); - } } private boolean shouldInitializeProperty(@NotNull JetProperty property) { diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/defaultArgs.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/defaultArgs.kt deleted file mode 100644 index 80800dc65d9..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/defaultArgs.kt +++ /dev/null @@ -1,11 +0,0 @@ -class Delegate { - var name = "" - fun getValue(t: Any?, p: PropertyMetadata): String = name - fun propertyDelegated(p: PropertyMetadata, s: String = "is OK") { name = "${p.name} $s" } -} - -val prop by Delegate() - -fun box(): String { - return if (prop == "prop is OK") "OK" else "fail"; -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateAsInnerClass.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateAsInnerClass.kt deleted file mode 100644 index 3387def41b4..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateAsInnerClass.kt +++ /dev/null @@ -1,13 +0,0 @@ -class A { - val prop: String by Delegate() - - inner class Delegate { - var name = "" - fun getValue(t: Any?, p: PropertyMetadata): String = name - fun propertyDelegated(p: PropertyMetadata) { name = p.name } - } -} - -fun box(): String { - return if (A().prop == "prop") "OK" else "fail" -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByOtherProperty.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByOtherProperty.kt deleted file mode 100644 index 3984543b306..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByOtherProperty.kt +++ /dev/null @@ -1,14 +0,0 @@ -class Delegate { - var name = "" - fun getValue(t: Any?, p: PropertyMetadata): String = name - fun propertyDelegated(p: PropertyMetadata) { name = p.name } -} - -class A { - val p = Delegate() - val prop by p -} - -fun box(): String { - return if (A().prop == "prop") "OK" else "fail" -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByTopLevelFun.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByTopLevelFun.kt deleted file mode 100644 index 541fa424235..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByTopLevelFun.kt +++ /dev/null @@ -1,15 +0,0 @@ -class Delegate { - var name = "" - fun getValue(t: Any?, p: PropertyMetadata): String = name - fun propertyDelegated(p: PropertyMetadata) { name = p.name } -} - -fun foo() = Delegate() - -class A { - val prop by foo() -} - -fun box(): String { - return if (A().prop == "prop") "OK" else "fail" -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByTopLevelProperty.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByTopLevelProperty.kt deleted file mode 100644 index c31f242705f..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByTopLevelProperty.kt +++ /dev/null @@ -1,15 +0,0 @@ -class Delegate { - var name = "" - fun getValue(t: Any?, p: PropertyMetadata): String = name - fun propertyDelegated(p: PropertyMetadata) { name = p.name } -} - -val p = Delegate() - -class A { - val prop by p -} - -fun box(): String { - return if (A().prop == "prop") "OK" else "fail" -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateForExtProperty.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateForExtProperty.kt deleted file mode 100644 index 16c4257b655..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateForExtProperty.kt +++ /dev/null @@ -1,14 +0,0 @@ -class Delegate { - var name = "" - fun getValue(t: A, p: PropertyMetadata): String = name - fun propertyDelegated(p: PropertyMetadata) { name = p.name } -} - -val A.prop by Delegate() - -class A { -} - -fun box(): String { - return if (A().prop == "prop") "OK" else "fail" -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateForExtPropertyInClass.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateForExtPropertyInClass.kt deleted file mode 100644 index db55e874656..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateForExtPropertyInClass.kt +++ /dev/null @@ -1,20 +0,0 @@ -class Delegate { - var name = "" - fun getValue(t: F.A, p: PropertyMetadata): String = name - fun propertyDelegated(p: PropertyMetadata) { name = p.name } -} - -class F { - val A.prop by Delegate() - - class A { - } - - fun foo(): String { - return A().prop - } -} - -fun box(): String { - return if (F().foo() == "prop") "OK" else "fail" -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/inTrait.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/inTrait.kt deleted file mode 100644 index 3721c144ebc..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/inTrait.kt +++ /dev/null @@ -1,17 +0,0 @@ -class Delegate { - var name = "" - fun getValue(t: Any?, p: PropertyMetadata): String = name - fun propertyDelegated(p: PropertyMetadata) { name = p.name } -} - -interface A { - val prop: String -} - -class AImpl: A { - override val prop by Delegate() -} - -fun box(): String { - return if(AImpl().prop == "prop") "OK" else "fail" -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/noneApplicable.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/noneApplicable.kt deleted file mode 100644 index e503457cc01..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/noneApplicable.kt +++ /dev/null @@ -1,17 +0,0 @@ -class Delegate { - var inner = "OK" - fun getValue(t: Any?, p: PropertyMetadata): String = inner - - private fun propertyDelegated(p: PropertyMetadata) { inner = "fail" } - fun propertyDelegated() { inner = "fail" } - fun propertyDelegated(a: Int) { inner = "fail" } - fun propertyDelegated(a: String) { inner = "fail" } - fun propertyDelegated(p: PropertyMetadata, a: Int) { inner = "fail" } - fun propertyDelegated(p: PropertyMetadata, s: String = "") { inner = "fail" } -} - -val prop by Delegate() - -fun box(): String { - return prop -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/pdAsExtensionFun.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/pdAsExtensionFun.kt deleted file mode 100644 index 106be45e098..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/pdAsExtensionFun.kt +++ /dev/null @@ -1,14 +0,0 @@ -class Delegate { - var name = "" - fun getValue(t: Any?, p: PropertyMetadata): String = name -} - -fun Delegate.propertyDelegated(p: PropertyMetadata) { name = p.name } - -class A { - val prop by Delegate() -} - -fun box(): String { - return if (A().prop == "prop") "OK" else "fail" -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/privateProperty.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/privateProperty.kt deleted file mode 100644 index 7e5143377c6..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/privateProperty.kt +++ /dev/null @@ -1,17 +0,0 @@ -class Delegate { - var name = "" - fun getValue(t: Any?, p: PropertyMetadata): String = name - fun propertyDelegated(p: PropertyMetadata) { name = p.name } -} - -class A { - private val prop by Delegate() - - fun test(): String { - return if (prop == "prop") "OK" else "fail" - } -} - -fun box(): String { - return A().test() -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/topLevel.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/topLevel.kt deleted file mode 100644 index 79dc6a3a92c..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/topLevel.kt +++ /dev/null @@ -1,11 +0,0 @@ -class Delegate { - var name = "" - fun getValue(t: Any?, p: PropertyMetadata): String = name - fun propertyDelegated(p: PropertyMetadata) { name = p.name } -} - -val prop by Delegate() - -fun box(): String { - return if (prop == "prop") "OK" else "fail" -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/twoPropsByOneDelegate.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/twoPropsByOneDelegate.kt deleted file mode 100644 index c527b0e0885..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/twoPropsByOneDelegate.kt +++ /dev/null @@ -1,14 +0,0 @@ -class Delegate { - var count = 0 - fun getValue(t: Any?, p: PropertyMetadata) {} - fun propertyDelegated(vararg p: PropertyMetadata) { count++ } -} - -val delegate = Delegate() - -val prop1 by delegate -val prop2 by delegate - -fun box(): String { - return if(delegate.count == 2) "OK" else "fail" -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/valInInnerClass.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/valInInnerClass.kt deleted file mode 100644 index c01f5d89d7b..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/valInInnerClass.kt +++ /dev/null @@ -1,16 +0,0 @@ -class Delegate { - var name = "" - fun getValue(t: Any?, p: PropertyMetadata): String = name - fun propertyDelegated(p: PropertyMetadata) { name = p.name } -} - -class A { - inner class B { - val prop by Delegate() - } -} - -fun box(): String { - val p = A().B().prop - return if(p == "prop") "OK" else "fail" -} diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/vararg.kt b/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/vararg.kt deleted file mode 100644 index 267f9ac22c7..00000000000 --- a/compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/vararg.kt +++ /dev/null @@ -1,11 +0,0 @@ -class Delegate { - var name = "" - fun getValue(t: Any?, p: PropertyMetadata): String = name - fun propertyDelegated(vararg p: PropertyMetadata) { name = p[0].name } -} - -val prop by Delegate() - -fun box(): String { - return if (prop == "prop") "OK" else "fail" -} diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java index f65b017b765..42cdfe14b5c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java @@ -3018,105 +3018,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/vararg.kt"); doTest(fileName); } - - @TestMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class PropertyDelegatedMethod extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInPropertyDelegatedMethod() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("defaultArgs.kt") - public void testDefaultArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/defaultArgs.kt"); - doTest(fileName); - } - - @TestMetadata("delegateAsInnerClass.kt") - public void testDelegateAsInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateAsInnerClass.kt"); - doTest(fileName); - } - - @TestMetadata("delegateByOtherProperty.kt") - public void testDelegateByOtherProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByOtherProperty.kt"); - doTest(fileName); - } - - @TestMetadata("delegateByTopLevelFun.kt") - public void testDelegateByTopLevelFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByTopLevelFun.kt"); - doTest(fileName); - } - - @TestMetadata("delegateByTopLevelProperty.kt") - public void testDelegateByTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByTopLevelProperty.kt"); - doTest(fileName); - } - - @TestMetadata("delegateForExtProperty.kt") - public void testDelegateForExtProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateForExtProperty.kt"); - doTest(fileName); - } - - @TestMetadata("delegateForExtPropertyInClass.kt") - public void testDelegateForExtPropertyInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateForExtPropertyInClass.kt"); - doTest(fileName); - } - - @TestMetadata("inTrait.kt") - public void testInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/inTrait.kt"); - doTest(fileName); - } - - @TestMetadata("noneApplicable.kt") - public void testNoneApplicable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/noneApplicable.kt"); - doTest(fileName); - } - - @TestMetadata("pdAsExtensionFun.kt") - public void testPdAsExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/pdAsExtensionFun.kt"); - doTest(fileName); - } - - @TestMetadata("privateProperty.kt") - public void testPrivateProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/privateProperty.kt"); - doTest(fileName); - } - - @TestMetadata("topLevel.kt") - public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/topLevel.kt"); - doTest(fileName); - } - - @TestMetadata("twoPropsByOneDelegate.kt") - public void testTwoPropsByOneDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/twoPropsByOneDelegate.kt"); - doTest(fileName); - } - - @TestMetadata("valInInnerClass.kt") - public void testValInInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/valInInnerClass.kt"); - doTest(fileName); - } - - @TestMetadata("vararg.kt") - public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/vararg.kt"); - doTest(fileName); - } - } } @TestMetadata("compiler/testData/codegen/box/diagnostics")