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

Do not generate TYPE_USE/TYPE_PARAMETER when compiling against JDK 1.6

Browse Source 
#KT-53712
This commit is contained in:
Alexander Udalov
2022-08-26 00:39:05 +02:00
parent 0d2e9e7013
commit a09fd45ade
9 changed files with 79 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/AdditionalClassAnnotationLowering.kt
+14 -2
View File
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrEnumEntry
import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.expressions.IrGetEnumValue
@@ -26,6 +27,7 @@ import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.load.java.JvmAnnotationNames
import org.jetbrains.kotlin.name.Name
import org.jetbrains.org.objectweb.asm.Type
import java.lang.annotation.ElementType
internal val additionalClassAnnotationPhase = makeIrFilePhase(
@@ -37,6 +39,10 @@ internal val additionalClassAnnotationPhase = makeIrFilePhase(
private class AdditionalClassAnnotationLowering(private val context: JvmBackendContext) : ClassLoweringPass {
private val symbols = context.ir.symbols.javaAnnotations
private val isCompilingAgainstJdk8OrLater =
context.state.jvmBackendClassResolver.resolveToClassDescriptors(
Type.getObjectType("java/lang/invoke/LambdaMetafactory")
).isNotEmpty()
override fun lower(irClass: IrClass) {
if (!irClass.isAnnotationClass) return
@@ -78,10 +84,9 @@ private class AdditionalClassAnnotationLowering(private val context: JvmBackendC
private fun generateTargetAnnotation(irClass: IrClass) {
if (irClass.hasAnnotation(JvmAnnotationNames.TARGET_ANNOTATION)) return
val annotationTargetMap = symbols.getAnnotationTargetMap(context.state.target)
val targets = irClass.applicableTargetSet() ?: return
val javaTargets = targets.mapNotNullTo(HashSet()) { annotationTargetMap[it] }.sortedBy {
val javaTargets = targets.mapNotNullTo(HashSet(), ::mapTarget).sortedBy {
ElementType.valueOf(it.symbol.owner.name.asString())
}
@@ -106,6 +111,13 @@ private class AdditionalClassAnnotationLowering(private val context: JvmBackendC
}
}
private fun mapTarget(target: KotlinTarget): IrEnumEntry? =
when (target) {
KotlinTarget.TYPE_PARAMETER -> symbols.typeParameterTarget.takeUnless { isCompilingAgainstJdk8OrLater }
KotlinTarget.TYPE -> symbols.typeUseTarget.takeUnless { isCompilingAgainstJdk8OrLater }
else -> symbols.jvmTargetMap[target]
}
private fun generateRepeatableAnnotation(irClass: IrClass) {
if (!irClass.hasAnnotation(StandardNames.FqNames.repeatable) ||
irClass.hasAnnotation(JvmAnnotationNames.REPEATABLE_ANNOTATION)
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSymbols.kt
+3 -9
View File
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.codegen.coroutines.INVOKE_SUSPEND_METHOD_NAME
import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_CALL_RESULT_NAME
import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME
import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_CREATE_METHOD_NAME
import org.jetbrains.kotlin.config.JvmTarget
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
import org.jetbrains.kotlin.descriptors.InlineClassRepresentation
@@ -1120,7 +1119,7 @@ class JvmSymbols(
KotlinRetention.RUNTIME to rpRuntime
)
private val jvm6TargetMap = mutableMapOf(
val jvmTargetMap = mutableMapOf(
KotlinTarget.CLASS to buildEnumEntry(elementTypeEnum, "TYPE"),
KotlinTarget.ANNOTATION_CLASS to buildEnumEntry(elementTypeEnum, "ANNOTATION_TYPE"),
KotlinTarget.CONSTRUCTOR to buildEnumEntry(elementTypeEnum, "CONSTRUCTOR"),
@@ -1132,13 +1131,8 @@ class JvmSymbols(
KotlinTarget.VALUE_PARAMETER to buildEnumEntry(elementTypeEnum, "PARAMETER")
)
private val jvm8TargetMap = jvm6TargetMap + mutableMapOf(
KotlinTarget.TYPE_PARAMETER to buildEnumEntry(elementTypeEnum, "TYPE_PARAMETER"),
KotlinTarget.TYPE to buildEnumEntry(elementTypeEnum, "TYPE_USE")
)
fun getAnnotationTargetMap(target: JvmTarget): Map<KotlinTarget, IrEnumEntry> =
if (target == JvmTarget.JVM_1_6) jvm6TargetMap else jvm8TargetMap
val typeParameterTarget = buildEnumEntry(elementTypeEnum, "TYPE_PARAMETER")
val typeUseTarget = buildEnumEntry(elementTypeEnum, "TYPE_USE")
}
companion object {