Skip to content

Commit faaa1e3

Browse files
committed
Replace receiverParameter usages
https://youtrack.jetbrains.com/issue/KT-75517
1 parent 84b0232 commit faaa1e3

File tree

7 files changed

+10
-11
lines changed

7 files changed

+10
-11
lines changed

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/CallableReferenceBlock.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ private fun FirCallableSymbol<*>.getReferenceConeType(): ConeKotlinType = when (
3636

3737
private fun FirNamedFunctionSymbol.getReferenceConeType(): ConeKotlinType {
3838
val typeArguments = buildList {
39-
addIfNotNull(receiverParameter?.typeRef?.coneType)
39+
addIfNotNull(resolvedReceiverType)
4040
addAll(valueParameterSymbols.map { it.resolvedReturnType })
4141
add(resolvedReturnType)
4242
}
@@ -48,15 +48,15 @@ private fun FirNamedFunctionSymbol.getReferenceConeType(): ConeKotlinType {
4848
private fun FirPropertySymbol.getReferenceConeType(): ConeKotlinType {
4949
val isVar = isVar
5050
val isMember = dispatchReceiverType != null
51-
val isExtension = receiverParameter != null
51+
val isExtension = receiverParameterSymbol != null
5252
val classId = when {
5353
isMember && isExtension -> throw UnsupportedOperationException("Member-extension properties aren't supported")
5454
isMember || isExtension -> if (isVar) StandardClassIds.KMutableProperty1 else StandardClassIds.KProperty1
5555
else -> if (isVar) StandardClassIds.KMutableProperty0 else StandardClassIds.KProperty0
5656
}
5757
val typeArguments = buildList {
5858
addIfNotNull(dispatchReceiverType)
59-
addIfNotNull(receiverParameter?.typeRef?.coneType)
59+
addIfNotNull(resolvedReceiverType)
6060
}
6161
return classId.constructClassLikeType(typeArguments.toTypedArray())
6262
}

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/NativeFunction.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ internal fun FirExtension.buildNativeFunction(
5454
// TODO: support contextReceivers once exported to ObjC
5555

5656
receiverParameter = buildReceiverParameterCopy(
57-
originalSymbol.receiverParameter,
57+
originalSymbol.receiverParameterSymbol,
5858
symbol,
5959
origin,
6060
typeParameters.substitutor

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/NativeProperty.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ internal fun FirExtension.buildNativeProperty(
5454
// TODO: support contextReceivers once exported to ObjC
5555

5656
receiverParameter = buildReceiverParameterCopy(
57-
originalSymbol.receiverParameter,
57+
originalSymbol.receiverParameterSymbol,
5858
symbol,
5959
origin,
6060
typeParameters.substitutor

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/ReceiverParameter.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
1212
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
1313
import org.jetbrains.kotlin.fir.symbols.impl.FirReceiverParameterSymbol
1414
import org.jetbrains.kotlin.fir.toFirResolvedTypeRef
15-
import org.jetbrains.kotlin.fir.types.coneType
1615

1716
internal fun FirExtension.buildReceiverParameterCopy(
18-
originalParameter: FirReceiverParameter?,
17+
originalParameter: FirReceiverParameterSymbol?,
1918
containingDeclarationSymbol: FirBasedSymbol<*>,
2019
origin: FirDeclarationOrigin,
2120
substitutor: ConeSubstitutor
@@ -31,7 +30,7 @@ internal fun FirExtension.buildReceiverParameterCopy(
3130
symbol = FirReceiverParameterSymbol()
3231
this.containingDeclarationSymbol = containingDeclarationSymbol
3332

34-
typeRef = originalParameter.typeRef.coneType
33+
typeRef = originalParameter.resolvedType
3534
.let(substitutor::substituteOrSelf)
3635
.toFirResolvedTypeRef()
3736

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/SharedFlowReplayCache.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ internal fun FirExtension.buildSharedFlowReplayCacheProperty(
5757
// TODO: support contextReceivers once exported to ObjC
5858

5959
receiverParameter = buildReceiverParameterCopy(
60-
originalSymbol.receiverParameter,
60+
originalSymbol.receiverParameterSymbol,
6161
symbol,
6262
origin,
6363
typeParameters.substitutor

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/StateFlowValue.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ internal fun FirExtension.buildStateFlowValueProperty(
5858
// TODO: support contextReceivers once exported to ObjC
5959

6060
receiverParameter = buildReceiverParameterCopy(
61-
originalSymbol.receiverParameter,
61+
originalSymbol.receiverParameterSymbol,
6262
symbol,
6363
origin,
6464
typeParameters.substitutor

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/extensions/KmpNativeCoroutinesDeclarationGenerationExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ internal class KmpNativeCoroutinesDeclarationGenerationExtension(
194194
for (symbol in symbols) {
195195
val annotation = getAnnotationForSymbol(symbol) ?: continue
196196
if (annotation !in annotations) continue
197-
if (symbol.receiverParameter != null && symbol.dispatchReceiverType != null) continue
197+
if (symbol.receiverParameterSymbol != null && symbol.dispatchReceiverType != null) continue
198198
addIfNotNull(generateProperty(symbol, annotation))
199199
}
200200
}

0 commit comments

Comments
 (0)