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

JVM_IR: fields for deprecated enum entries have ACC_DEPRECATED flag

Browse Source 
'Deprecated' annotation can't be applied to field itself.
This commit is contained in:
Dmitry Petrov
2020-07-21 17:34:35 +03:00
parent edab3e3ba9
commit e84339a0d3
7 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
+6 -2
View File
@@ -366,6 +366,7 @@ private val IrClass.flags: Int
private val IrField.flags: Int
get() = origin.flags or visibility.flags or
this.specialDeprecationFlag or (correspondingPropertySymbol?.owner?.deprecationFlags ?: 0) or
(if (annotations.hasAnnotation(KOTLIN_DEPRECATED)) Opcodes.ACC_DEPRECATED else 0) or
(if (isFinal) Opcodes.ACC_FINAL else 0) or
(if (isStatic) Opcodes.ACC_STATIC else 0) or
(if (hasAnnotation(VOLATILE_ANNOTATION_FQ_NAME)) Opcodes.ACC_VOLATILE else 0) or
@@ -375,9 +376,12 @@ private val IrField.flags: Int
private val IrField.specialDeprecationFlag: Int
get() = if (shouldHaveSpecialDeprecationFlag()) Opcodes.ACC_DEPRECATED else 0
private fun IrField.shouldHaveSpecialDeprecationFlag(): Boolean {
private val JAVA_LANG_DEPRECATED = FqName("java.lang.Deprecated")
private val KOTLIN_DEPRECATED = FqName("kotlin.Deprecated")
fun IrField.shouldHaveSpecialDeprecationFlag(): Boolean {
return origin == IrDeclarationOrigin.FIELD_FOR_OBJECT_INSTANCE &&
annotations.hasAnnotation(FqName("java.lang.Deprecated"))
annotations.hasAnnotation(JAVA_LANG_DEPRECATED)
}
private val IrDeclarationOrigin.flags: Int