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

Deprecated flag for static non-JvmField and non-const properties

Browse Source
This commit is contained in:
Michael Bogdanov
2015-10-12 16:41:56 +03:00
parent 275f3f8954
commit 0209cd080e
19 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
+8 -2
View File
@@ -56,8 +56,7 @@ import java.util.List;
import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.AsmUtil.*;
import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isJvmInterface; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isJvmInterface;
import static org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings.*; import static org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings.*;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.isCompanionObject; import static org.jetbrains.kotlin.resolve.DescriptorUtils.*;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.isInterface;
import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.PROPERTY_METADATA_TYPE; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.PROPERTY_METADATA_TYPE;
import static org.jetbrains.kotlin.resolve.jvm.annotations.AnnotationUtilKt.hasJvmFieldAnnotation; import static org.jetbrains.kotlin.resolve.jvm.annotations.AnnotationUtilKt.hasJvmFieldAnnotation;
import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin;
@@ -327,6 +326,13 @@ public class PropertyCodegen {
backingFieldContext = codegen.context; backingFieldContext = codegen.context;
v.getSerializationBindings().put(STATIC_FIELD_IN_OUTER_CLASS, propertyDescriptor); v.getSerializationBindings().put(STATIC_FIELD_IN_OUTER_CLASS, propertyDescriptor);
} }
if (isObject(propertyDescriptor.getContainingDeclaration()) &&
!hasJvmFieldAnnotation &&
!propertyDescriptor.isConst() &&
(modifiers & ACC_PRIVATE) == 0) {
modifiers |= ACC_DEPRECATED;
}
} }
else if (takeVisibilityFromDescriptor) { else if (takeVisibilityFromDescriptor) {
modifiers |= getVisibilityAccessFlag(propertyDescriptor); modifiers |= getVisibilityAccessFlag(propertyDescriptor);
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
Vendored
+3
View File
@@ -1,4 +1,7 @@
public final class ClassObjectField { public final class ClassObjectField {
/**
* @deprecated
*/
@org.jetbrains.annotations.Nullable @org.jetbrains.annotations.Nullable
public static final java.lang.String x = ""; public static final java.lang.String x = "";
private static final java.lang.String y = ""; private static final java.lang.String y = "";
compiler/testData/asJava/lightClasses/object/SimpleObject.java
Vendored
+6
View File
@@ -1,5 +1,11 @@
public final class A { public final class A {
/**
* @deprecated
*/
public static final int c = 1; public static final int c = 1;
/**
* @deprecated
*/
@org.jetbrains.annotations.NotNull @org.jetbrains.annotations.NotNull
public static java.lang.String v; public static java.lang.String v;
public static final pack.A INSTANCE; public static final pack.A INSTANCE;
compiler/testData/writeFlags/property/classObject/class/internalVal.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ class Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop // TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC // FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_DEPRECATED
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/class/internalVar.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ class Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop // TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC // FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_DEPRECATED
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/class/protectedVal.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ class Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop // TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PROTECTED, ACC_FINAL // FLAGS: ACC_STATIC, ACC_PROTECTED, ACC_FINAL, ACC_DEPRECATED
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/class/publicVal.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ class Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop // TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL // FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/class/publicVar.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ class Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop // TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC // FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_DEPRECATED
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ class Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop // TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PROTECTED // FLAGS: ACC_STATIC, ACC_PROTECTED, ACC_DEPRECATED
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ class Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop // TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC // FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_DEPRECATED
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt
Vendored
+1 -1
View File
@@ -13,4 +13,4 @@ class Test(val prop: String) {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop // TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL // FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED
compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt
Vendored
+1 -1
View File
@@ -13,4 +13,4 @@ class Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop // TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL // FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED
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_PUBLIC, ACC_FINAL, ACC_STATIC // FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC, ACC_DEPRECATED
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_PUBLIC, ACC_STATIC // FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_DEPRECATED
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_PROTECTED, ACC_FINAL, ACC_STATIC // FLAGS: ACC_PROTECTED, ACC_FINAL, ACC_STATIC, ACC_DEPRECATED
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_PUBLIC, ACC_FINAL, ACC_STATIC // FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC, ACC_DEPRECATED
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_PUBLIC, ACC_STATIC // FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_DEPRECATED
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_PROTECTED, ACC_STATIC // FLAGS: ACC_PROTECTED, ACC_STATIC, ACC_DEPRECATED
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_PUBLIC, ACC_STATIC // FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_DEPRECATED