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

JVM_IR: no nullability annotations for inline class '-impl' methods

Browse Source 
Specialized generated methods for inline classes (toString-impl,
hashCode-impl, equals-impl, etc) are inaccessible from Java, and thus
don't require nullability annotations.
This commit is contained in:
Dmitry Petrov
2020-07-02 15:15:19 +03:00
parent a238d6a890
commit ea042eb6c4
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt
+21 -19
View File
@@ -124,9 +124,11 @@ abstract class AnnotationCodegen(
declaration: IrDeclaration, // There is no superclass that encompasses IrFunction, IrField and nothing else. declaration: IrDeclaration, // There is no superclass that encompasses IrFunction, IrField and nothing else.
annotationDescriptorsAlreadyPresent: MutableSet<String> annotationDescriptorsAlreadyPresent: MutableSet<String>
) { ) {
// No need to annotate privates, synthetic accessors and their parameters if (isInvisibleForNullabilityAnalysis(declaration)) return
if (isInvisibleFromTheOutside(declaration)) return if (declaration is IrValueParameter) {
if (declaration is IrValueParameter && isInvisibleFromTheOutside(declaration.parent as? IrDeclaration)) return val parent = declaration.parent as IrDeclaration
if (isInvisibleForNullabilityAnalysis(parent)) return
}
// No need to annotate annotation methods since they're always non-null // No need to annotate annotation methods since they're always non-null
if (declaration is IrSimpleFunction && declaration.correspondingPropertySymbol != null && if (declaration is IrSimpleFunction && declaration.correspondingPropertySymbol != null &&
@@ -208,11 +210,12 @@ abstract class AnnotationCodegen(
val annotationClass = annotation.annotationClass val annotationClass = annotation.annotationClass
for (param in annotation.symbol.owner.valueParameters) { for (param in annotation.symbol.owner.valueParameters) {
val value = annotation.getValueArgument(param.index) val value = annotation.getValueArgument(param.index)
if (value == null) { if (value != null)
if (param.defaultValue != null) continue // Default value will be supplied by JVM at runtime. genCompileTimeValue(getAnnotationArgumentJvmName(annotationClass, param.name), value, annotationVisitor)
else error("No value for annotation parameter $param") else if (param.defaultValue != null)
} continue // Default value will be supplied by JVM at runtime.
genCompileTimeValue(getAnnotationArgumentJvmName(annotationClass, param.name), value, annotationVisitor) else
error("No value for annotation parameter $param")
} }
} }
@@ -275,18 +278,17 @@ abstract class AnnotationCodegen(
} }
companion object { companion object {
private fun isInvisibleFromTheOutside(declaration: IrDeclaration?): Boolean { private fun isInvisibleForNullabilityAnalysis(declaration: IrDeclaration): Boolean =
if (declaration != null && declaration.origin.isSynthetic) { when {
return true declaration.origin.isSynthetic ->
true
declaration.origin == JvmLoweredDeclarationOrigin.INLINE_CLASS_GENERATED_IMPL_METHOD ->
true
declaration is IrDeclarationWithVisibility ->
!declaration.visibility.isVisibleOutside()
else ->
false
} }
if (declaration is IrDeclarationWithVisibility) {
return !declaration.visibility.isVisibleOutside()
}
if (declaration is IrValueParameter && (declaration.parent as IrDeclaration).origin.isSynthetic) {
return true
}
return false
}
private val annotationRetentionMap = mapOf( private val annotationRetentionMap = mapOf(
KotlinRetention.SOURCE to RetentionPolicy.SOURCE, KotlinRetention.SOURCE to RetentionPolicy.SOURCE,