[FIR] Don't create synthetic property if getter and property came from the same class
Usually we create synthetic property in java class if there is a property
from the base kotlin class and getter/setter with a corresponding name
in the declared scope or one of supertype scopes. But there is a case,
where the same supertype contains both property and getter:
```
// FILE: Base.kt
open class Base {
open val b = "O"
@JvmName("getBJava")
fun getB() : String = "K"
}
// FILE: Derived.java
public class Derived extends Base {}
```
In this case we shouldn't create synthetic property, because `getB()`
function is invisible for `Derived` class
^KT-66020 Fixed
This commit is contained in:
committed by
Space Team
parent
513f86f8fc
commit
6a94a3331f
+4
-3
@@ -175,12 +175,13 @@ class JavaClassUseSiteMemberScope(
|
||||
}
|
||||
|
||||
internal fun syntheticPropertyFromOverride(overriddenProperty: ResultOfIntersection<FirPropertySymbol>): FirSyntheticPropertySymbol? {
|
||||
val overrideInClass = overriddenProperty.overriddenMembers.firstNotNullOfOrNull { (symbol, _) ->
|
||||
val overrideInClass = overriddenProperty.overriddenMembers.firstNotNullOfOrNull superMember@{ (symbol, baseScope) ->
|
||||
// We may call this function at the STATUS phase, which means that using resolved status may lead to cycle
|
||||
// So we need to use raw status here
|
||||
if (!symbol.isVisibleInClass(klass.symbol, symbol.rawStatus)) return@firstNotNullOfOrNull null
|
||||
if (!symbol.isVisibleInClass(klass.symbol, symbol.rawStatus)) return@superMember null
|
||||
symbol.createOverridePropertyIfExists(declaredMemberScope, takeModalityFromGetter = true)
|
||||
?: superTypeScopes.firstNotNullOfOrNull { scope ->
|
||||
?: superTypeScopes.firstNotNullOfOrNull superScope@{ scope ->
|
||||
if (scope == baseScope) return@superScope null
|
||||
symbol.createOverridePropertyIfExists(scope, takeModalityFromGetter = false)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user