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

KT-29144 Interface companion object field should always be ACC_PUBLIC

Browse Source
This commit is contained in:
Dmitry Petrov
2019-01-21 17:08:25 +03:00
parent 129ea49d64
commit ae8a90f7b4
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+6 -8
View File
@@ -795,16 +795,14 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
!properVisibilityForCompanionObjectInstanceField && !properVisibilityForCompanionObjectInstanceField &&
(hasPrivateOrProtectedProperVisibility || hasPackagePrivateProperVisibility || (hasPrivateOrProtectedProperVisibility || hasPackagePrivateProperVisibility ||
isNonIntrinsicPrivateCompanionObjectInInterface(companionObjectDescriptor)); isNonIntrinsicPrivateCompanionObjectInInterface(companionObjectDescriptor));
boolean doNotGeneratePublic = boolean fieldIsForcedToBePublic =
properVisibilityForCompanionObjectInstanceField && hasPrivateOrProtectedProperVisibility; JvmCodegenUtil.isJvmInterface(descriptor) ||
int fieldAccessFlags; !properVisibilityForCompanionObjectInstanceField;
if (doNotGeneratePublic) { int fieldAccessFlags = ACC_STATIC | ACC_FINAL;
fieldAccessFlags = ACC_STATIC | ACC_FINAL; if (fieldIsForcedToBePublic) {
fieldAccessFlags |= ACC_PUBLIC;
} }
else { else {
fieldAccessFlags = ACC_PUBLIC | ACC_STATIC | ACC_FINAL;
}
if (properVisibilityForCompanionObjectInstanceField) {
fieldAccessFlags |= properFieldVisibilityFlag; fieldAccessFlags |= properFieldVisibilityFlag;
} }
if (fieldShouldBeDeprecated) { if (fieldShouldBeDeprecated) {