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

[FIR IDE] Implement lazy designated resolve for all resolve FIR phases

Browse Source
This commit is contained in:
Igor Yakovlev
2021-05-12 00:50:26 +02:00
parent cda1a7edbe
commit f98995f6cb
52 changed files with 1361 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt
+6 -2
View File
@@ -56,7 +56,9 @@ fun FirRegularClassBuilder.generateValuesFunction(
}
symbol = FirNamedFunctionSymbol(CallableId(packageFqName, classFqName, ENUM_VALUES))
resolvePhase = FirResolvePhase.BODY_RESOLVE
body = buildEmptyExpressionBlock()
body = buildEmptyExpressionBlock().also {
it.replaceTypeRef(returnTypeRef)
}
}.apply {
containingClassAttr = this@generateValuesFunction.symbol.toLookupTag()
}
@@ -97,7 +99,9 @@ fun FirRegularClassBuilder.generateValueOfFunction(
isVararg = false
}
resolvePhase = FirResolvePhase.BODY_RESOLVE
body = buildEmptyExpressionBlock()
body = buildEmptyExpressionBlock().also {
it.replaceTypeRef(returnTypeRef)
}
}.apply {
containingClassAttr = this@generateValueOfFunction.symbol.toLookupTag()
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt
+3 -6
View File
@@ -12,10 +12,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail
import org.jetbrains.kotlin.fir.FirModuleData
import org.jetbrains.kotlin.fir.FirSourceElement
import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription
import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.declarations.FirValueParameter
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.builder.buildDefaultSetterValueParameter
import org.jetbrains.kotlin.fir.expressions.FirBlock
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol
@@ -40,7 +37,7 @@ abstract class FirDefaultPropertyAccessor(
) : FirPropertyAccessorImpl(
source,
moduleData,
resolvePhase = FirResolvePhase.BODY_RESOLVE,
resolvePhase = if (effectiveVisibility != null) FirResolvePhase.BODY_RESOLVE else FirResolvePhase.TYPES,
origin,
FirDeclarationAttributes(),
propertyTypeRef,
@@ -59,7 +56,7 @@ abstract class FirDefaultPropertyAccessor(
typeParameters = mutableListOf(),
) {
override var resolvePhase
get() = FirResolvePhase.BODY_RESOLVE
get() = if (status is FirResolvedDeclarationStatus) FirResolvePhase.BODY_RESOLVE else FirResolvePhase.TYPES
set(_) {}
final override var body: FirBlock?