diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java index cb864463d37..ee4c986f88d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java @@ -356,7 +356,7 @@ public interface Errors { DiagnosticFactory0 INLINE_CLASS_CONSTRUCTOR_WRONG_PARAMETERS_SIZE = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 INLINE_CLASS_CONSTRUCTOR_NOT_FINAL_READ_ONLY_PARAMETER = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 PROPERTY_WITH_BACKING_FIELD_INSIDE_INLINE_CLASS = DiagnosticFactory0.create(ERROR, DECLARATION_SIGNATURE); - DiagnosticFactory0 RESERVED_VAR_PROPERTY_OF_VALUE_CLASS = DiagnosticFactory0.create(WARNING); + DiagnosticFactory0 RESERVED_VAR_PROPERTY_OF_VALUE_CLASS = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 DELEGATED_PROPERTY_INSIDE_INLINE_CLASS = DiagnosticFactory0.create(ERROR); DiagnosticFactory1 INLINE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE = DiagnosticFactory1.create(ERROR); DiagnosticFactory0 INLINE_CLASS_CANNOT_IMPLEMENT_INTERFACE_BY_DELEGATION = DiagnosticFactory0.create(ERROR); diff --git a/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/memberExtVarDelegationWithInlineClassParameterTypes.kt b/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/memberExtVarDelegationWithInlineClassParameterTypes.kt index 7808a26a6ab..7691a5028f9 100644 --- a/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/memberExtVarDelegationWithInlineClassParameterTypes.kt +++ b/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/memberExtVarDelegationWithInlineClassParameterTypes.kt @@ -6,6 +6,7 @@ import kotlin.test.assertEquals inline class S(val xs: Array) interface IFoo { + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") var S.extVar: String } @@ -14,12 +15,14 @@ interface GFoo { } object FooImpl : IFoo { + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") override var S.extVar: String get() = xs[0] set(value) { xs[0] = value } } object GFooImpl : GFoo { + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") override var S.extVar: String get() = xs[0] set(value) { xs[0] = value } diff --git a/compiler/testData/codegen/box/reflection/call/inlineClasses/nonOverridingVarOfInlineClass.kt b/compiler/testData/codegen/box/reflection/call/inlineClasses/nonOverridingVarOfInlineClass.kt index e365dff5fc0..fce0d470e46 100644 --- a/compiler/testData/codegen/box/reflection/call/inlineClasses/nonOverridingVarOfInlineClass.kt +++ b/compiler/testData/codegen/box/reflection/call/inlineClasses/nonOverridingVarOfInlineClass.kt @@ -6,6 +6,7 @@ import kotlin.test.assertEquals var global = S("") inline class Z(val x: Int) { + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") var test: S get() = S("${global.x}$x") set(value) { @@ -14,6 +15,7 @@ inline class Z(val x: Int) { } inline class L(val x: Long) { + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") var test: S get() = S("${global.x}$x") set(value) { @@ -22,6 +24,7 @@ inline class L(val x: Long) { } inline class S(val x: String) { + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") var test: S get() = S("${global.x}$x") set(value) { @@ -30,6 +33,7 @@ inline class S(val x: String) { } inline class A(val x: Any) { + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") var test: S get() = S("${global.x}$x") set(value) { diff --git a/compiler/testData/codegen/box/reflection/call/inlineClasses/overridingVarOfInlineClass.kt b/compiler/testData/codegen/box/reflection/call/inlineClasses/overridingVarOfInlineClass.kt index fff7c09b21d..acadf3164a9 100644 --- a/compiler/testData/codegen/box/reflection/call/inlineClasses/overridingVarOfInlineClass.kt +++ b/compiler/testData/codegen/box/reflection/call/inlineClasses/overridingVarOfInlineClass.kt @@ -10,6 +10,7 @@ interface ITest { } inline class Z(val x: Int) : ITest { + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") override var test: S get() = S("${global.x}$x") set(value) { @@ -18,6 +19,7 @@ inline class Z(val x: Int) : ITest { } inline class L(val x: Long) : ITest { + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") override var test: S get() = S("${global.x}$x") set(value) { @@ -26,6 +28,7 @@ inline class L(val x: Long) : ITest { } inline class S(val x: String) : ITest { + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") override var test: S get() = S("${global.x}$x") set(value) { @@ -34,6 +37,7 @@ inline class S(val x: String) : ITest { } inline class A(val x: Any) : ITest { + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") override var test: S get() = S("${global.x}$x") set(value) { diff --git a/compiler/testData/codegen/box/reflection/call/inlineClasses/properties.kt b/compiler/testData/codegen/box/reflection/call/inlineClasses/properties.kt index 919589dc174..82bcd915d99 100644 --- a/compiler/testData/codegen/box/reflection/call/inlineClasses/properties.kt +++ b/compiler/testData/codegen/box/reflection/call/inlineClasses/properties.kt @@ -13,6 +13,7 @@ class C { var member: S = S("") private var suffix = S("") + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") var S.memExt: S get() = this + suffix set(value) { suffix = this + value } @@ -21,6 +22,7 @@ class C { var topLevel: S = S("") private var suffix = S("") +@Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") var S.ext: S get() = this + suffix set(value) { suffix = this + value } diff --git a/compiler/testData/codegen/box/reflection/callBy/inlineClassMembers.kt b/compiler/testData/codegen/box/reflection/callBy/inlineClassMembers.kt index c6c099e1bf6..79b875e724e 100644 --- a/compiler/testData/codegen/box/reflection/callBy/inlineClassMembers.kt +++ b/compiler/testData/codegen/box/reflection/callBy/inlineClassMembers.kt @@ -15,6 +15,7 @@ inline class Z(val x: Int) : IFoo { override fun fooFun(z: Z): Z = Z(z.x + x) + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") override var fooVar: Z get() = Z(global.x + x) set(value) { @@ -23,6 +24,7 @@ inline class Z(val x: Int) : IFoo { fun barFun(z: Z): Z = Z(z.x * 100 + x) + @Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") var barVar: Z get() = Z(global.x * 100 + x) set(value) {