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

[JVM IR] Use error types in KAPT mode for unresolved delegate types.

Browse Source 
^KT-57388 Fixed
This commit is contained in:
Mads Ager
2023-03-21 15:28:00 +01:00
committed by Alexander Udalov
parent 5a6e896b45
commit a525983e38
11 changed files with 259 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt
+6 -1
View File
@@ -43,6 +43,8 @@ import org.jetbrains.kotlin.psi.psiUtil.startOffsetSkippingComments
import org.jetbrains.kotlin.psi2ir.intermediate.*
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.error.ErrorTypeKind
import org.jetbrains.kotlin.types.error.ErrorUtils.createErrorType
import org.jetbrains.kotlin.types.typeUtil.replaceArgumentsWithStarProjections
internal class DelegatedPropertyGenerator(
@@ -323,8 +325,11 @@ internal class DelegatedPropertyGenerator(
val provideDelegateResolvedCall = get(BindingContext.PROVIDE_DELEGATE_RESOLVED_CALL, delegatedPropertyDescriptor)
val delegateType = if (provideDelegateResolvedCall != null) {
provideDelegateResolvedCall.resultingDescriptor.returnType!!
} else {
} else if (context.configuration.generateBodies) {
getTypeInferredByFrontendOrFail(ktDelegate.expression!!)
} else {
getTypeInferredByFrontend(ktDelegate.expression!!)
?: createErrorType(ErrorTypeKind.UNRESOLVED_TYPE, ktDelegate.expression!!.text)
}
// For KAPT stub generation, we approximate the type of the delegate.
// Since we are not generating bodies, we could end up with unbound