Skip to content

Commit 010ebc6

Browse files
aviroop-123aviroop-123
committed
Elide function / method bodies in LT2FIR during header compilation.
^KT-78422
1 parent 5e7de6b commit 010ebc6

File tree

5 files changed

+51
-22
lines changed

5 files changed

+51
-22
lines changed

‎compiler/fir/analysis-tests/testData/resolve/headerMode/constructorDeclaration.fir.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ FILE: constructorDeclaration.kt
1212

1313
public constructor(e: R|kotlin/String|): R|A| {
1414
this<R|A|>(R|<local>/e|, Int(0))
15-
lval message: R|kotlin/String| = String(Secondary constructor body)
1615
}
1716

1817
public constructor(): R|A| {
1918
this<R|A|>(String())
20-
lval message: R|kotlin/String| = String(Secondary constructor body with delegated constructor call)
2119
}
2220

2321
}
@@ -34,12 +32,10 @@ FILE: constructorDeclaration.kt
3432

3533
public constructor(e: R|kotlin/String|): R|B| {
3634
this<R|B|>(R|<local>/e|, Int(0))
37-
lval message: R|kotlin/String| = String(Secondary constructor body)
3835
}
3936

4037
public constructor(): R|B| {
4138
this<R|B|>(String())
42-
lval message: R|kotlin/String| = String(Secondary constructor body with delegated constructor call)
4339
}
4440

4541
}

‎compiler/fir/analysis-tests/testData/resolve/headerMode/enumClassDeclaration.fir.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ FILE: enumClassDeclaration.kt
3636
}
3737

3838
public open override fun getString(): R|kotlin/String| {
39-
^getString String(south)
4039
}
4140

4241
}

‎compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirDeclarationBuilder.kt‎

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
5656
import org.jetbrains.kotlin.util.getChildren
5757
import org.jetbrains.kotlin.utils.addToStdlib.runIf
5858
import org.jetbrains.kotlin.utils.addToStdlib.shouldNotBeCalled
59+
import org.jetbrains.kotlin.config.AnalysisFlags
5960

