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

Restrict companion properties copying to interface by const

Browse Source
This commit is contained in:
Michael Bogdanov
2015-12-25 11:46:57 +03:00
parent 6f0c2a0260
commit 85ae0cb78e
6 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
+1 -4
View File
@@ -703,12 +703,9 @@ public class AsmUtil {
} }
public static boolean isPropertyWithBackingFieldCopyInOuterClass(@NotNull PropertyDescriptor propertyDescriptor) { public static boolean isPropertyWithBackingFieldCopyInOuterClass(@NotNull PropertyDescriptor propertyDescriptor) {
boolean isExtensionProperty = propertyDescriptor.getExtensionReceiverParameter() != null;
DeclarationDescriptor propertyContainer = propertyDescriptor.getContainingDeclaration(); DeclarationDescriptor propertyContainer = propertyDescriptor.getContainingDeclaration();
return !propertyDescriptor.isVar() return propertyDescriptor.isConst()
&& !isExtensionProperty
&& isCompanionObject(propertyContainer) && isInterface(propertyContainer.getContainingDeclaration()) && isCompanionObject(propertyContainer) && isInterface(propertyContainer.getContainingDeclaration())
&& areBothAccessorDefault(propertyDescriptor)
&& getVisibilityForSpecialPropertyBackingField(propertyDescriptor, false) == ACC_PUBLIC; && getVisibilityForSpecialPropertyBackingField(propertyDescriptor, false) == ACC_PUBLIC;
} }
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+1 -1
View File
@@ -873,7 +873,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
PropertyDescriptor property = info.descriptor; PropertyDescriptor property = info.descriptor;
Type type = typeMapper.mapType(property); Type type = typeMapper.mapType(property);
int modifiers = ACC_STATIC | ACC_FINAL | ACC_PUBLIC | (property.isConst() ? 0 : ACC_DEPRECATED); int modifiers = ACC_STATIC | ACC_FINAL | ACC_PUBLIC;
FieldVisitor fv = v.newField(JvmDeclarationOriginKt.Synthetic(DescriptorToSourceUtils.descriptorToDeclaration(property), property), FieldVisitor fv = v.newField(JvmDeclarationOriginKt.Synthetic(DescriptorToSourceUtils.descriptorToDeclaration(property), property),
modifiers, context.getFieldName(property, false), modifiers, context.getFieldName(property, false),
type.getDescriptor(), typeMapper.mapFieldSignature(property.getType(), property), type.getDescriptor(), typeMapper.mapFieldSignature(property.getType(), property),
compiler/testData/codegen/boxWithJava/properties/classObjectProperties/Test.java
Vendored
-3
View File
@@ -8,9 +8,6 @@ class Test {
s = Trait.NAME; s = Trait.NAME;
if (!s.equals("Trait")) throw new AssertionError("Fail interface: " + s); if (!s.equals("Trait")) throw new AssertionError("Fail interface: " + s);
s = Trait.DEPRECATED;
if (!s.equals("DEPRECATED")) throw new AssertionError("Fail interface: " + s);
s = Enoom.NAME; s = Enoom.NAME;
if (!s.equals("Enum")) throw new AssertionError("Fail enum: " + s); if (!s.equals("Enum")) throw new AssertionError("Fail enum: " + s);
compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt
Vendored
-1
View File
@@ -7,7 +7,6 @@ class Klass {
interface Trait { interface Trait {
companion object { companion object {
const val NAME = "Trait" const val NAME = "Trait"
val DEPRECATED = "DEPRECATED"
} }
} }
compiler/testData/writeFlags/property/classObject/trait/internalVal.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop // TESTED_OBJECTS: Test, prop
// FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC, ACC_DEPRECATED // ABSENT: TRUE
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/trait/publicVal.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop // TESTED_OBJECTS: Test, prop
// FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC, ACC_DEPRECATED // ABSENT: TRUE
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop