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

FIR: Use attribute instead of overriddenSymbol for synthetic type alias constructor

Browse Source
This commit is contained in:
Denis Zharkov
2020-10-30 12:37:04 +03:00
parent 4282e27d73
commit 8a949b0dcf
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+5
View File
@@ -225,6 +225,11 @@ internal tailrec fun FirCallableSymbol<*>.unwrapSubstitutionAndIntersectionOverr
} }
internal tailrec fun FirCallableSymbol<*>.unwrapCallRepresentative(root: FirCallableSymbol<*> = this): FirCallableSymbol<*> { internal tailrec fun FirCallableSymbol<*>.unwrapCallRepresentative(root: FirCallableSymbol<*> = this): FirCallableSymbol<*> {
val fir = fir
if (fir is FirConstructor) {
val originalForTypeAlias = fir.originalConstructorIfTypeAlias
if (originalForTypeAlias != null) return originalForTypeAlias.symbol.unwrapCallRepresentative(this)
}
if (fir.isIntersectionOverride) return this if (fir.isIntersectionOverride) return this
val overriddenSymbol = fir.originalForSubstitutionOverride?.takeIf { val overriddenSymbol = fir.originalForSubstitutionOverride?.takeIf {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt
+7 -2
View File
@@ -232,7 +232,7 @@ private fun prepareSubstitutingScopeForTypeAliasConstructors(
typeAliasSymbol: FirTypeAliasSymbol, typeAliasSymbol: FirTypeAliasSymbol,
session: FirSession, session: FirSession,
delegatingScope: FirScope delegatingScope: FirScope
): FirScope? { ): FirScope {
val copyFactory2: ConstructorCopyFactory<FirConstructor> = factory@{ newReturnType, newParameterTypes, newTypeParameters -> val copyFactory2: ConstructorCopyFactory<FirConstructor> = factory@{ newReturnType, newParameterTypes, newTypeParameters ->
buildConstructor { buildConstructor {
source = this@factory.source source = this@factory.source
@@ -329,7 +329,9 @@ private fun prepareCopyConstructorForTypealiasNestedClass(
val extCopy = buildConstructorCopy(originalSymbol.fir) { val extCopy = buildConstructorCopy(originalSymbol.fir) {
origin = FirDeclarationOrigin.Synthetic origin = FirDeclarationOrigin.Synthetic
receiverTypeRef = innerTypeRef.withReplacedConeType(outerType) receiverTypeRef = innerTypeRef.withReplacedConeType(outerType)
symbol = FirConstructorSymbol(originalSymbol.callableId, overriddenSymbol = originalSymbol) symbol = FirConstructorSymbol(originalSymbol.callableId)
}.apply {
originalConstructorIfTypeAlias = originalSymbol.fir
} }
return extCopy.symbol return extCopy.symbol
} }
@@ -337,3 +339,6 @@ private fun prepareCopyConstructorForTypealiasNestedClass(
} }
return null return null
} }
private object TypeAliasConstructorKey : FirDeclarationDataKey()
var FirConstructor.originalConstructorIfTypeAlias: FirConstructor? by FirDeclarationDataRegistry.data(TypeAliasConstructorKey)