From afa281357af99d901ad514666b96368fbd4b7ab0 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Fri, 9 Oct 2015 10:24:44 +0300 Subject: [PATCH] Changed visibility for trait static fields --- .../src/org/jetbrains/kotlin/codegen/PropertyCodegen.java | 4 +--- .../nullabilityAnnotations/TraitClassObjectField.java | 2 +- .../writeFlags/property/classObject/trait/internalVal.kt | 2 +- .../writeFlags/property/classObject/trait/internalVar.kt | 2 +- .../writeFlags/property/classObject/trait/protectedVal.kt | 2 +- .../writeFlags/property/classObject/trait/publicVal.kt | 2 +- .../writeFlags/property/classObject/trait/publicVar.kt | 2 +- .../property/classObject/trait/publicVarProtectedSet.kt | 2 +- .../property/classObject/trait/publicVarPublicSet.kt | 2 +- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index 24ec46f250c..e3df89d475a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -316,9 +316,7 @@ public class PropertyCodegen { else if (hasPublicFieldAnnotation && !isDelegate) { modifiers |= ACC_PUBLIC; } - else if (isInterfaceCompanionObject(propertyDescriptor.getContainingDeclaration())) { - modifiers |= ACC_PRIVATE; - } else { + else { modifiers |= getVisibilityForSpecialPropertyBackingField(propertyDescriptor, isDelegate); } diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java index 704461ddcdd..c5a20016a51 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java @@ -5,7 +5,7 @@ public interface TraitClassObjectField { static final class Companion { @org.jetbrains.annotations.Nullable - private static final java.lang.String x = ""; + public static final java.lang.String x = ""; private static final java.lang.String y = ""; public static final TraitClassObjectField.Companion INSTANCE; diff --git a/compiler/testData/writeFlags/property/classObject/trait/internalVal.kt b/compiler/testData/writeFlags/property/classObject/trait/internalVal.kt index 282113c2293..b04c032cece 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/internalVal.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/internalVal.kt @@ -10,4 +10,4 @@ interface Test { // TESTED_OBJECT_KIND: property // TESTED_OBJECTS: Test$Companion, prop -// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC, ACC_SYNTHETIC \ No newline at end of file +// FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC, ACC_SYNTHETIC \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/internalVar.kt b/compiler/testData/writeFlags/property/classObject/trait/internalVar.kt index 15570713906..13111346f50 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/internalVar.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/internalVar.kt @@ -10,4 +10,4 @@ interface Test { // TESTED_OBJECT_KIND: property // TESTED_OBJECTS: Test$Companion, prop -// FLAGS: ACC_PRIVATE, ACC_STATIC, ACC_SYNTHETIC +// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC diff --git a/compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt b/compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt index 5187c7818df..eeca12aecd0 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt @@ -10,4 +10,4 @@ interface Test { // TESTED_OBJECT_KIND: property // TESTED_OBJECTS: Test$Companion, prop -// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC \ No newline at end of file +// FLAGS: ACC_PROTECTED, ACC_FINAL, ACC_STATIC \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVal.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVal.kt index f87cadd1322..372cce68f04 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVal.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVal.kt @@ -10,4 +10,4 @@ interface Test { // TESTED_OBJECT_KIND: property // TESTED_OBJECTS: Test$Companion, prop -// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC \ No newline at end of file +// FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVar.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVar.kt index 1e024c71530..50ce83fe210 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVar.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVar.kt @@ -10,4 +10,4 @@ interface Test { // TESTED_OBJECT_KIND: property // TESTED_OBJECTS: Test$Companion, prop -// FLAGS: ACC_PRIVATE, ACC_STATIC \ No newline at end of file +// FLAGS: ACC_PUBLIC, ACC_STATIC \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt index 327755430c6..b476316f97b 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt @@ -11,4 +11,4 @@ interface Test { // TESTED_OBJECT_KIND: property // TESTED_OBJECTS: Test$Companion, prop -// FLAGS: ACC_PRIVATE, ACC_STATIC +// FLAGS: ACC_PROTECTED, ACC_STATIC diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt index a362660a830..5c9106e7714 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt @@ -11,4 +11,4 @@ interface Test { // TESTED_OBJECT_KIND: property // TESTED_OBJECTS: Test$Companion, prop -// FLAGS: ACC_PRIVATE, ACC_STATIC +// FLAGS: ACC_PUBLIC, ACC_STATIC