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

[FIR] Collect constructors from scope instead of .declarations in metadata serialization

Browse Source 
This is needed to save in metadata constructors, generated by plugins
  with FirDeclarationGenerationExtension
This commit is contained in:
Dmitriy Novozhilov
2023-01-31 12:40:20 +02:00
committed by Space Team
parent 12d0b1e846
commit 8350226bad
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt
+28 -17
View File
@@ -29,10 +29,7 @@ import org.jetbrains.kotlin.fir.extensions.extensionService
import org.jetbrains.kotlin.fir.extensions.typeAttributeExtensions import org.jetbrains.kotlin.fir.extensions.typeAttributeExtensions
import org.jetbrains.kotlin.fir.resolve.* import org.jetbrains.kotlin.fir.resolve.*
import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider
import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator import org.jetbrains.kotlin.fir.scopes.*
import org.jetbrains.kotlin.fir.scopes.getSingleClassifier
import org.jetbrains.kotlin.fir.scopes.processAllFunctions
import org.jetbrains.kotlin.fir.scopes.processAllProperties
import org.jetbrains.kotlin.fir.serialization.constant.EnumValue import org.jetbrains.kotlin.fir.serialization.constant.EnumValue
import org.jetbrains.kotlin.fir.serialization.constant.IntValue import org.jetbrains.kotlin.fir.serialization.constant.IntValue
import org.jetbrains.kotlin.fir.serialization.constant.StringValue import org.jetbrains.kotlin.fir.serialization.constant.StringValue
@@ -139,7 +136,7 @@ class FirElementSerializer private constructor(
} }
if (regularClass != null && regularClass.classKind != ClassKind.ENUM_ENTRY) { if (regularClass != null && regularClass.classKind != ClassKind.ENUM_ENTRY) {
for (constructor in regularClass.declarations.filterIsInstance<FirConstructor>()) { for (constructor in regularClass.constructors()) {
builder.addConstructor(constructorProto(constructor)) builder.addConstructor(constructorProto(constructor))
} }
} }
@@ -233,26 +230,40 @@ class FirElementSerializer private constructor(
return builder return builder
} }
private fun FirClass.declarations(): List<FirCallableDeclaration> = buildList { private fun FirClass.memberDeclarations(): List<FirCallableDeclaration> {
val memberScope = return collectDeclarations<FirCallableDeclaration, FirCallableSymbol<*>> { memberScope, addDeclarationIfNeeded ->
defaultType().scope(session, scopeSession, FakeOverrideTypeCalculator.DoNothing, requiredPhase = null) memberScope.processAllFunctions { addDeclarationIfNeeded(it) }
?: error("Null scope for $this") memberScope.processAllProperties { addDeclarationIfNeeded(it) }
}
}
fun addDeclarationIfNeeded(symbol: FirCallableSymbol<*>) { private fun FirClass.constructors(): List<FirConstructor> {
val declaration = symbol.fir return collectDeclarations { memberScope, addDeclarationIfNeeded ->
if (declaration.isSubstitutionOrIntersectionOverride) return memberScope.processDeclaredConstructors { addDeclarationIfNeeded(it) }
}
}
private inline fun <reified T : FirCallableDeclaration, S : FirCallableSymbol<*>> FirClass.collectDeclarations(
processScope: (FirTypeScope, ((S) -> Unit)) -> Unit
): List<T> = buildList {
val memberScope = unsubstitutedScope(session, scopeSession, withForcedTypeCalculator = false)
processScope(memberScope) l@{
val declaration = it.fir as T
if (declaration.isSubstitutionOrIntersectionOverride) return@l
// non-intersection or substitution fake override // non-intersection or substitution fake override
if (!declaration.isStatic && declaration.dispatchReceiverClassLookupTagOrNull() != this@declarations.symbol.toLookupTag()) return if (!(declaration.isStatic || declaration is FirConstructor)) {
if (declaration.dispatchReceiverClassLookupTagOrNull()!= this@collectDeclarations.symbol.toLookupTag()) {
return@l
}
}
add(declaration) add(declaration)
} }
memberScope.processAllFunctions(::addDeclarationIfNeeded)
memberScope.processAllProperties(::addDeclarationIfNeeded)
for (declaration in declarations) { for (declaration in declarations) {
if (declaration is FirCallableDeclaration && declaration.isStatic) { if (declaration is T && declaration.isStatic) {
add(declaration) add(declaration)
} }
} }