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

FIR2IR: Minor. Move withContainingFirClass to convertClassContent

Browse Source 
As it's anyway is being called each time
This commit is contained in:
Denis.Zharkov
2023-06-07 14:36:38 +02:00
committed by Space Team
parent c474c54903
commit 7087ba3ca9
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt
+4 -12
View File
@@ -142,9 +142,7 @@ class Fir2IrVisitor(
converter.processAnonymousObjectMembers(anonymousObject, correspondingClass, processHeaders = true)
converter.bindFakeOverridesInClass(correspondingClass)
conversionScope.withParent(correspondingClass) {
conversionScope.withContainingFirClass(anonymousObject) {
memberGenerator.convertClassContent(correspondingClass, anonymousObject)
}
memberGenerator.convertClassContent(correspondingClass, anonymousObject)
val constructor = correspondingClass.constructors.first()
irEnumEntry.initializerExpression = irFactory.createExpressionBody(
IrEnumConstructorCallImpl(
@@ -192,9 +190,7 @@ class Fir2IrVisitor(
val irClass = classifierStorage.getCachedIrClass(regularClass)?.apply { this.parent = irParent }
if (irClass != null) {
return conversionScope.withParent(irClass) {
conversionScope.withContainingFirClass(regularClass) {
memberGenerator.convertClassContent(irClass, regularClass)
}
memberGenerator.convertClassContent(irClass, regularClass)
}
}
converter.processLocalClassAndNestedClasses(regularClass, irParent)
@@ -204,9 +200,7 @@ class Fir2IrVisitor(
irClass.sealedSubclasses = regularClass.getIrSymbolsForSealedSubclasses()
}
return conversionScope.withParent(irClass) {
conversionScope.withContainingFirClass(regularClass) {
memberGenerator.convertClassContent(irClass, regularClass)
}
memberGenerator.convertClassContent(irClass, regularClass)
}
}
@@ -245,9 +239,7 @@ class Fir2IrVisitor(
?: converter.processLocalClassAndNestedClasses(anonymousObject, irParent)
conversionScope.withParent(irAnonymousObject) {
conversionScope.withContainingFirClass(anonymousObject) {
memberGenerator.convertClassContent(irAnonymousObject, anonymousObject)
}
memberGenerator.convertClassContent(irAnonymousObject, anonymousObject)
}
val anonymousClassType = irAnonymousObject.thisReceiver!!.type
return anonymousObject.convertWithOffsets { startOffset, endOffset ->
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt
+2 -4
View File
@@ -53,7 +53,7 @@ internal class ClassMemberGenerator(
private fun <T : IrDeclaration> applyParentFromStackTo(declaration: T): T = conversionScope.applyParentFromStackTo(declaration)
fun convertClassContent(irClass: IrClass, klass: FirClass) {
fun convertClassContent(irClass: IrClass, klass: FirClass): Unit = conversionScope.withContainingFirClass(klass) {
declarationStorage.enterScope(irClass)
conversionScope.withClass(irClass) {
val allDeclarations = buildList {
@@ -84,9 +84,7 @@ internal class ClassMemberGenerator(
val irNestedClass = classifierStorage.getCachedIrClass(declaration)!!
irNestedClass.parent = irClass
conversionScope.withParent(irNestedClass) {
conversionScope.withContainingFirClass(declaration) {
convertClassContent(irNestedClass, declaration)
}
convertClassContent(irNestedClass, declaration)
}
}
else -> declaration.accept(visitor, null)