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

fix compilation and testData after rebase

Browse Source 
^KT-54417
This commit is contained in:
Dmitrii Gridin
2022-11-14 12:16:29 +01:00
committed by Space Team
parent d0a420fad9
commit 032026278c
62 changed files with 554 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
+1 -1
View File
@@ -219,7 +219,7 @@ fun deserializeClassToSymbol(
valueClassRepresentation =
classProto.loadValueClassRepresentation(context.nameResolver, context.typeTable, context.typeDeserializer::simpleType) { name ->
val member = declarations.singleOrNull { it is FirProperty && it.receiverTypeRef == null && it.name == name }
val member = declarations.singleOrNull { it is FirProperty && it.receiverParameter == null && it.name == name }
(member as FirProperty?)?.returnTypeRef?.coneTypeSafe()
} ?: computeValueClassRepresentation(this, session)
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+1 -1
View File
@@ -245,7 +245,7 @@ private fun FirCallableSymbol<*>.toSymbolForCall(
dispatchReceiver.typeRef.coneType.let { it.findClassRepresentation(it, declarationStorage.session) }
}
// Unbound callable reference to member (non-extension)
isReference && fir.receiverTypeRef == null -> {
isReference && fir.receiverParameter == null -> {
// TODO: remove runIf with StandardClassIds.Any comparison after fixing ValueClass::equals case (KT-54887)
runIf(containingClassLookupTag()?.classId != StandardClassIds.Any) {
(explicitReceiver as? FirResolvedQualifier)?.toLookupTag()
compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt
+1
View File
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.fir.symbols.constructStarProjectedType
import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.types.ConeClassLikeType
import org.jetbrains.kotlin.fir.types.ConeStarProjection
import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef
import org.jetbrains.kotlin.fir.types.FirTypeRef
import org.jetbrains.kotlin.fir.types.builder.buildImplicitTypeRef
import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsMappingTransformer.kt
+6 -6
View File
@@ -67,7 +67,7 @@ private class FirDeclarationsResolveTransformerForAnnotationArgumentsMapping(
context.withSimpleFunction(simpleFunction, session) {
simpleFunction
.transformReturnTypeRef(transformer, data)
.transformReceiverTypeRef(transformer, data)
.transformReceiverParameter(transformer, data)
.transformValueParameters(transformer, data)
.transformAnnotations(transformer, data)
}
@@ -82,7 +82,7 @@ private class FirDeclarationsResolveTransformerForAnnotationArgumentsMapping(
context.withConstructor(constructor) {
constructor
.transformAnnotations(transformer, data)
.transformReceiverTypeRef(transformer, data)
.transformReceiverParameter(transformer, data)
.transformReturnTypeRef(transformer, data)
context.forConstructorParameters(constructor, containingClass, components) {
@@ -104,13 +104,13 @@ private class FirDeclarationsResolveTransformerForAnnotationArgumentsMapping(
}
override fun transformProperty(property: FirProperty, data: ResolutionMode): FirProperty {
property.transformReceiverTypeRef(transformer, ResolutionMode.ContextIndependent)
property.transformReceiverParameter(transformer, ResolutionMode.ContextIndependent)
doTransformTypeParameters(property)
context.withProperty(property) {
property
.transformAnnotations(transformer, data)
.transformReceiverTypeRef(transformer, data)
.transformReceiverParameter(transformer, data)
.transformReturnTypeRef(transformer, data)
.transformGetter(transformer, data)
.transformSetter(transformer, data)
@@ -126,7 +126,7 @@ private class FirDeclarationsResolveTransformerForAnnotationArgumentsMapping(
propertyAccessor
.transformValueParameters(transformer, data)
.transformReturnTypeRef(transformer, data)
.transformReceiverTypeRef(transformer, data)
.transformReceiverParameter(transformer, data)
.transformReturnTypeRef(transformer, data)
.transformAnnotations(transformer, data)
return propertyAccessor
@@ -140,7 +140,7 @@ private class FirDeclarationsResolveTransformerForAnnotationArgumentsMapping(
context.forEnumEntry {
enumEntry
.transformAnnotations(transformer, data)
.transformReceiverTypeRef(transformer, data)
.transformReceiverParameter(transformer, data)
.transformReturnTypeRef(transformer, data)
.transformTypeParameters(transformer, data)
}