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

RAW FIR: use special name for default setter parameter

Browse Source 
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.
This commit is contained in:
Jinseong Jeon
2022-03-25 23:33:07 -07:00
committed by Ilya Kirillov
parent 3778b1fde1
commit 2763b58cdd
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+1 -1
View File
@@ -303,7 +303,7 @@ class Fir2IrDeclarationStorage(
): IrValueParameter { ): IrValueParameter {
return irFactory.createValueParameter( return irFactory.createValueParameter(
startOffset, endOffset, IrDeclarationOrigin.DEFINED, IrValueParameterSymbolImpl(), startOffset, endOffset, IrDeclarationOrigin.DEFINED, IrValueParameterSymbolImpl(),
Name.special("<set-?>"), 0, type, SpecialNames.IMPLICIT_SET_PARAMETER, 0, type,
varargElementType = null, varargElementType = null,
isCrossinline = false, isNoinline = false, isCrossinline = false, isNoinline = false,
isHidden = false, isAssignable = false isHidden = false, isAssignable = false
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
+1 -2
View File
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.*
import org.jetbrains.kotlin.ElementTypeUtils.isExpression import org.jetbrains.kotlin.ElementTypeUtils.isExpression
import org.jetbrains.kotlin.KtNodeTypes.* import org.jetbrains.kotlin.KtNodeTypes.*
import org.jetbrains.kotlin.builtins.StandardNames 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.ClassKind
import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibilities
@@ -1327,7 +1326,7 @@ class DeclarationsConverter(
moduleData = baseModuleData moduleData = baseModuleData
origin = FirDeclarationOrigin.Source origin = FirDeclarationOrigin.Source
returnTypeRef = propertyTypeRefToUse returnTypeRef = propertyTypeRefToUse
symbol = FirValueParameterSymbol(DEFAULT_VALUE_PARAMETER) symbol = FirValueParameterSymbol(SpecialNames.IMPLICIT_SET_PARAMETER)
} }
var block: LighterASTNode? = null var block: LighterASTNode? = null
var expression: LighterASTNode? = null var expression: LighterASTNode? = null
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+1 -2
View File
@@ -9,7 +9,6 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.tree.IElementType import com.intellij.psi.tree.IElementType
import org.jetbrains.kotlin.* import org.jetbrains.kotlin.*
import org.jetbrains.kotlin.builtins.StandardNames.BACKING_FIELD 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.ClassKind
import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibilities
@@ -406,7 +405,7 @@ open class RawFirBuilder(
moduleData = baseModuleData moduleData = baseModuleData
origin = FirDeclarationOrigin.Source origin = FirDeclarationOrigin.Source
returnTypeRef = propertyTypeRefToUse returnTypeRef = propertyTypeRefToUse
symbol = FirValueParameterSymbol(DEFAULT_VALUE_PARAMETER) symbol = FirValueParameterSymbol(SpecialNames.IMPLICIT_SET_PARAMETER)
annotations += parameterAnnotationsFromProperty annotations += parameterAnnotationsFromProperty
} }
} }
compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt
+2 -1
View File
@@ -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.ConeSimpleKotlinType
import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef
import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef
import org.jetbrains.kotlin.name.SpecialNames
@OptIn(FirImplementationDetail::class) @OptIn(FirImplementationDetail::class)
abstract class FirDefaultPropertyAccessor( abstract class FirDefaultPropertyAccessor(
@@ -143,7 +144,7 @@ class FirDefaultPropertySetter(
this@builder.moduleData = moduleData this@builder.moduleData = moduleData
this@builder.origin = origin this@builder.origin = origin
this@builder.returnTypeRef = propertyTypeRef this@builder.returnTypeRef = propertyTypeRef
this@builder.symbol = FirValueParameterSymbol(StandardNames.DEFAULT_VALUE_PARAMETER) this@builder.symbol = FirValueParameterSymbol(SpecialNames.IMPLICIT_SET_PARAMETER)
this@builder.annotations += parameterAnnotations this@builder.annotations += parameterAnnotations
} }
), ),