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

JVM_IR: handle new JVM targets in AdditionalClassAnnotationsLowering

Browse Source
This commit is contained in:
Georgy Bronnikov
2019-03-24 17:50:38 +03:00
parent 0a2450bcd5
commit 7f8cbf5434
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AdditionalClassAnnotationLowering.kt
+10 -1
View File
@@ -108,6 +108,7 @@ private class AdditionalClassAnnotationLowering(private val context: JvmBackendC
private val etField = buildEnumEntry(elementTypeEnum, "FIELD") private val etField = buildEnumEntry(elementTypeEnum, "FIELD")
private val etLocalVariable = buildEnumEntry(elementTypeEnum, "LOCAL_VARIABLE") private val etLocalVariable = buildEnumEntry(elementTypeEnum, "LOCAL_VARIABLE")
private val etMethod = buildEnumEntry(elementTypeEnum, "METHOD") private val etMethod = buildEnumEntry(elementTypeEnum, "METHOD")
private val tModule = buildEnumEntry(elementTypeEnum, "MODULE")
private val etPackage = buildEnumEntry(elementTypeEnum, "PACKAGE") private val etPackage = buildEnumEntry(elementTypeEnum, "PACKAGE")
private val etParameter = buildEnumEntry(elementTypeEnum, "PARAMETER") private val etParameter = buildEnumEntry(elementTypeEnum, "PARAMETER")
private val etType = buildEnumEntry(elementTypeEnum, "TYPE") private val etType = buildEnumEntry(elementTypeEnum, "TYPE")
@@ -183,11 +184,19 @@ private class AdditionalClassAnnotationLowering(private val context: JvmBackendC
JvmTarget.JVM_1_8 to mutableMapOf( JvmTarget.JVM_1_8 to mutableMapOf(
KotlinTarget.TYPE_PARAMETER to etTypeParameter, KotlinTarget.TYPE_PARAMETER to etTypeParameter,
KotlinTarget.TYPE to etTypeUse KotlinTarget.TYPE to etTypeUse
) ),
JvmTarget.JVM_9 to mutableMapOf(),
JvmTarget.JVM_10 to mutableMapOf(),
JvmTarget.JVM_11 to mutableMapOf(),
JvmTarget.JVM_12 to mutableMapOf()
) )
init { init {
annotationTargetMaps[JvmTarget.JVM_1_8]!!.putAll(annotationTargetMaps[JvmTarget.JVM_1_6]!!.toList()) annotationTargetMaps[JvmTarget.JVM_1_8]!!.putAll(annotationTargetMaps[JvmTarget.JVM_1_6]!!.toList())
annotationTargetMaps[JvmTarget.JVM_9]!!.putAll(annotationTargetMaps[JvmTarget.JVM_1_8]!!.toList())
annotationTargetMaps[JvmTarget.JVM_10]!!.putAll(annotationTargetMaps[JvmTarget.JVM_9]!!.toList())
annotationTargetMaps[JvmTarget.JVM_11]!!.putAll(annotationTargetMaps[JvmTarget.JVM_10]!!.toList())
annotationTargetMaps[JvmTarget.JVM_12]!!.putAll(annotationTargetMaps[JvmTarget.JVM_11]!!.toList())
} }