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

[fir2ir] Create separate symbols for serialized parameters

Browse Source
This commit is contained in:
Yan Zhulanow
2023-06-07 20:28:33 +09:00
committed by Space Team
parent a92c479344
commit 8286ffd232
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt
+3 -4
View File
@@ -24,10 +24,7 @@ import org.jetbrains.kotlin.fir.resolve.toFirRegularClass
import org.jetbrains.kotlin.fir.serialization.FirElementAwareStringTable import org.jetbrains.kotlin.fir.serialization.FirElementAwareStringTable
import org.jetbrains.kotlin.fir.serialization.FirElementSerializer import org.jetbrains.kotlin.fir.serialization.FirElementSerializer
import org.jetbrains.kotlin.fir.serialization.TypeApproximatorForMetadataSerializer import org.jetbrains.kotlin.fir.serialization.TypeApproximatorForMetadataSerializer
import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
@@ -230,6 +227,7 @@ private fun FirFunction.copyToFreeAnonymousFunction(approximator: AbstractTypeAp
hasExplicitParameterList = (function as? FirAnonymousFunction)?.hasExplicitParameterList == true hasExplicitParameterList = (function as? FirAnonymousFunction)?.hasExplicitParameterList == true
valueParameters.addAll(function.valueParameters.map { valueParameters.addAll(function.valueParameters.map {
buildValueParameterCopy(it) { buildValueParameterCopy(it) {
symbol = FirValueParameterSymbol(it.name)
returnTypeRef = it.returnTypeRef.approximated(approximator, typeParameterSet, toSuper = false) returnTypeRef = it.returnTypeRef.approximated(approximator, typeParameterSet, toSuper = false)
} }
}) })
@@ -254,6 +252,7 @@ private fun FirPropertyAccessor.copyToFreeAccessor(
status = accessor.status status = accessor.status
accessor.valueParameters.mapTo(valueParameters) { accessor.valueParameters.mapTo(valueParameters) {
buildValueParameterCopy(it) { buildValueParameterCopy(it) {
symbol = FirValueParameterSymbol(it.name)
returnTypeRef = it.returnTypeRef.approximated(approximator, typeParameterSet, toSuper = false) returnTypeRef = it.returnTypeRef.approximated(approximator, typeParameterSet, toSuper = false)
} }
} }