azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IR] Implement getContextReceiverParameters for IrBasedPropertyDescriptor

Browse Source 
Fixes: KT-59590
This commit is contained in:
Xin Wang
2023-08-24 17:33:32 +08:00
committed by Space Team
parent 03ad981dea
commit 51325ba630
11 changed files with 126 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java
Generated
+22
View File
@@ -78,6 +78,28 @@ public class FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated extends Abstra
runTest("compiler/testData/diagnostics/testsWithJvmBackend/suspensionPointInMonitor.kt");
}
@Nested
@TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers")
@TestDataPath("$PROJECT_ROOT")
public class ContextReceivers {
@Test
public void testAllFilesPresentInContextReceivers() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("kt59590.kt")
public void testKt59590() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590.kt");
}
@Test
@TestMetadata("kt59590WithContextReceiver.kt")
public void testKt59590WithContextReceiver() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590WithContextReceiver.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature")
@TestDataPath("$PROJECT_ROOT")
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java
Generated
+22
View File
@@ -78,6 +78,28 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP
runTest("compiler/testData/diagnostics/testsWithJvmBackend/suspensionPointInMonitor.kt");
}
@Nested
@TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers")
@TestDataPath("$PROJECT_ROOT")
public class ContextReceivers {
@Test
public void testAllFilesPresentInContextReceivers() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("kt59590.kt")
public void testKt59590() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590.kt");
}
@Test
@TestMetadata("kt59590WithContextReceiver.kt")
public void testKt59590WithContextReceiver() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590WithContextReceiver.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature")
@TestDataPath("$PROJECT_ROOT")
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt
+2 -2
View File
@@ -902,7 +902,7 @@ open class IrBasedPropertyDescriptor(owner: IrProperty) :
owner.getter?.extensionReceiverParameter?.toIrBasedDescriptor() as? ReceiverParameterDescriptor
override fun getContextReceiverParameters(): List<ReceiverParameterDescriptor> {
TODO("Not yet implemented")
return getter?.contextReceiverParameters ?: emptyList()
}
override fun isExternal() = owner.isExternal
@@ -1098,7 +1098,7 @@ open class IrBasedFieldDescriptor(owner: IrField) : PropertyDescriptor, IrBasedD
owner.correspondingPropertySymbol?.owner?.toIrBasedDescriptor()?.extensionReceiverParameter
override fun getContextReceiverParameters(): List<ReceiverParameterDescriptor> {
TODO("Not yet implemented")
return owner.correspondingPropertySymbol?.owner?.toIrBasedDescriptor()?.contextReceiverParameters ?: emptyList()
}
override fun isExternal() = owner.isExternal
compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590.diag.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
/kt59590.kt:5:1: error: Platform declaration clash: The following declarations have the same JVM signature (INSTANCELO;):
val INSTANCE: O? defined in O
val INSTANCE: O defined in O
/kt59590.kt:6:5: error: Platform declaration clash: The following declarations have the same JVM signature (INSTANCELO;):
val INSTANCE: O? defined in O
val INSTANCE: O defined in O
compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590.fir.diag.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
/kt59590.fir.kt:4:1: error: Platform declaration clash: The following declarations have the same JVM signature (INSTANCELO;):
val INSTANCE: O? defined in O
val INSTANCE: O defined in O
/kt59590.fir.kt:5:5: error: Platform declaration clash: The following declarations have the same JVM signature (INSTANCELO;):
val INSTANCE: O? defined in O
val INSTANCE: O defined in O
compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// FIR_IDENTICAL
// WITH_STDLIB
// !RENDER_ALL_DIAGNOSTICS_FULL_TEXT
<!CONFLICTING_JVM_DECLARATIONS!>object O {
<!CONFLICTING_JVM_DECLARATIONS!>@JvmField
val INSTANCE: O? = null<!>
}<!>
compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590WithContextReceiver.diag.txt
Vendored
+13
View File
@@ -0,0 +1,13 @@
/kt59590WithContextReceiver.kt:4:1: error: Platform declaration clash: The following declarations have the same JVM signature (INSTANCELO;):
context(O) val INSTANCE: O? defined in O
val INSTANCE: O defined in O
/kt59590WithContextReceiver.kt:5:5: error: The feature "context receivers" is experimental and should be enabled explicitly
/kt59590WithContextReceiver.kt:5:5: error: The feature "context receivers" is experimental and should be enabled explicitly
/kt59590WithContextReceiver.kt:5:5: error: Platform declaration clash: The following declarations have the same JVM signature (INSTANCELO;):
context(O) val INSTANCE: O? defined in O
val INSTANCE: O defined in O
/kt59590WithContextReceiver.kt:7:24: error: Property with context receivers cannot be initialized because it has no backing field
compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590WithContextReceiver.fir.diag.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
/kt59590WithContextReceiver.fir.kt:4:1: error: Platform declaration clash: The following declarations have the same JVM signature (INSTANCELO;):
context(O) val INSTANCE: O? defined in O
val INSTANCE: O defined in O
/kt59590WithContextReceiver.fir.kt:5:5: error: Platform declaration clash: The following declarations have the same JVM signature (INSTANCELO;):
context(O) val INSTANCE: O? defined in O
val INSTANCE: O defined in O
compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590WithContextReceiver.fir.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// WITH_STDLIB
// !RENDER_ALL_DIAGNOSTICS_FULL_TEXT
<!CONFLICTING_JVM_DECLARATIONS!>object O {
<!CONFLICTING_JVM_DECLARATIONS!>context(O)
@JvmField
val INSTANCE: O? = null<!>
}<!>
compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590WithContextReceiver.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// WITH_STDLIB
// !RENDER_ALL_DIAGNOSTICS_FULL_TEXT
<!CONFLICTING_JVM_DECLARATIONS!>object O {
<!CONFLICTING_JVM_DECLARATIONS!><!UNSUPPORTED_FEATURE, UNSUPPORTED_FEATURE!>context(O)<!>
@JvmField
val INSTANCE: O? = <!CONTEXT_RECEIVERS_WITH_BACKING_FIELD!>null<!><!>
}<!>
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java
Generated
+22
View File
@@ -79,6 +79,28 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
runTest("compiler/testData/diagnostics/testsWithJvmBackend/suspensionPointInMonitor.kt");
}
@Nested
@TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers")
@TestDataPath("$PROJECT_ROOT")
public class ContextReceivers {
@Test
public void testAllFilesPresentInContextReceivers() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers"), Pattern.compile("^(.+)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true);
}
@Test
@TestMetadata("kt59590.kt")
public void testKt59590() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590.kt");
}
@Test
@TestMetadata("kt59590WithContextReceiver.kt")
public void testKt59590WithContextReceiver() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJvmBackend/contextReceivers/kt59590WithContextReceiver.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature")
@TestDataPath("$PROJECT_ROOT")