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

[FIR] Generate IR for generated FIR declarations

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-10-01 15:11:06 +03:00
committed by TeamCityServer
parent e3579389ee
commit 233b9f1242
15 changed files with 265 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+29
View File
@@ -13,7 +13,9 @@ import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.fir.*
import org.jetbrains.kotlin.fir.backend.generators.FakeOverrideGenerator
import org.jetbrains.kotlin.fir.builder.buildPackageDirective
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.builder.buildFile
import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
import org.jetbrains.kotlin.fir.declarations.utils.isInline
import org.jetbrains.kotlin.fir.declarations.utils.isJava
@@ -21,6 +23,8 @@ import org.jetbrains.kotlin.fir.declarations.utils.visibility
import org.jetbrains.kotlin.fir.expressions.FirAnnotation
import org.jetbrains.kotlin.fir.expressions.FirConstExpression
import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess
import org.jetbrains.kotlin.fir.extensions.declarationGenerators
import org.jetbrains.kotlin.fir.extensions.extensionService
import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
import org.jetbrains.kotlin.fir.references.FirReference
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
@@ -569,3 +573,28 @@ fun FirRegularClass.getIrSymbolsForSealedSubclasses(components: Fir2IrComponents
symbolProvider.getClassLikeSymbolByClassId(it)?.toSymbol(session, components.classifierStorage)
}.filterIsInstance<IrClassSymbol>()
}
fun FirSession.createFilesWithGeneratedDeclarations(): List<FirFile> {
val symbolProvider = symbolProvider
val declarationGenerators = extensionService.declarationGenerators
val topLevelClasses = declarationGenerators.flatMap { it.getTopLevelClassIds() }.groupBy { it.packageFqName }
val topLevelCallables = declarationGenerators.flatMap { it.getTopLevelCallableIds() }.groupBy { it.packageName }
return buildList {
for (packageFqName in (topLevelClasses.keys + topLevelCallables.keys)) {
this += buildFile {
origin = FirDeclarationOrigin.Synthetic
moduleData = this@createFilesWithGeneratedDeclarations.moduleData
packageDirective = buildPackageDirective {
this.packageFqName = packageFqName
}
name = "__GENERATED DECLARATIONS__.kt"
declarations += topLevelCallables.getOrDefault(packageFqName, emptyList())
.flatMap { symbolProvider.getTopLevelCallableSymbols(packageFqName, it.callableName) }
.map { it.fir }
declarations += topLevelClasses.getOrDefault(packageFqName, emptyList())
.mapNotNull { symbolProvider.getClassLikeSymbolByClassId(it)?.fir }
}
}
}
}
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
+63 -11
View File
@@ -15,13 +15,16 @@ import org.jetbrains.kotlin.fir.declarations.utils.isLocal
import org.jetbrains.kotlin.fir.declarations.utils.isSynthetic
import org.jetbrains.kotlin.fir.declarations.utils.primaryConstructor
import org.jetbrains.kotlin.fir.descriptors.FirModuleDescriptor
import org.jetbrains.kotlin.fir.extensions.declarationGenerators
import org.jetbrains.kotlin.fir.extensions.extensionService
import org.jetbrains.kotlin.fir.extensions.generatedMembers
import org.jetbrains.kotlin.fir.extensions.generatedNestedClassifiers
import org.jetbrains.kotlin.fir.packageFqName
import org.jetbrains.kotlin.fir.psi
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.signaturer.FirBasedSignatureComposer
import org.jetbrains.kotlin.fir.signaturer.FirMangler
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
import org.jetbrains.kotlin.ir.PsiIrFileEntry
import org.jetbrains.kotlin.ir.*
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl
import org.jetbrains.kotlin.ir.declarations.impl.IrModuleFragmentImpl
@@ -40,6 +43,8 @@ class Fir2IrConverter(
private val components: Fir2IrComponents
) : Fir2IrComponents by components {
private val generatorExtensions = session.extensionService.declarationGenerators
fun processLocalClassAndNestedClasses(regularClass: FirRegularClass, parent: IrDeclarationParent) {
val irClass = registerClassAndNestedClasses(regularClass, parent)
processClassAndNestedClassHeaders(regularClass)
@@ -57,8 +62,30 @@ class Fir2IrConverter(
}
fun registerFileAndClasses(file: FirFile, moduleFragment: IrModuleFragment) {
val fileEntry = when (file.origin) {
FirDeclarationOrigin.Source -> PsiIrFileEntry(file.psi as KtFile)
FirDeclarationOrigin.Synthetic -> object : IrFileEntry {
override val name = file.name
override val maxOffset = UNDEFINED_OFFSET
override fun getSourceRangeInfo(beginOffset: Int, endOffset: Int): SourceRangeInfo =
SourceRangeInfo(
"",
UNDEFINED_OFFSET,
UNDEFINED_OFFSET,
UNDEFINED_OFFSET,
UNDEFINED_OFFSET,
UNDEFINED_OFFSET,
UNDEFINED_OFFSET
)
override fun getLineNumber(offset: Int) = UNDEFINED_OFFSET
override fun getColumnNumber(offset: Int) = UNDEFINED_OFFSET
}
else -> error("Unsupported file origin: ${file.origin}")
}
val irFile = IrFileImpl(
PsiIrFileEntry(file.psi as KtFile),
fileEntry,
moduleDescriptor.getPackage(file.packageFqName).fragments.first(),
moduleFragment
)
@@ -130,14 +157,20 @@ class Fir2IrConverter(
regularClass: FirRegularClass,
irClass: IrClass = classifierStorage.getCachedIrClass(regularClass)!!
): IrClass {
val irConstructor = regularClass.primaryConstructor?.let {
declarationStorage.getOrCreateIrConstructor(it, irClass, isLocal = regularClass.isLocal)
val allDeclarations = mutableListOf<FirDeclaration>().apply {
addAll(regularClass.declarations.toMutableList())
if (generatorExtensions.isNotEmpty()) {
addAll(regularClass.generatedMembers(session))
addAll(regularClass.generatedNestedClassifiers(session))
}
}
val irConstructor = (allDeclarations.firstOrNull { it is FirConstructor && it.isPrimary })?.let {
declarationStorage.getOrCreateIrConstructor(it as FirConstructor, irClass, isLocal = regularClass.isLocal)
}
if (irConstructor != null) {
irClass.declarations += irConstructor
}
val allDeclarations = regularClass.declarations.toMutableList()
for (declaration in syntheticPropertiesLast(regularClass.declarations)) {
for (declaration in syntheticPropertiesLast(allDeclarations)) {
val irDeclaration = processMemberDeclaration(declaration, regularClass, irClass) ?: continue
irClass.declarations += irDeclaration
}
@@ -186,6 +219,13 @@ class Fir2IrConverter(
registerClassAndNestedClasses(it, irClass)
}
}
if (generatorExtensions.isNotEmpty()) {
regularClass.generatedNestedClassifiers(session).forEach {
if (it is FirRegularClass) {
registerClassAndNestedClasses(it, irClass)
}
}
}
return irClass
}
@@ -196,6 +236,13 @@ class Fir2IrConverter(
processClassAndNestedClassHeaders(it)
}
}
if (generatorExtensions.isNotEmpty()) {
regularClass.generatedNestedClassifiers(session).forEach {
if (it is FirRegularClass) {
processClassAndNestedClassHeaders(it)
}
}
}
}
private fun processMemberDeclaration(
@@ -294,7 +341,12 @@ class Fir2IrConverter(
components.callGenerator = callGenerator
val irModuleFragment = IrModuleFragmentImpl(moduleDescriptor, irBuiltIns)
for (firFile in firFiles) {
val allFirFiles = buildList {
addAll(firFiles)
addAll(session.createFilesWithGeneratedDeclarations())
}
for (firFile in allFirFiles) {
converter.registerFileAndClasses(firFile, irModuleFragment)
}
val irProviders =
@@ -306,14 +358,14 @@ class Fir2IrConverter(
// Necessary call to generate built-in IR classes
externalDependenciesGenerator.generateUnboundSymbolsAsDependencies()
classifierStorage.preCacheBuiltinClasses()
for (firFile in firFiles) {
for (firFile in allFirFiles) {
converter.processClassHeaders(firFile)
}
for (firFile in firFiles) {
for (firFile in allFirFiles) {
converter.processFileAndClassMembers(firFile)
}
for (firFile in firFiles) {
for (firFile in allFirFiles) {
firFile.accept(fir2irVisitor, null)
}
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt
+14 -3
View File
@@ -12,12 +12,15 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyGetter
import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertySetter
import org.jetbrains.kotlin.fir.declarations.utils.isExpect
import org.jetbrains.kotlin.fir.declarations.utils.isFromEnumClass
import org.jetbrains.kotlin.fir.declarations.utils.primaryConstructor
import org.jetbrains.kotlin.fir.declarations.utils.visibility
import org.jetbrains.kotlin.fir.dispatchReceiverClassOrNull
import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
import org.jetbrains.kotlin.fir.expressions.FirExpression
import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression
import org.jetbrains.kotlin.fir.extensions.declarationGenerators
import org.jetbrains.kotlin.fir.extensions.extensionService
import org.jetbrains.kotlin.fir.extensions.generatedMembers
import org.jetbrains.kotlin.fir.extensions.generatedNestedClassifiers
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
@@ -48,7 +51,15 @@ internal class ClassMemberGenerator(
fun convertClassContent(irClass: IrClass, klass: FirClass) {
declarationStorage.enterScope(irClass)
conversionScope.withClass(irClass) {
val primaryConstructor = klass.primaryConstructor
val allDeclarations = buildList {
addAll(klass.declarations)
if (session.extensionService.declarationGenerators.isNotEmpty()) {
addAll(klass.generatedMembers(session))
addAll(klass.generatedNestedClassifiers(session))
}
}
val primaryConstructor = allDeclarations.firstOrNull { it is FirConstructor && it.isPrimary } as FirConstructor?
val irPrimaryConstructor = primaryConstructor?.let { declarationStorage.getCachedIrConstructor(it)!! }
if (irPrimaryConstructor != null) {
with(declarationStorage) {
@@ -60,7 +71,7 @@ internal class ClassMemberGenerator(
fakeOverrideGenerator.bindOverriddenSymbols(irClass.declarations)
components.delegatedMemberGenerator.bindDelegatedMembersOverriddenSymbols(irClass)
klass.declarations.forEach { declaration ->
allDeclarations.forEach { declaration ->
when {
declaration is FirTypeAlias -> {
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/generatedDeclarationsUtils.kt
+48
View File
@@ -0,0 +1,48 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.extensions
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirClass
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.fir.scopes.impl.declaredMemberScope
import org.jetbrains.kotlin.fir.scopes.processClassifiersByName
fun FirClass.generatedNestedClassifiers(session: FirSession): List<FirDeclaration> {
val scope = session.declaredMemberScope(this)
val result = mutableListOf<FirDeclaration>()
for (name in scope.getClassifierNames()) {
scope.processClassifiersByName(name) {
if (it.fir.origin.generated) {
result += it.fir
}
}
}
return result
}
fun FirClass.generatedMembers(session: FirSession): List<FirDeclaration> {
val scope = session.declaredMemberScope(this)
val result = mutableListOf<FirDeclaration>()
for (name in scope.getCallableNames()) {
scope.processFunctionsByName(name) {
if (it.fir.origin.generated) {
result += it.fir
}
}
scope.processPropertiesByName(name) {
if (it.fir.origin.generated) {
result += it.fir
}
}
}
scope.processDeclaredConstructors {
if (it.fir.origin.generated) {
result += it.fir
}
}
return result
}