Added Native-specific checker for properties of top level singletons (#…

…3172)
JetBrains · Mar 19, 2020 · 9740a14 · 9740a14
1 parent 2f83755
commit 9740a14
Show file tree

Hide file tree

Showing 7 changed files with 403 additions and 2 deletions.
diff --git a/compiler/testData/diagnostics/nativeTests/topLevelSingleton.kt b/compiler/testData/diagnostics/nativeTests/topLevelSingleton.kt
@@ -0,0 +1,114 @@
+// FILE: annotation.kt
+package kotlin.native.concurrent
+
+@Target(AnnotationTarget.PROPERTY, AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.BINARY)
+annotation class ThreadLocal
+
+// FILE: test.kt
+import kotlin.native.concurrent.ThreadLocal
+
+import kotlin.reflect.KProperty
+
+class Delegate {
+    val value: Int = 10
+    operator fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        return value
+    }
+
+    operator fun setValue(thisRef: Any?, property: KProperty<*>, value: Int) {
+    }
+}
+
+class AtomicInt(var value: Int)
+object Foo {
+    <!VARIABLE_IN_SINGLETON_WITHOUT_THREAD_LOCAL!>var field1: Int = 10<!>
+    val backer2 = AtomicInt(0)
+    var field2: Int
+        get() = backer2.value
+        set(value: Int) { backer2.value = value }
+}
+
+object Foo1 {
+    var field1: Int = 10
+        set(value: Int) { backer2.value = value }
+    val backer2 = AtomicInt(0)
+}
+
+object WithDelegate {
+    var field1: Int by Delegate()
+}
+
+@ThreadLocal
+object Bar {
+    var field1: Int = 10
+    var field2: String? = null
+}
+
+class Foo2 {
+    companion object {
+        <!VARIABLE_IN_SINGLETON_WITHOUT_THREAD_LOCAL!>var field1: Int = 10<!>
+        val backer2 = AtomicInt(0)
+        var field2: Int
+            get() = backer2.value
+            set(value: Int) {
+                backer2.value = value
+            }
+    }
+}
+
+class Bar2 {
+    @ThreadLocal
+    companion object {
+        var field1: Int = 10
+        var field2: String? = null
+    }
+}
+
+<!ENUM_THREAD_LOCAL_INAPPLICABLE!>@ThreadLocal<!>
+enum class Color(<!VARIABLE_IN_ENUM!>var rgb: Int<!>) {
+    RED(0xFF0000),
+    GREEN(0x00FF00),
+    BLUE(0x0000FF)
+}
+
+enum class Color1(<!VARIABLE_IN_ENUM!>var rgb: Int<!>) {
+    RED(0xFF0000),
+    GREEN(0x00FF00),
+    BLUE(0x0000FF);
+
+    init { this.rgb += 1 }
+}
+
+@ThreadLocal
+var a = 3
+enum class Color2() {
+    RED(),
+    GREEN(),
+    BLUE();
+
+    var rgb: Int = 2
+        set(value: Int) {
+            a = value
+        }
+}
+
+enum class Color3() {
+    RED(),
+    GREEN(),
+    BLUE();
+
+    var field1: Int by Delegate()
+}
+
+enum class Color4 {
+    RED {
+        <!VARIABLE_IN_ENUM!>var a = 2<!>
+        override fun foo() { a = 42 }
+    },
+    GREEN,
+    BLUE;
+    open fun foo() {}
+}
+
+var topLevelProperty = "Global var"
diff --git a/compiler/testData/diagnostics/nativeTests/topLevelSingleton.txt b/compiler/testData/diagnostics/nativeTests/topLevelSingleton.txt
@@ -0,0 +1,217 @@
+package
+
+@kotlin.native.concurrent.ThreadLocal public var a: kotlin.Int
+public var topLevelProperty: kotlin.String
+
+public final class AtomicInt {
+    public constructor AtomicInt(/*0*/ value: kotlin.Int)
+    public final var value: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+@kotlin.native.concurrent.ThreadLocal public object Bar {
+    private constructor Bar()
+    public final var field1: kotlin.Int
+    public final var field2: kotlin.String?
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class Bar2 {
+    public constructor Bar2()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    @kotlin.native.concurrent.ThreadLocal public companion object Companion {
+        private constructor Companion()
+        public final var field1: kotlin.Int
+        public final var field2: kotlin.String?
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+@kotlin.native.concurrent.ThreadLocal public final enum class Color : kotlin.Enum<Color> {
+    enum entry RED
+
+    enum entry GREEN
+
+    enum entry BLUE
+
+    private constructor Color(/*0*/ rgb: kotlin.Int)
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    public final var rgb: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Color
+    public final /*synthesized*/ fun values(): kotlin.Array<Color>
+}
+
+public final enum class Color1 : kotlin.Enum<Color1> {
+    enum entry RED
+
+    enum entry GREEN
+
+    enum entry BLUE
+
+    private constructor Color1(/*0*/ rgb: kotlin.Int)
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    public final var rgb: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color1): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Color1
+    public final /*synthesized*/ fun values(): kotlin.Array<Color1>
+}
+
+public final enum class Color2 : kotlin.Enum<Color2> {
+    enum entry RED
+
+    enum entry GREEN
+
+    enum entry BLUE
+
+    private constructor Color2()
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    public final var rgb: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color2): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Color2
+    public final /*synthesized*/ fun values(): kotlin.Array<Color2>
+}
+
+public final enum class Color3 : kotlin.Enum<Color3> {
+    enum entry RED
+
+    enum entry GREEN
+
+    enum entry BLUE
+
+    private constructor Color3()
+    public final var field1: kotlin.Int
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color3): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Color3
+    public final /*synthesized*/ fun values(): kotlin.Array<Color3>
+}
+
+public final enum class Color4 : kotlin.Enum<Color4> {
+    enum entry RED
+
+    enum entry GREEN
+
+    enum entry BLUE
+
+    private constructor Color4()
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color4): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open fun foo(): kotlin.Unit
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Color4
+    public final /*synthesized*/ fun values(): kotlin.Array<Color4>
+}
+
+public final class Delegate {
+    public constructor Delegate()
+    public final val value: kotlin.Int = 10
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final operator fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.reflect.KProperty<*>): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final operator fun setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.reflect.KProperty<*>, /*2*/ value: kotlin.Int): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public object Foo {
+    private constructor Foo()
+    public final val backer2: AtomicInt
+    public final var field1: kotlin.Int
+    public final var field2: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public object Foo1 {
+    private constructor Foo1()
+    public final val backer2: AtomicInt
+    public final var field1: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class Foo2 {
+    public constructor Foo2()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion {
+        private constructor Companion()
+        public final val backer2: AtomicInt
+        public final var field1: kotlin.Int
+        public final var field2: kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public object WithDelegate {
+    private constructor WithDelegate()
+    public final var field1: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+package kotlin {
+
+    package kotlin.native {
+
+        package kotlin.native.concurrent {
+
+            @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY, AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class ThreadLocal : kotlin.Annotation {
+                public constructor ThreadLocal()
+                public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+                public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+            }
+        }
+    }
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsNativeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsNativeTestGenerated.java
diff --git a/...frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/DefaultErrorMessagesNative.kt b/...frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/DefaultErrorMessagesNative.kt
@@ -25,6 +25,12 @@ private val DIAGNOSTIC_FACTORY_TO_RENDERER by lazy {
             "@SharedImmutable is applicable only to val with backing field or to property with delegation"
         )
         put(ErrorsNative.INAPPLICABLE_SHARED_IMMUTABLE_TOP_LEVEL, "@SharedImmutable is applicable only to top level declarations")
+        put(
+            ErrorsNative.VARIABLE_IN_SINGLETON_WITHOUT_THREAD_LOCAL,
+            "Variable in singleton without @ThreadLocal can't be changed after initialization"
+        )
+        put(ErrorsNative.ENUM_THREAD_LOCAL_INAPPLICABLE, "@ThreadLocal isn't applicable to enum classes")
+        put(ErrorsNative.VARIABLE_IN_ENUM, "Variable in enum class can't be changed after initialization")
     }
 }
 

diff --git a/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/ErrorsNative.kt b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/ErrorsNative.kt
@@ -24,7 +24,12 @@ object ErrorsNative {
     val INAPPLICABLE_SHARED_IMMUTABLE_PROPERTY = DiagnosticFactory0.create<KtElement>(Severity.ERROR)
     @JvmField
     val INAPPLICABLE_SHARED_IMMUTABLE_TOP_LEVEL = DiagnosticFactory0.create<KtElement>(Severity.ERROR)
-
+    @JvmField
+    val VARIABLE_IN_SINGLETON_WITHOUT_THREAD_LOCAL = DiagnosticFactory0.create<KtElement>(Severity.WARNING)
+    @JvmField
+    val ENUM_THREAD_LOCAL_INAPPLICABLE = DiagnosticFactory0.create<KtElement>(Severity.ERROR)
+    @JvmField
+    val VARIABLE_IN_ENUM = DiagnosticFactory0.create<KtElement>(Severity.WARNING)
     init {
         Errors.Initializer.initializeFactoryNames(ErrorsNative::class.java)
     }