6061
class LightTreeRawFirDeclarationBuilder(
6162
session: FirSession,
@@ -65,6 +66,7 @@ class LightTreeRawFirDeclarationBuilder(
6566
) : AbstractLightTreeRawFirBuilder(session, tree, context) {
6667

6768
private val expressionConverter = LightTreeRawFirExpressionBuilder(session, tree, this, context)
69+
private val headerMode = session.languageVersionSettings.getFlag(AnalysisFlags.headerMode)
6870

6971
/**
7072
* [org.jetbrains.kotlin.parsing.KotlinParsing.parseFile]
@@ -133,21 +135,33 @@ class LightTreeRawFirDeclarationBuilder(
133135
/**
134136
* @see org.jetbrains.kotlin.parsing.KotlinParsing.parseBlockExpression
135137
*/
136-
fun convertBlockExpression(block: LighterASTNode): FirBlock {
137-
return convertBlockExpressionWithoutBuilding(block).build()
138+
fun convertBlockExpression(
139+
block: LighterASTNode,
140+
convertOnlyFirstStatement: Boolean = false,
141+
): FirBlock {
142+
return convertBlockExpressionWithoutBuilding(block, convertOnlyFirstStatement = convertOnlyFirstStatement).build()
138143
}
139144

140-
fun convertBlockExpressionWithoutBuilding(block: LighterASTNode, kind: KtFakeSourceElementKind? = null): FirBlockBuilder {
145+
/**
146+
* @param convertOnlyFirstStatement Convert only the first statement of the block, which can be a contract, for header generation.
147+
*/
148+
fun convertBlockExpressionWithoutBuilding(
149+
block: LighterASTNode,
150+
kind: KtFakeSourceElementKind? = null,
151+
convertOnlyFirstStatement: Boolean = false
152+
): FirBlockBuilder {
141153
val firStatements = block.forEachChildrenReturnList { node, container ->
142-
when (node.tokenType) {
143-
CLASS, OBJECT_DECLARATION -> container += convertClass(node) as FirStatement
144-
FUN -> container += convertFunctionDeclaration(node)
145-
KtNodeTypes.PROPERTY -> container += convertPropertyDeclaration(node) as FirStatement
146-
DESTRUCTURING_DECLARATION -> container +=
147-
convertDestructingDeclaration(node).toFirDestructingDeclaration(this, baseModuleData)
148-
TYPEALIAS -> container += convertTypeAlias(node) as FirStatement
149-
CLASS_INITIALIZER -> shouldNotBeCalled("CLASS_INITIALIZER expected to be processed during class body conversion")
150-
else -> if (node.isExpression()) container += expressionConverter.getAsFirStatement(node)
154+
if (!convertOnlyFirstStatement || container.isEmpty()) {
155+
when (node.tokenType) {
156+
CLASS, OBJECT_DECLARATION -> container += convertClass(node) as FirStatement
157+
FUN -> container += convertFunctionDeclaration(node)
158+
KtNodeTypes.PROPERTY -> container += convertPropertyDeclaration(node) as FirStatement
159+
DESTRUCTURING_DECLARATION -> container +=
160+
convertDestructingDeclaration(node).toFirDestructingDeclaration(this, baseModuleData)
161+
TYPEALIAS -> container += convertTypeAlias(node) as FirStatement
162+
CLASS_INITIALIZER -> shouldNotBeCalled("CLASS_INITIALIZER expected to be processed during class body conversion")
163+
else -> if (node.isExpression()) container += expressionConverter.getAsFirStatement(node)
164+
}
151165
}
152166
}
153167
return FirBlockBuilder().apply {
@@ -2104,9 +2118,10 @@ class LightTreeRawFirDeclarationBuilder(
21042118
expression: LighterASTNode?,
21052119
allowLegacyContractDescription: Boolean
21062120
): Pair<FirBlock?, FirContractDescription?> {
2121+
val generateHeader = headerMode && !context.forceKeepingTheBodyInHeaderMode
21072122
return when {
21082123
blockNode != null -> {
2109-
val block = convertBlock(blockNode)
2124+
val block = convertBlock(blockNode, convertOnlyFirstStatement = generateHeader)
21102125
val contractDescription = runIf(allowLegacyContractDescription) {
21112126
val blockSource = block.source
21122127
val diagnostic = when {
@@ -2116,7 +2131,11 @@ class LightTreeRawFirDeclarationBuilder(
21162131
}
21172132
processLegacyContractDescription(block, diagnostic)
21182133
}
2119-
block to contractDescription
2134+
if (generateHeader) {
2135+
return buildEmptyExpressionBlock() to contractDescription
2136+
} else {
2137+
block to contractDescription
2138+
}
21202139
}
21212140
expression != null -> FirSingleExpressionBlock(
21222141
expressionConverter.getAsFirExpression<FirExpression>(expression, "Function has no body (but should)").toReturn()
@@ -2138,15 +2157,18 @@ class LightTreeRawFirDeclarationBuilder(
21382157
/**
21392158
* @see org.jetbrains.kotlin.parsing.KotlinParsing.parseBlock
21402159
*/
2141-
fun convertBlock(block: LighterASTNode?): FirBlock {
2160+
fun convertBlock(
2161+
block: LighterASTNode?,
2162+
convertOnlyFirstStatement: Boolean = false,
2163+
): FirBlock {
21422164
if (block == null) return buildEmptyExpressionBlock()
21432165
if (block.tokenType != BLOCK) {
21442166
return FirSingleExpressionBlock(
21452167
expressionConverter.getAsFirStatement(block)
21462168
)
21472169
}
21482170

2149-
return convertBlockExpression(block)
2171+
return convertBlockExpression(block, convertOnlyFirstStatement)
21502172
}
21512173

21522174
/**

‎compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55

66
package org.jetbrains.kotlin.fir.resolve.transformers
77

8+
import org.jetbrains.kotlin.config.AnalysisFlags
89
import org.jetbrains.kotlin.descriptors.Visibilities
910
import org.jetbrains.kotlin.fir.*
1011
import org.jetbrains.kotlin.fir.declarations.*
1112
import org.jetbrains.kotlin.fir.declarations.utils.componentFunctionSymbol
13+
import org.jetbrains.kotlin.fir.declarations.utils.isInline
1214
import org.jetbrains.kotlin.fir.declarations.utils.isInlineOrValue
15+
import org.jetbrains.kotlin.fir.declarations.utils.isNonLocal
1316
import org.jetbrains.kotlin.fir.declarations.utils.visibility
1417
import org.jetbrains.kotlin.fir.expressions.FirBlock
1518
import org.jetbrains.kotlin.fir.expressions.FirStatement
@@ -18,6 +21,7 @@ import org.jetbrains.kotlin.fir.resolve.toSymbol
1821
import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.LocalClassesNavigationInfo
1922
import org.jetbrains.kotlin.fir.symbols.impl.*
2023
import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase
24+
import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef
2125
import org.jetbrains.kotlin.fir.types.FirTypeRef
2226
import org.jetbrains.kotlin.fir.types.coneType
2327
import org.jetbrains.kotlin.fir.utils.exceptions.withFirEntry
@@ -426,6 +430,14 @@ abstract class AbstractFirStatusResolveTransformer(
426430
isLocal = false,
427431
overriddenFunctions.map { it.status as FirResolvedDeclarationStatus },
428432
)
433+
// Once the modality is determined, we can remove the body.
434+
if (session.languageVersionSettings.getFlag(AnalysisFlags.headerMode) &&
435+
namedFunction.isNonLocal &&
436+
!namedFunction.isInline &&
437+
namedFunction.returnTypeRef !is FirImplicitTypeRef
438+
) {
439+
namedFunction.replaceBody(null)
440+
}
429441

430442
namedFunction.transformStatus(this, resolvedStatus)
431443
transformDeclaration(namedFunction, data) as FirStatement

‎compiler/tests-compiler-utils/testFixtures/org/jetbrains/kotlin/fir/session/FirSessionFactoryHelper.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ object FirSessionFactoryHelper {
108108

109109
override fun isPreRelease(): Boolean = stub()
110110

111-
override fun <T> getFlag(flag: AnalysisFlag<T>): T = stub()
111+
override fun <T> getFlag(flag: AnalysisFlag<T>): T = flag.defaultValue
112112

113113
override val apiVersion: ApiVersion
114114
get() = stub()

0 commit comments

Comments
 (0)