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

Do not always generate synthetic "$annotations" as private

Browse Source 
Since annotations are a part of the declaration, they must have the same
visibility as the declaration in the bytecode. Otherwise obfuscators like
Proguard might strip the "$annotations" method and no annotations would be
found via Kotlin reflection

 #KT-15993 Fixed
This commit is contained in:
Alexander Udalov
2017-02-02 16:13:30 +03:00
parent 81e083a133
commit 0db60bf6cb
34 changed files with 166 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/light-analysis/annotations/annotationsOnTypeAliases.txt
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ public annotation class Ann {
@kotlin.Metadata
public final class AnnotationsOnTypeAliasesKt {
private synthetic deprecated static @Ann method TA$annotations(): void
public synthetic deprecated static @Ann method TA$annotations(): void
public final static method assertHasDeclaredMethodWithAnn(@org.jetbrains.annotations.NotNull p0: java.lang.Class): void
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
}
compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/jvmStaticInObject.txt
Vendored
+3 -3
View File
@@ -21,7 +21,7 @@ public final class Test {
public final static @org.jetbrains.annotations.NotNull method getTestK(): java.lang.String
public final static @org.jetbrains.annotations.NotNull method getTestO(): java.lang.String
public final static @org.jetbrains.annotations.NotNull method getTestOK(): java.lang.String
private synthetic deprecated static @kotlin.jvm.JvmStatic method testK$annotations(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method testO$annotations(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method testOK$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method testK$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method testO$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method testOK$annotations(): void
}
compiler/testData/codegen/light-analysis/jvmStatic/closure.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public final class A {
private final static @org.jetbrains.annotations.NotNull field b: java.lang.String
private final static @org.jetbrains.annotations.NotNull field c: java.lang.String
private method <init>(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method c$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method c$annotations(): void
public final @org.jetbrains.annotations.NotNull method getB(): java.lang.String
public final static @org.jetbrains.annotations.NotNull method getC(): java.lang.String
public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test1(): java.lang.String
compiler/testData/codegen/light-analysis/jvmStatic/companionObject.txt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ public final class A {
public final static class A/Companion {
inner class A/Companion
private method <init>(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method c$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method c$annotations(): void
public final @org.jetbrains.annotations.NotNull method getB(): java.lang.String
public final @org.jetbrains.annotations.NotNull method getC(): java.lang.String
public final @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test1(): java.lang.String
compiler/testData/codegen/light-analysis/jvmStatic/enumCompanion.txt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ public enum class A {
public final static class A/Companion {
inner class A/Companion
private method <init>(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method bar$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method bar$annotations(): void
public final @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method baz(): java.lang.String
public final @org.jetbrains.annotations.NotNull method getBar(): java.lang.String
}
compiler/testData/codegen/light-analysis/jvmStatic/explicitObject.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ public final class AX {
public final @org.jetbrains.annotations.NotNull method aNonStatic(): java.lang.String
public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method aStatic(): java.lang.String
public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method b(): java.lang.String
private synthetic deprecated static @kotlin.jvm.JvmStatic method c$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method c$annotations(): void
public final static @org.jetbrains.annotations.NotNull method getC(): java.lang.String
public final @org.jetbrains.annotations.NotNull method getProperty(): java.lang.String
}
compiler/testData/codegen/light-analysis/jvmStatic/importStaticMemberFromObject.txt
Vendored
+2 -2
View File
@@ -14,7 +14,7 @@ public final static class C/Companion {
private method <init>(): void
public final @kotlin.jvm.JvmStatic method f1(): int
public final method getP1(): int
private synthetic deprecated static @kotlin.jvm.JvmStatic method p1$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method p1$annotations(): void
}
@kotlin.Metadata
@@ -29,5 +29,5 @@ public final class O {
private method <init>(): void
public final static @kotlin.jvm.JvmStatic method f(): int
public final static method getP(): int
private synthetic deprecated static @kotlin.jvm.JvmStatic method p$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method p$annotations(): void
}
compiler/testData/codegen/light-analysis/jvmStatic/kt9897_static.txt
Vendored
+2 -2
View File
@@ -19,6 +19,6 @@ public final class Test {
public final static method setSomeProperty(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): void
public final static method setSomeProperty(p0: long, p1: long): void
public final method setZ(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method someProperty$annotations(p0: java.lang.String): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method someProperty$annotations(p0: long): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method someProperty$annotations(p0: java.lang.String): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method someProperty$annotations(p0: long): void
}
compiler/testData/codegen/light-analysis/jvmStatic/object.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public final class A {
private final static @org.jetbrains.annotations.NotNull field b: java.lang.String
private final static @org.jetbrains.annotations.NotNull field c: java.lang.String
private method <init>(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method c$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method c$annotations(): void
public final @org.jetbrains.annotations.NotNull method getB(): java.lang.String
public final static @org.jetbrains.annotations.NotNull method getC(): java.lang.String
public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test1(): java.lang.String
compiler/testData/codegen/light-analysis/jvmStatic/postfixInc.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public final class A {
private static field b: int
private static field c: int
private method <init>(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method a$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method a$annotations(): void
public final static method getA(): int
public final static @kotlin.jvm.JvmStatic method getB(): int
public final method getC(): int
compiler/testData/codegen/light-analysis/jvmStatic/prefixInc.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public final class A {
private static field b: int
private static field c: int
private method <init>(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method a$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method a$annotations(): void
public final static method getA(): int
public final static @kotlin.jvm.JvmStatic method getB(): int
public final method getC(): int
compiler/testData/codegen/light-analysis/jvmStatic/privateSetter.txt
Vendored
+1 -1
View File
@@ -21,5 +21,5 @@ public final static class TestApp/Companion {
public synthetic final static method access$setValue$p(p0: TestApp.Companion, @org.jetbrains.annotations.NotNull p1: java.lang.String): void
public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String
private final method setValue(p0: java.lang.String): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method value$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method value$annotations(): void
}
compiler/testData/codegen/light-analysis/jvmStatic/propertyAccess.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public final class A {
private static field b: int
private static field c: int
private method <init>(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method a$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method a$annotations(): void
public final static method getA(): int
public final static @kotlin.jvm.JvmStatic method getB(): int
public final method getC(): int
compiler/testData/codegen/light-analysis/jvmStatic/propertyAsDefault.txt
Vendored
+1 -1
View File
@@ -11,5 +11,5 @@ public final class X {
public synthetic static method fn$default(p0: X, p1: java.lang.String, p2: int, p3: java.lang.Object): java.lang.String
public final @org.jetbrains.annotations.NotNull method fn(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
public final static @org.jetbrains.annotations.NotNull method getX(): java.lang.String
private synthetic deprecated static @kotlin.jvm.JvmStatic method x$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method x$annotations(): void
}
compiler/testData/codegen/light-analysis/jvmStatic/simple.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public final class A {
private final static @org.jetbrains.annotations.NotNull field b: java.lang.String
private final static @org.jetbrains.annotations.NotNull field c: java.lang.String
private method <init>(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method c$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method c$annotations(): void
public final @org.jetbrains.annotations.NotNull method getB(): java.lang.String
public final static @org.jetbrains.annotations.NotNull method getC(): java.lang.String
public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test1(): java.lang.String
compiler/testData/codegen/light-analysis/multifileClasses/constPropertyReferenceFromMultifileClass.txt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ public annotation class a/A
@kotlin.Metadata
public final class a/MultifileClass {
public final static @org.jetbrains.annotations.NotNull field OK: java.lang.String
private synthetic deprecated static @a.A method OK$annotations(): void
public synthetic deprecated static @a.A method OK$annotations(): void
}
@kotlin.Metadata
compiler/testData/codegen/light-analysis/properties/twoAnnotatedExtensionPropertiesWithoutBackingFields.txt
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ public annotation class Anno
@kotlin.Metadata
public final class TwoAnnotatedExtensionPropertiesWithoutBackingFieldsKt {
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
private synthetic deprecated static @Anno method foo$annotations(p0: int): void
private synthetic deprecated static @Anno method foo$annotations(p0: java.lang.String): void
public synthetic deprecated static @Anno method foo$annotations(p0: int): void
public synthetic deprecated static @Anno method foo$annotations(p0: java.lang.String): void
public final static method getFoo(@org.jetbrains.annotations.NotNull p0: java.lang.String): int
public final static method getFoo(p0: int): int
}
compiler/testData/codegen/light-analysis/reflection/annotations/propertyWithoutBackingField.txt
Vendored
+1 -1
View File
@@ -8,5 +8,5 @@ public annotation class Ann {
public final class PropertyWithoutBackingFieldKt {
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
public final static @org.jetbrains.annotations.NotNull method getProperty(): java.lang.String
private synthetic deprecated static @Ann method property$annotations(): void
public synthetic deprecated static @Ann method property$annotations(): void
}
compiler/testData/codegen/light-analysis/reflection/annotations/simpleValAnnotation.txt
Vendored
+1 -1
View File
@@ -9,6 +9,6 @@ public annotation class Simple {
public final class SimpleValAnnotationKt {
private final static field foo: int
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
private synthetic deprecated static @Simple method foo$annotations(): void
public synthetic deprecated static @Simple method foo$annotations(): void
public final static method getFoo(): int
}
compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticCompanionObjectPropertyAccessors.txt
Vendored
+4 -4
View File
@@ -23,10 +23,10 @@ public final static class Host/Companion {
public final method getYy(): int
public final method setY(p0: int): void
public final method setYy(p0: int): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method x$annotations(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method xx$annotations(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method y$annotations(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method yy$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method x$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method xx$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method y$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method yy$annotations(): void
}
@kotlin.Metadata
compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticObjectPropertyAccessors.txt
Vendored
+4 -4
View File
@@ -10,10 +10,10 @@ public final class Host {
public final static method getYy(): int
public final static method setY(p0: int): void
public final static method setYy(p0: int): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method x$annotations(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method xx$annotations(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method y$annotations(): void
private synthetic deprecated static @kotlin.jvm.JvmStatic method yy$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method x$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method xx$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method y$annotations(): void
public synthetic deprecated static @kotlin.jvm.JvmStatic method yy$annotations(): void
}
@kotlin.Metadata