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

[FIR] Properly set sources of intersection overrides

Browse Source 
Otherwise, they may point to one of
the base intersected functions, and
if we start reporting diagnostics on
them, they'll appear on base
functions.
This commit is contained in:
Nikolay Lunyak
2023-11-29 12:00:02 +02:00
committed by Space Team
parent 3b5fff5473
commit 686abb112d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt
+4 -3
View File
@@ -121,9 +121,9 @@ object FirFakeOverrideGenerator {
newModality: Modality? = null, newModality: Modality? = null,
newVisibility: Visibility? = null, newVisibility: Visibility? = null,
deferredReturnTypeCalculation: CallableCopyDeferredReturnTypeCalculation? = null, deferredReturnTypeCalculation: CallableCopyDeferredReturnTypeCalculation? = null,
newSource: KtSourceElement? = null, newSource: KtSourceElement? = derivedClassLookupTag?.toSymbol(session)?.source ?: baseFunction.source,
): FirSimpleFunction = buildSimpleFunction { ): FirSimpleFunction = buildSimpleFunction {
source = newSource ?: derivedClassLookupTag?.toSymbol(session)?.source ?: baseFunction.source source = newSource
moduleData = session.nullableModuleData ?: baseFunction.moduleData moduleData = session.nullableModuleData ?: baseFunction.moduleData
this.origin = origin this.origin = origin
name = baseFunction.name name = baseFunction.name
@@ -401,8 +401,9 @@ object FirFakeOverrideGenerator {
newModality: Modality? = null, newModality: Modality? = null,
newVisibility: Visibility? = null, newVisibility: Visibility? = null,
deferredReturnTypeCalculation: CallableCopyDeferredReturnTypeCalculation? = null, deferredReturnTypeCalculation: CallableCopyDeferredReturnTypeCalculation? = null,
newSource: KtSourceElement? = derivedClassLookupTag?.toSymbol(session)?.source ?: baseProperty.source,
): FirProperty = buildProperty { ): FirProperty = buildProperty {
source = derivedClassLookupTag?.toSymbol(session)?.source ?: baseProperty.source source = newSource
moduleData = session.nullableModuleData ?: baseProperty.moduleData moduleData = session.nullableModuleData ?: baseProperty.moduleData
this.origin = origin this.origin = origin
name = baseProperty.name name = baseProperty.name
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScopeContext.kt
+3 -1
View File
@@ -358,6 +358,7 @@ class FirTypeIntersectionScopeContext(
newDispatchReceiverType = dispatchReceiverType, newDispatchReceiverType = dispatchReceiverType,
deferredReturnTypeCalculation = deferredReturnTypeCalculation, deferredReturnTypeCalculation = deferredReturnTypeCalculation,
newReturnType = if (!forClassUseSiteScope && deferredReturnTypeCalculation == null) intersectReturnTypes(mostSpecific) else null, newReturnType = if (!forClassUseSiteScope && deferredReturnTypeCalculation == null) intersectReturnTypes(mostSpecific) else null,
newSource = dispatchReceiverType.toSymbol(session)?.source,
).apply { ).apply {
originalForIntersectionOverrideAttr = keyFir originalForIntersectionOverrideAttr = keyFir
} }
@@ -385,7 +386,8 @@ class FirTypeIntersectionScopeContext(
deferredReturnTypeCalculation = deferredReturnTypeCalculation, deferredReturnTypeCalculation = deferredReturnTypeCalculation,
// If any of the properties are vars and the types are not equal, these declarations are conflicting // If any of the properties are vars and the types are not equal, these declarations are conflicting
// anyway and their uses should result in an overload resolution error. // anyway and their uses should result in an overload resolution error.
newReturnType = returnType newReturnType = returnType,
newSource = dispatchReceiverType.toSymbol(session)?.source,
) )
} }
} }