From 2763b58cdd422591a2168f5e6cb09f4cacfceff0 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Fri, 25 Mar 2022 23:33:07 -0700 Subject: [PATCH] RAW FIR: use special name for default setter parameter FE1.0 descpritor, PSI2IR, and JVM IR backend use that. FIR2IR is also using that, which implies name "value" in RAW FIR maybe has not been used anywhere. --- .../jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt | 2 +- .../kotlin/fir/lightTree/converter/DeclarationsConverter.kt | 3 +-- .../src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt | 3 +-- .../kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt | 3 ++- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt index 3e083dc47b6..bbb15df8a2d 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt @@ -303,7 +303,7 @@ class Fir2IrDeclarationStorage( ): IrValueParameter { return irFactory.createValueParameter( startOffset, endOffset, IrDeclarationOrigin.DEFINED, IrValueParameterSymbolImpl(), - Name.special(""), 0, type, + SpecialNames.IMPLICIT_SET_PARAMETER, 0, type, varargElementType = null, isCrossinline = false, isNoinline = false, isHidden = false, isAssignable = false diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt index f0266aad0c5..2f9ab91efae 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.* import org.jetbrains.kotlin.ElementTypeUtils.isExpression import org.jetbrains.kotlin.KtNodeTypes.* import org.jetbrains.kotlin.builtins.StandardNames -import org.jetbrains.kotlin.builtins.StandardNames.DEFAULT_VALUE_PARAMETER import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities @@ -1327,7 +1326,7 @@ class DeclarationsConverter( moduleData = baseModuleData origin = FirDeclarationOrigin.Source returnTypeRef = propertyTypeRefToUse - symbol = FirValueParameterSymbol(DEFAULT_VALUE_PARAMETER) + symbol = FirValueParameterSymbol(SpecialNames.IMPLICIT_SET_PARAMETER) } var block: LighterASTNode? = null var expression: LighterASTNode? = null diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index ff10e1e6614..faff7d44eeb 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -9,7 +9,6 @@ import com.intellij.psi.PsiElement import com.intellij.psi.tree.IElementType import org.jetbrains.kotlin.* import org.jetbrains.kotlin.builtins.StandardNames.BACKING_FIELD -import org.jetbrains.kotlin.builtins.StandardNames.DEFAULT_VALUE_PARAMETER import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities @@ -406,7 +405,7 @@ open class RawFirBuilder( moduleData = baseModuleData origin = FirDeclarationOrigin.Source returnTypeRef = propertyTypeRefToUse - symbol = FirValueParameterSymbol(DEFAULT_VALUE_PARAMETER) + symbol = FirValueParameterSymbol(SpecialNames.IMPLICIT_SET_PARAMETER) annotations += parameterAnnotationsFromProperty } } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt index 80e958fb296..73a19294c8a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef +import org.jetbrains.kotlin.name.SpecialNames @OptIn(FirImplementationDetail::class) abstract class FirDefaultPropertyAccessor( @@ -143,7 +144,7 @@ class FirDefaultPropertySetter( this@builder.moduleData = moduleData this@builder.origin = origin this@builder.returnTypeRef = propertyTypeRef - this@builder.symbol = FirValueParameterSymbol(StandardNames.DEFAULT_VALUE_PARAMETER) + this@builder.symbol = FirValueParameterSymbol(SpecialNames.IMPLICIT_SET_PARAMETER) this@builder.annotations += parameterAnnotations } ),