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

[K1] Correctly handle case when expect annotation is unresolved

Browse Source 
Before change NPE was thrown.

Review: KT-MR-12250

^KT-62026
This commit is contained in:
Roman Efremov
2023-09-18 16:56:24 +02:00
committed by Space Team
parent 5cae87b263
commit 04c1bf749c
6 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/multiplatform/ClassicExpectActualMatchingContext.kt
+4
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScope
import org.jetbrains.kotlin.resolve.scopes.getDescriptorsFiltered
import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.checker.*
import org.jetbrains.kotlin.types.error.ErrorClassDescriptor
import org.jetbrains.kotlin.types.model.KotlinTypeMarker
import org.jetbrains.kotlin.types.model.TypeConstructorMarker
import org.jetbrains.kotlin.types.model.TypeSubstitutorMarker
@@ -389,6 +390,9 @@ class ClassicExpectActualMatchingContext(
private fun getAnnotationClassDescriptor(): ClassDescriptor? {
val classDescriptor = annotationDescriptor.annotationClass ?: return null
if (classDescriptor is ErrorClassDescriptor) {
return null
}
if (!classDescriptor.isExpect) {
return classDescriptor
}