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

Interface companion object backing fields become static

Browse Source
This commit is contained in:
Michael Bogdanov
2015-10-07 17:15:38 +03:00
parent 8f20595e8c
commit a9aa2bc147
18 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
+11 -3
View File
@@ -747,7 +747,9 @@ public class AsmUtil {
return false; return false;
} }
return isNonCompanionObject(propertyDescriptor.getContainingDeclaration()) || isPropertyWithBackingFieldInOuterClass(propertyDescriptor); return isNonCompanionObject(propertyDescriptor.getContainingDeclaration()) ||
isPropertyWithBackingFieldInOuterClass(propertyDescriptor) ||
isInterfaceCompanionObject(propertyDescriptor.getContainingDeclaration());
} }
public static boolean isPropertyWithBackingFieldInOuterClass(@NotNull PropertyDescriptor propertyDescriptor) { public static boolean isPropertyWithBackingFieldInOuterClass(@NotNull PropertyDescriptor propertyDescriptor) {
@@ -756,8 +758,14 @@ public class AsmUtil {
} }
public static int getVisibilityForSpecialPropertyBackingField(@NotNull PropertyDescriptor propertyDescriptor, boolean isDelegate) { public static int getVisibilityForSpecialPropertyBackingField(@NotNull PropertyDescriptor propertyDescriptor, boolean isDelegate) {
return getVisibilityForSpecialPropertyBackingField(propertyDescriptor, isDelegate, false);
}
public static int getVisibilityForSpecialPropertyBackingField(@NotNull PropertyDescriptor propertyDescriptor, boolean isDelegate, boolean skipInterfaceCheck) {
boolean isExtensionProperty = propertyDescriptor.getExtensionReceiverParameter() != null; boolean isExtensionProperty = propertyDescriptor.getExtensionReceiverParameter() != null;
if (isDelegate || isExtensionProperty) { if (isDelegate ||
isExtensionProperty ||
(!skipInterfaceCheck && isInterfaceCompanionObject(propertyDescriptor.getContainingDeclaration()))) {
return ACC_PRIVATE; return ACC_PRIVATE;
} }
else { else {
@@ -783,7 +791,7 @@ public class AsmUtil {
&& !isExtensionProperty && !isExtensionProperty
&& isCompanionObject(propertyContainer) && isInterface(propertyContainer.getContainingDeclaration()) && isCompanionObject(propertyContainer) && isInterface(propertyContainer.getContainingDeclaration())
&& areBothAccessorDefault(propertyDescriptor) && areBothAccessorDefault(propertyDescriptor)
&& getVisibilityForSpecialPropertyBackingField(propertyDescriptor, false) == ACC_PUBLIC; && getVisibilityForSpecialPropertyBackingField(propertyDescriptor, false, true) == ACC_PUBLIC;
} }
public static boolean isCompanionObjectWithBackingFieldsInOuter(@NotNull DeclarationDescriptor companionObject) { public static boolean isCompanionObjectWithBackingFieldsInOuter(@NotNull DeclarationDescriptor companionObject) {
compiler/testData/writeFlags/property/classObject/trait/delegatedProtectedVar.kt
Vendored
+1 -2
View File
@@ -24,9 +24,8 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop$delegate // TESTED_OBJECTS: Test$Companion, prop$delegate
// FLAGS: ACC_FINAL, ACC_PRIVATE // FLAGS: ACC_FINAL, ACC_PRIVATE, ACC_STATIC
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop$delegate // TESTED_OBJECTS: Test, prop$delegate
// FLAGS: ACC_FINAL, ACC_PRIVATE
// ABSENT: TRUE // ABSENT: TRUE
compiler/testData/writeFlags/property/classObject/trait/delegatedPublicVal.kt
Vendored
+1 -1
View File
@@ -20,7 +20,7 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop$delegate // TESTED_OBJECTS: Test$Companion, prop$delegate
// FLAGS: ACC_FINAL, ACC_PRIVATE // FLAGS: ACC_FINAL, ACC_PRIVATE, ACC_STATIC
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop$delegate // TESTED_OBJECTS: Test, prop$delegate
compiler/testData/writeFlags/property/classObject/trait/internalVal.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL // FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/internalVar.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE // FLAGS: ACC_PRIVATE, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt
Vendored
+1 -1
View File
@@ -11,4 +11,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE // FLAGS: ACC_PRIVATE, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/privateVal.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL // FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/privateVar.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE // FLAGS: ACC_PRIVATE, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL // FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt
Vendored
+1 -1
View File
@@ -11,4 +11,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE // FLAGS: ACC_PRIVATE, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVal.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL // FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt
Vendored
+1 -1
View File
@@ -13,4 +13,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL // FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVar.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE // FLAGS: ACC_PRIVATE, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt
Vendored
+1 -1
View File
@@ -13,4 +13,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE // FLAGS: ACC_PRIVATE, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt
Vendored
+1 -1
View File
@@ -11,4 +11,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE // FLAGS: ACC_PRIVATE, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt
Vendored
+1 -1
View File
@@ -11,4 +11,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE // FLAGS: ACC_PRIVATE, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt
Vendored
+1 -1
View File
@@ -11,4 +11,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE // FLAGS: ACC_PRIVATE, ACC_STATIC
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+4
View File
@@ -305,6 +305,10 @@ public class DescriptorUtils {
return isKindOf(descriptor, ClassKind.OBJECT) && !((ClassDescriptor) descriptor).isCompanionObject(); return isKindOf(descriptor, ClassKind.OBJECT) && !((ClassDescriptor) descriptor).isCompanionObject();
} }
public static boolean isInterfaceCompanionObject(@NotNull DeclarationDescriptor descriptor) {
return isCompanionObject(descriptor) && isKindOf(descriptor.getContainingDeclaration(), ClassKind.INTERFACE);
}
public static boolean isObject(@NotNull DeclarationDescriptor descriptor) { public static boolean isObject(@NotNull DeclarationDescriptor descriptor) {
return isKindOf(descriptor, ClassKind.OBJECT); return isKindOf(descriptor, ClassKind.OBJECT);
} }