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

JVM: Generate object and companion object INSTANCE fields as @NotNull

Browse Source
This commit is contained in:
Dmitry Petrov
2020-06-17 15:30:18 +03:00
parent 558dfc6d9a
commit e9231b5624
41 changed files with 84 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/JvmStatic.java
Vendored
+2
View File
@@ -1,4 +1,5 @@
public final class A {
@org.jetbrains.annotations.NotNull
public static final A.Companion Companion;
public A() { /* compiled code */ }
@@ -7,6 +8,7 @@ public final class A {
public static final void f() { /* compiled code */ }
public static final class B {
@org.jetbrains.annotations.NotNull
public static final A.B INSTANCE;
@kotlin.jvm.JvmStatic
compiler/testData/asJava/lightClasses/NestedObjects.java
Vendored
+5
View File
@@ -5,12 +5,14 @@ public final class A {
public B() { /* compiled code */ }
public static final class I {
@org.jetbrains.annotations.NotNull
public static final A.B.I INSTANCE;
private I() { /* compiled code */ }
}
public static final class II {
@org.jetbrains.annotations.NotNull
public static final A.B.II INSTANCE;
private II() { /* compiled code */ }
@@ -18,16 +20,19 @@ public final class A {
}
public static final class C {
@org.jetbrains.annotations.NotNull
public static final A.C INSTANCE;
private C() { /* compiled code */ }
public static final class D {
@org.jetbrains.annotations.NotNull
public static final A.C.D INSTANCE;
private D() { /* compiled code */ }
public static final class G {
@org.jetbrains.annotations.NotNull
public static final A.C.D.G INSTANCE;
private G() { /* compiled code */ }
compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.java
Vendored
+1
View File
@@ -1,4 +1,5 @@
public interface TraitClassObjectField {
@org.jetbrains.annotations.NotNull
TraitClassObjectField.Companion Companion;
@org.jetbrains.annotations.Nullable
java.lang.String x = "";
compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.java
Vendored
+1
View File
@@ -1,4 +1,5 @@
public final class A {
@org.jetbrains.annotations.NotNull
public static final A.Companion Companion;
public A() { /* compiled code */ }
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
Vendored
+1
View File
@@ -2,6 +2,7 @@ public final class ClassObjectField {
@org.jetbrains.annotations.Nullable
private static final java.lang.String x;
private static final java.lang.String y;
@org.jetbrains.annotations.NotNull
public static final ClassObjectField.Companion Companion;
public ClassObjectField() { /* compiled code */ }
compiler/testData/asJava/lightClasses/object/SimpleObject.java
Vendored
+1
View File
@@ -5,6 +5,7 @@ public final class A {
public static final int cc = 1;
@org.jetbrains.annotations.NotNull
public static final java.lang.String cv = "A";
@org.jetbrains.annotations.NotNull
public static final pack.A INSTANCE;
public final int getC() { /* compiled code */ }
compiler/testData/asJava/lightClasses/publicField/CompanionObject.java
Vendored
+1
View File
@@ -2,6 +2,7 @@ public final class C {
@kotlin.jvm.JvmField
@org.jetbrains.annotations.NotNull
public static final java.lang.String foo;
@org.jetbrains.annotations.NotNull
public static final C.Companion Companion;
public C() { /* compiled code */ }
compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt
Vendored
+1 -1
View File
@@ -375,7 +375,7 @@ public final class SourceCrossinline$Factory {
@kotlin.Metadata
public interface SourceCrossinline {
public final static field Factory: SourceCrossinline$Factory
public final static @org.jetbrains.annotations.NotNull field Factory: SourceCrossinline$Factory
inner class SourceCrossinline$Factory
static method <clinit>(): void
public abstract @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_1_2.txt
Vendored
+1 -1
View File
@@ -386,7 +386,7 @@ public final class SourceCrossinline$Factory {
@kotlin.Metadata
public interface SourceCrossinline {
public final static field Factory: SourceCrossinline$Factory
public final static @org.jetbrains.annotations.NotNull field Factory: SourceCrossinline$Factory
inner class SourceCrossinline$Factory
static method <clinit>(): void
public abstract @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object
compiler/testData/codegen/bytecodeListing/annotations/noAdditionalAnnotationsInAccessors.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JVM_IR
class Foo private constructor(s: String) {
private fun foo(s: String) {}
compiler/testData/codegen/bytecodeListing/annotations/noAdditionalAnnotationsInAccessors.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public final class Foo$Companion {
@kotlin.Metadata
public final class Foo {
public final static field Companion: Foo$Companion
public final static @org.jetbrains.annotations.NotNull field Companion: Foo$Companion
inner class Foo$Companion
static method <clinit>(): void
private method <init>(p0: java.lang.String): void
compiler/testData/codegen/bytecodeListing/annotations/noAnnotationsInSyntheticAccessors.txt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ public final class Foo$Companion {
@kotlin.Metadata
public final class Foo {
public final static field Companion: Foo$Companion
public final static @org.jetbrains.annotations.NotNull field Companion: Foo$Companion
inner class Foo$Companion
static method <clinit>(): void
private @Ann method <init>(@Ann p0: java.lang.String): void
compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.txt
Vendored
+4 -4
View File
@@ -7,7 +7,7 @@ public final class TestInternalCompanionInClass$Companion {
@kotlin.Metadata
public final class TestInternalCompanionInClass {
public final static field Companion: TestInternalCompanionInClass$Companion
public final static @org.jetbrains.annotations.NotNull field Companion: TestInternalCompanionInClass$Companion
inner class TestInternalCompanionInClass$Companion
static method <clinit>(): void
public method <init>(): void
@@ -22,7 +22,7 @@ final class TestPrivateCompanionInClass$Companion {
@kotlin.Metadata
public final class TestPrivateCompanionInClass {
private final static field Companion: TestPrivateCompanionInClass$Companion
private final static @org.jetbrains.annotations.NotNull field Companion: TestPrivateCompanionInClass$Companion
inner class TestPrivateCompanionInClass$Companion
static method <clinit>(): void
public method <init>(): void
@@ -38,7 +38,7 @@ final class TestPrivateCompanionInInterface$Companion {
@kotlin.Metadata
public interface TestPrivateCompanionInInterface {
public synthetic final static field Companion: TestPrivateCompanionInInterface$Companion
public synthetic final static @org.jetbrains.annotations.NotNull field Companion: TestPrivateCompanionInInterface$Companion
inner class TestPrivateCompanionInInterface$Companion
static method <clinit>(): void
}
@@ -52,7 +52,7 @@ public final class TestProtectedCompanionInClass$Companion {
@kotlin.Metadata
public class TestProtectedCompanionInClass {
protected final static field Companion: TestProtectedCompanionInClass$Companion
protected final static @org.jetbrains.annotations.NotNull field Companion: TestProtectedCompanionInClass$Companion
inner class TestProtectedCompanionInClass$Companion
static method <clinit>(): void
public method <init>(): void
compiler/testData/codegen/bytecodeListing/companionObjectVisibility_before.txt
Vendored
+4 -4
View File
@@ -7,7 +7,7 @@ public final class TestInternalCompanionInClass$Companion {
@kotlin.Metadata
public final class TestInternalCompanionInClass {
public final static field Companion: TestInternalCompanionInClass$Companion
public final static @org.jetbrains.annotations.NotNull field Companion: TestInternalCompanionInClass$Companion
inner class TestInternalCompanionInClass$Companion
static method <clinit>(): void
public method <init>(): void
@@ -22,7 +22,7 @@ final class TestPrivateCompanionInClass$Companion {
@kotlin.Metadata
public final class TestPrivateCompanionInClass {
public deprecated final static @java.lang.Deprecated field Companion: TestPrivateCompanionInClass$Companion
public deprecated final static @java.lang.Deprecated @org.jetbrains.annotations.NotNull field Companion: TestPrivateCompanionInClass$Companion
inner class TestPrivateCompanionInClass$Companion
static method <clinit>(): void
public method <init>(): void
@@ -38,7 +38,7 @@ final class TestPrivateCompanionInInterface$Companion {
@kotlin.Metadata
public interface TestPrivateCompanionInInterface {
public deprecated final static @java.lang.Deprecated field Companion: TestPrivateCompanionInInterface$Companion
public deprecated final static @java.lang.Deprecated @org.jetbrains.annotations.NotNull field Companion: TestPrivateCompanionInInterface$Companion
inner class TestPrivateCompanionInInterface$Companion
static method <clinit>(): void
}
@@ -52,7 +52,7 @@ public final class TestProtectedCompanionInClass$Companion {
@kotlin.Metadata
public class TestProtectedCompanionInClass {
public deprecated final static @java.lang.Deprecated field Companion: TestProtectedCompanionInClass$Companion
public deprecated final static @java.lang.Deprecated @org.jetbrains.annotations.NotNull field Companion: TestProtectedCompanionInClass$Companion
inner class TestProtectedCompanionInClass$Companion
static method <clinit>(): void
public method <init>(): void
compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public final class Foo$Companion {
@kotlin.Metadata
public final class Foo {
public final static field Companion: Foo$Companion
public final static @org.jetbrains.annotations.NotNull field Companion: Foo$Companion
private final static field constValInCompanion: int
private final field x: int
inner class Foo$Companion
compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.txt
Vendored
+2 -2
View File
@@ -19,7 +19,7 @@ public final class ASimpleClass {
@kotlin.Metadata
public final class BSimpleObject {
public final static field INSTANCE: BSimpleObject
public final static @org.jetbrains.annotations.NotNull field INSTANCE: BSimpleObject
static method <clinit>(): void
private method <init>(): void
public synthetic static method showSnackbar$default(p0: java.lang.String, p1: int, p2: int, p3: int, p4: java.lang.Object): void
@@ -61,7 +61,7 @@ public final class CClassWithCompanion$Companion {
@kotlin.Metadata
public final class CClassWithCompanion {
public final static field Companion: CClassWithCompanion$Companion
public final static @org.jetbrains.annotations.NotNull field Companion: CClassWithCompanion$Companion
inner class CClassWithCompanion$Companion
static method <clinit>(): void
public method <init>(): void
compiler/testData/codegen/bytecodeListing/jvmStaticWithDefaultParameters.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
@kotlin.Metadata
public final class AnObject {
public final static field INSTANCE: AnObject
public final static @org.jetbrains.annotations.NotNull field INSTANCE: AnObject
static method <clinit>(): void
private method <init>(): void
public synthetic static method foo$default(p0: int, p1: int, p2: java.lang.Object): void
@@ -18,7 +18,7 @@ public final class WithCompanion$Companion {
@kotlin.Metadata
public final class WithCompanion {
public final static field Companion: WithCompanion$Companion
public final static @org.jetbrains.annotations.NotNull field Companion: WithCompanion$Companion
inner class WithCompanion$Companion
static method <clinit>(): void
public method <init>(): void
compiler/testData/codegen/kapt/innerClasses.txt
Vendored
+2 -2
View File
@@ -14,7 +14,7 @@ public interface test/TopLevel$InnerInterface {
@kotlin.Metadata
public final class test/TopLevel$InnerObject {
public final static field INSTANCE: test.TopLevel$InnerObject
public final static @org.jetbrains.annotations.NotNull field INSTANCE: test.TopLevel$InnerObject
inner class test/TopLevel$InnerObject
private method <init>(): void
}
@@ -36,7 +36,7 @@ public final class test/TopLevel$NestedClass {
@kotlin.Metadata
public final class test/TopLevel {
public final static field Companion: test.TopLevel$Companion
public final static @org.jetbrains.annotations.NotNull field Companion: test.TopLevel$Companion
private final static @org.jetbrains.annotations.NotNull field q: java.lang.String
private final @org.jetbrains.annotations.NotNull field x: java.lang.String
private final field y: int