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

Do not add nullability annotations to the methods of local classes

Browse Source 
Nullability annotations are useless for the methods of local classes
due to their restricted scope.

^KT-62513: Fixed
This commit is contained in:
vladislav.grechko
2023-10-11 12:09:55 +02:00
committed by Space Team
parent 417aa236fb
commit 897eab6b50
7 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt
+1 -1
View File
@@ -342,7 +342,7 @@ abstract class AnnotationCodegen(
private fun isInvisibleForNullabilityAnalysis(declaration: IrDeclaration): Boolean =
when {
(declaration.parent as? IrClass)?.isAnonymousObject == true -> true
(declaration.parent as? IrClass)?.isLocal == true -> true
declaration.origin.isSynthetic ->
true
declaration.origin == JvmLoweredDeclarationOrigin.INLINE_CLASS_GENERATED_IMPL_METHOD ||
compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.ir.txt
Vendored
+7 -7
View File
@@ -10,7 +10,7 @@ public final class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$1 {
inner (anonymous) class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1
inner (anonymous) class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$1
public method <init>(p0: CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -75,7 +75,7 @@ public final class CrossinlineKt$consumeEach$2$send$1 {
inner (anonymous) class CrossinlineKt$consumeEach$2
inner (anonymous) class CrossinlineKt$consumeEach$2$send$1
public method <init>(p0: CrossinlineKt$consumeEach$2, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -103,7 +103,7 @@ public final class CrossinlineKt$filter$$inlined$source$1$1 {
inner (anonymous) class CrossinlineKt$filter$$inlined$source$1
inner (anonymous) class CrossinlineKt$filter$$inlined$source$1$1
public method <init>(p0: CrossinlineKt$filter$$inlined$source$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -129,7 +129,7 @@ public final class CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1$1 {
inner (anonymous) class CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1
inner (anonymous) class CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1$1
public method <init>(p0: CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -158,7 +158,7 @@ public final class CrossinlineKt$fold$$inlined$consumeEach$1$1 {
inner (anonymous) class CrossinlineKt$fold$$inlined$consumeEach$1
inner (anonymous) class CrossinlineKt$fold$$inlined$consumeEach$1$1
public method <init>(p0: CrossinlineKt$fold$$inlined$consumeEach$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -203,7 +203,7 @@ public final class CrossinlineKt$range$$inlined$source$1$1 {
inner (anonymous) class CrossinlineKt$range$$inlined$source$1
inner (anonymous) class CrossinlineKt$range$$inlined$source$1$1
public method <init>(p0: CrossinlineKt$range$$inlined$source$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -230,7 +230,7 @@ public final class CrossinlineKt$source$1$consume$1 {
inner (anonymous) class CrossinlineKt$source$1
inner (anonymous) class CrossinlineKt$source$1$consume$1
public method <init>(p0: CrossinlineKt$source$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.ir.txt
Vendored
+3 -3
View File
@@ -74,7 +74,7 @@ public final class flow/InnerObjectRetransformationKt$collect$2$emit$1 {
inner (anonymous) class flow/InnerObjectRetransformationKt$collect$2
inner (anonymous) class flow/InnerObjectRetransformationKt$collect$2$emit$1
public method <init>(p0: flow.InnerObjectRetransformationKt$collect$2, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -99,7 +99,7 @@ public final class flow/InnerObjectRetransformationKt$flow$1$collect$1 {
inner (anonymous) class flow/InnerObjectRetransformationKt$flow$1
inner (anonymous) class flow/InnerObjectRetransformationKt$flow$1$collect$1
public method <init>(p0: flow.InnerObjectRetransformationKt$flow$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -124,7 +124,7 @@ public final class flow/InnerObjectRetransformationKt$flowWith$$inlined$flow$1$1
inner (anonymous) class flow/InnerObjectRetransformationKt$flowWith$$inlined$flow$1
inner (anonymous) class flow/InnerObjectRetransformationKt$flowWith$$inlined$flow$1$1
public method <init>(p0: flow.InnerObjectRetransformationKt$flowWith$$inlined$flow$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5.ir.txt
Vendored
+1 -1
View File
@@ -39,7 +39,7 @@ public final class Override5Kt$inlineMe$1$generic$1 {
inner (anonymous) class Override5Kt$inlineMe$1
inner (anonymous) class Override5Kt$inlineMe$1$generic$1
public method <init>(p0: Override5Kt$inlineMe$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.ir.txt
Vendored
+3 -3
View File
@@ -3,11 +3,11 @@ public final class LocalClassWithCapturedParamsKt$localCaptured$A {
// source: 'localClassWithCapturedParams.kt'
enclosing method LocalClassWithCapturedParamsKt.localCaptured()Ljava/lang/Object;
private final field x: int
private final @org.jetbrains.annotations.NotNull field z: java.lang.String
private final field z: java.lang.String
inner (local) class LocalClassWithCapturedParamsKt$localCaptured$A A
public method <init>(p0: int, @Simple(value="K") @org.jetbrains.annotations.NotNull p1: java.lang.String): void
public method <init>(p0: int, @Simple(value="K") p1: java.lang.String): void
public final method getX(): int
public final @org.jetbrains.annotations.NotNull method getZ(): java.lang.String
public final method getZ(): java.lang.String
}
@kotlin.Metadata
compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.ir.txt
Vendored
+7 -7
View File
@@ -20,7 +20,7 @@ public final class TcoContinuationKt$collect$2$emit$1 {
inner (anonymous) class TcoContinuationKt$collect$2
inner (anonymous) class TcoContinuationKt$collect$2$emit$1
public method <init>(p0: TcoContinuationKt$collect$2, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -45,7 +45,7 @@ public final class TcoContinuationKt$flow$1$collect$1 {
inner (anonymous) class TcoContinuationKt$flow$1
inner (anonymous) class TcoContinuationKt$flow$1$collect$1
public method <init>(p0: TcoContinuationKt$flow$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -90,7 +90,7 @@ public final class TcoContinuationKt$foo$$inlined$map$1$2$1 {
inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2
inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2$1
public method <init>(p0: TcoContinuationKt$foo$$inlined$map$1$2, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -124,7 +124,7 @@ public final class TcoContinuationKt$map$$inlined$transform$1$1 {
inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1
inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$1
public method <init>(p0: TcoContinuationKt$map$$inlined$transform$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -139,7 +139,7 @@ public final class TcoContinuationKt$map$$inlined$transform$1$2$1 {
inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2
inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2$1
public method <init>(p0: TcoContinuationKt$map$$inlined$transform$1$2, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -178,7 +178,7 @@ public final class TcoContinuationKt$transform$$inlined$flow$1$1 {
inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1
inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$1
public method <init>(p0: TcoContinuationKt$transform$$inlined$flow$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@@ -204,7 +204,7 @@ public final class TcoContinuationKt$transform$lambda$1$$inlined$collect$1$1 {
inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1
inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1$1
public method <init>(p0: TcoContinuationKt$transform$lambda$1$$inlined$collect$1, p1: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
public final method invokeSuspend(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
plugins/parcelize/parcelize-compiler/testData/codegen/generics.asm.ir.txt
Vendored
+1 -4
View File
@@ -3,9 +3,7 @@ public final class Box$Creator : java/lang/Object, android/os/Parcelable$Creator
public void <init>()
(Landroid/os/Parcel;)LBox<*>;
public final Box createFromParcel(android.os.Parcel parcel)
@Lorg/jetbrains/annotations/NotNull;([]) // invisible
@Lorg/jetbrains/annotations/NotNull;([]) // invisible, parameter 0 {
public final Box createFromParcel(android.os.Parcel parcel) {
LABEL (L0)
ALOAD (1)
LDC (parcel)
@@ -32,7 +30,6 @@ public final class Box$Creator : java/lang/Object, android/os/Parcelable$Creator
(I)[LBox<*>;
public final Box[] newArray(int size)
@Lorg/jetbrains/annotations/NotNull;([]) // invisible
public java.lang.Object[] newArray(int size)
}