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

K2: fix implementation of EXTENSION_PROPERTY_MUST_HAVE_ACCESSORS_OR_BE_ABSTRACT

Browse Source 
This commit fixes
`FirCompileKotlinAgainstCustomBinariesTest.testUnreachableExtensionVarPropertyDeclaration`.
This commit is contained in:
Mikhail Glukhikh
2023-07-27 20:35:27 +02:00
committed by Space Team
parent 54c7466074
commit 0abf17201f
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
<!MUST_BE_INITIALIZED!>private var Int.readOnlyWrapper: CharSequence?<!> get() = null
<!MUST_BE_INITIALIZED!>private var Int.mutableWrapper: CharSequence?<!> get() = null
<!EXTENSION_PROPERTY_MUST_HAVE_ACCESSORS_OR_BE_ABSTRACT!>private var Int.readOnlyWrapper: CharSequence?<!> get() = null
<!EXTENSION_PROPERTY_MUST_HAVE_ACCESSORS_OR_BE_ABSTRACT!>private var Int.mutableWrapper: CharSequence?<!> get() = null
fun main(x: Int) {
val x = if (x > 1) x::readOnlyWrapper else x::mutableWrapper
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt
+4 -1
View File
@@ -130,7 +130,7 @@ internal fun checkPropertyInitializer(
!isExternal &&
!property.hasExplicitBackingField
) {
if (property.receiverParameter != null && !property.hasAnyAccessorImplementation) {
if (property.receiverParameter != null && !property.hasAllAccessorImplementation) {
reporter.reportOn(propertySource, FirErrors.EXTENSION_PROPERTY_MUST_HAVE_ACCESSORS_OR_BE_ABSTRACT, context)
} else if (reachable) {
reportMustBeInitialized(property, isDefinitelyAssignedInConstructor, containingClass, propertySource, reporter, context)
@@ -209,6 +209,9 @@ private val FirProperty.hasSetterAccessorImplementation: Boolean
private val FirProperty.hasAnyAccessorImplementation: Boolean
get() = getter.hasImplementation || setter.hasImplementation
private val FirProperty.hasAllAccessorImplementation: Boolean
get() = getter.hasImplementation && (isVal || setter.hasImplementation)
private fun FirProperty.getEffectiveModality(containingClass: FirClass?, languageVersionSettings: LanguageVersionSettings): Modality? =
when (languageVersionSettings.supportsFeature(LanguageFeature.TakeIntoAccountEffectivelyFinalInMustBeInitializedCheck) &&
status.modality == Modality.OPEN && containingClass?.status?.modality == Modality.FINAL) {
compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.kt
+1 -2
View File
@@ -663,8 +663,7 @@ abstract class AbstractCompileKotlinAgainstCustomBinariesTest : AbstractKotlinCo
compileKotlin("main.kt", tmpdir, listOf(library), additionalOptions = features)
}
// Fixed in the LV2.0 branch.
fun testUnreachableExtensionVarPropertyDeclaration() = muteForK2 {
fun testUnreachableExtensionVarPropertyDeclaration() {
val (output, exitCode) = compileKotlin("source.kt", tmpdir, expectedFileName = null)
assertEquals("Output:\n$output", ExitCode.COMPILATION_ERROR, exitCode)
}