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

[IR] Fix IR expect-actual annotations checker in case when annotation is actual typealias

Browse Source 
^KT-60830 Fixed
This commit is contained in:
Roman Efremov
2023-08-01 10:04:57 +02:00
committed by Space Team
parent 5ed3f308fa
commit 31f21d8593
5 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrExpectActualMatchingContext.kt
+4 -3
View File
@@ -471,9 +471,9 @@ internal abstract class IrExpectActualMatchingContext(
return expectToActualClassMap[classId]?.classId ?: classId
}
private class AnnotationCallInfoImpl(val irElement: IrConstructorCall) : AnnotationCallInfo {
private inner class AnnotationCallInfoImpl(val irElement: IrConstructorCall) : AnnotationCallInfo {
override val classId: ClassId?
get() = irElement.type.getClass()?.classId
get() = getAnnotationClass()?.classId
override val isRetentionSource: Boolean
get() = getAnnotationClass()?.getAnnotationRetention() == KotlinRetention.SOURCE
@@ -482,7 +482,8 @@ internal abstract class IrExpectActualMatchingContext(
get() = getAnnotationClass()?.hasAnnotation(OptInNames.REQUIRES_OPT_IN_FQ_NAME) ?: false
private fun getAnnotationClass(): IrClass? {
return irElement.symbol.owner.parent as? IrClass
val annotationClass = irElement.type.getClass() ?: return null
return expectToActualClassMap[annotationClass.classId]?.owner ?: annotationClass
}
}