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

[FIR] Make FirClass an inheritor of FirControlFlowGraphOwner

Browse Source 
Both inheritors of FirClass (FirRegularClass and FirAnonymousObject)
  already were CFG owners
This commit is contained in:
Dmitriy Novozhilov
2023-03-27 19:43:53 +03:00
committed by Space Team
parent a9c1091140
commit cbfa155333
10 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt
+1 -1
View File
@@ -34,7 +34,7 @@ object BuilderConfigurator : AbstractBuilderConfigurator<FirTreeBuilder>(FirTree
val classBuilder by builder {
parents += declarationBuilder
parents += annotationContainerBuilder
fields from klass without listOf("symbol", "resolvePhase")
fields from klass without listOf("symbol", "resolvePhase", "controlFlowGraphReference")
}
builder(regularClass) {
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt
+3 -3
View File
@@ -51,8 +51,8 @@ object FirTreeBuilder : AbstractFirTreeBuilder() {
val functionTypeParameter by element(Other, baseFirElement)
val classLikeDeclaration by sealedElement(Declaration, memberDeclaration, statement)
val klass by sealedElement("Class", Declaration, classLikeDeclaration, statement, typeParameterRefsOwner)
val regularClass by element(Declaration, klass, controlFlowGraphOwner)
val klass by sealedElement("Class", Declaration, classLikeDeclaration, statement, typeParameterRefsOwner, controlFlowGraphOwner)
val regularClass by element(Declaration, klass)
val typeAlias by element(Declaration, classLikeDeclaration, typeParametersOwner)
val function by sealedElement(Declaration, callableDeclaration, targetElement, controlFlowGraphOwner, statement)
@@ -69,7 +69,7 @@ object FirTreeBuilder : AbstractFirTreeBuilder() {
val anonymousFunction by element(Declaration, function, typeParametersOwner, contractDescriptionOwner)
val anonymousFunctionExpression by element(Expression, expression)
val anonymousObject by element(Declaration, klass, controlFlowGraphOwner)
val anonymousObject by element(Declaration, klass)
val anonymousObjectExpression by element(Expression, expression)
val diagnosticHolder by element(Diagnostics)