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

FIR: Do not call withReplacedConeType if type is unresolved

Browse Source
This commit is contained in:
Denis Zharkov
2020-09-23 14:37:44 +03:00
parent cb07ffc4fd
commit fd9c6479bf
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt
+11 -2
View File
@@ -404,7 +404,8 @@ class FirClassSubstitutionScope(
newReturnType: ConeKotlinType? = null newReturnType: ConeKotlinType? = null
) { ) {
annotations += baseFunction.annotations annotations += baseFunction.annotations
returnTypeRef = baseFunction.returnTypeRef.withReplacedConeType(newReturnType) returnTypeRef = replaceReturnTypeIfResolved(baseFunction, newReturnType)
if (this is FirSimpleFunctionBuilder) { if (this is FirSimpleFunctionBuilder) {
receiverTypeRef = baseFunction.receiverTypeRef?.withReplacedConeType(newReceiverType) receiverTypeRef = baseFunction.receiverTypeRef?.withReplacedConeType(newReceiverType)
} }
@@ -419,6 +420,14 @@ class FirClassSubstitutionScope(
} }
} }
private fun replaceReturnTypeIfResolved(
base: FirCallableDeclaration<*>,
newReturnType: ConeKotlinType?
) = if (base.returnTypeRef is FirResolvedTypeRef)
base.returnTypeRef.withReplacedConeType(newReturnType)
else
base.returnTypeRef
fun createFakeOverrideProperty( fun createFakeOverrideProperty(
session: FirSession, session: FirSession,
baseProperty: FirProperty, baseProperty: FirProperty,
@@ -524,7 +533,7 @@ class FirClassSubstitutionScope(
newReturnType: ConeKotlinType? = null newReturnType: ConeKotlinType? = null
) { ) {
annotations += baseProperty.annotations annotations += baseProperty.annotations
returnTypeRef = baseProperty.returnTypeRef.withReplacedConeType(newReturnType) returnTypeRef = replaceReturnTypeIfResolved(baseProperty, newReturnType)
receiverTypeRef = baseProperty.receiverTypeRef?.withReplacedConeType(newReceiverType) receiverTypeRef = baseProperty.receiverTypeRef?.withReplacedConeType(newReceiverType)
} }