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

Do not write old metadata annotations to bytecode

Browse Source
This commit is contained in:
Alexander Udalov
2016-01-26 17:44:37 +03:00
parent ba80e8ba81
commit 5de1cf3bb4
24 changed files with 45 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/bytecodeListing/annotations/JvmSynthetic.txt
Vendored
-1
View File
@@ -1,5 +1,4 @@
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public final class Example {
private field prop2: int
private synthetic final @org.jetbrains.annotations.NotNull field prop: java.lang.String
compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.txt
Vendored
-9
View File
@@ -1,5 +1,4 @@
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public final class A {
private final @AnnField @AnnParameterField @AnnTypeField field a: int
private final @AnnField @AnnTypeField field x: int
@@ -14,53 +13,45 @@ public final class A {
@java.lang.annotation.Retention
@java.lang.annotation.Target
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnField
@kotlin.annotation.Target
@java.lang.annotation.Retention
@java.lang.annotation.Target
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnFieldProperty
@kotlin.annotation.Target
@java.lang.annotation.Retention
@java.lang.annotation.Target
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnParameterField
@kotlin.annotation.Target
@java.lang.annotation.Retention
@java.lang.annotation.Target
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnParameterProperty
@kotlin.annotation.Target
@java.lang.annotation.Retention
@java.lang.annotation.Target
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnProperty
@kotlin.annotation.Target
@java.lang.annotation.Retention
@java.lang.annotation.Target
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnTypeField
@kotlin.annotation.Target
@java.lang.annotation.Retention
@java.lang.annotation.Target
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class Anno
@kotlin.Metadata
@kotlin.jvm.internal.KotlinFileFacade
public final class DefaultTargetsKt {
private final static @Anno field p2: int
static method <clinit>(): void
compiler/testData/codegen/bytecodeListing/annotations/literals.txt
Vendored
-12
View File
@@ -2,26 +2,21 @@
@java.lang.annotation.Retention
@java.lang.annotation.Target
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class ClsAnn
@kotlin.annotation.Target
@java.lang.annotation.Retention
@java.lang.annotation.Target
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class ExprAnn
@kotlin.annotation.Target
@java.lang.annotation.Retention
@java.lang.annotation.Target
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class FunAnn
@kotlin.jvm.internal.KotlinSyntheticClass
@kotlin.Metadata
@kotlin.jvm.internal.KotlinFunction
final class LiteralsKt$foo$1 {
synthetic final field $arg: int
inner class LiteralsKt$foo$1
@@ -30,9 +25,7 @@ final class LiteralsKt$foo$1 {
public synthetic method invoke(): java.lang.Object
}
@kotlin.jvm.internal.KotlinSyntheticClass
@kotlin.Metadata
@kotlin.jvm.internal.KotlinFunction
final class LiteralsKt$foo$2 {
synthetic final field $arg: int
inner class LiteralsKt$foo$2
@@ -43,15 +36,12 @@ final class LiteralsKt$foo$2 {
@ClsAnn
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public final class LiteralsKt$foo$3 {
inner class LiteralsKt$foo$3
method <init>(): void
}
@kotlin.jvm.internal.KotlinSyntheticClass
@kotlin.Metadata
@kotlin.jvm.internal.KotlinFunction
final class LiteralsKt$foo$x$1 {
synthetic final field $arg: int
inner class LiteralsKt$foo$x$1
@@ -61,7 +51,6 @@ final class LiteralsKt$foo$x$1 {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinFileFacade
public final class LiteralsKt {
inner class LiteralsKt$foo$1
inner class LiteralsKt$foo$2
@@ -72,7 +61,6 @@ public final class LiteralsKt {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public class My {
public method <init>(): void
}
compiler/testData/codegen/bytecodeListing/annotations/onProperties.txt
Vendored
-9
View File
@@ -1,5 +1,4 @@
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public final class A {
private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[]
private @AnnField field p: int
@@ -21,41 +20,33 @@ public final class A {
@java.lang.annotation.Retention
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnDelegate
@java.lang.annotation.Retention
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnField
@java.lang.annotation.Retention
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnGetter
@java.lang.annotation.Retention
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnParam
@java.lang.annotation.Retention
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnProp
@java.lang.annotation.Retention
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnProp2
@java.lang.annotation.Retention
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnSetter
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public final class CustomDelegate {
public method <init>(): void
public final @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): java.lang.String
compiler/testData/codegen/bytecodeListing/annotations/onReceiver.txt
Vendored
-3
View File
@@ -1,5 +1,4 @@
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public final class A {
public method <init>(): void
public final @org.jetbrains.annotations.NotNull method f(@Ann p0: java.lang.String): java.lang.String
@@ -8,11 +7,9 @@ public final class A {
@java.lang.annotation.Retention
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class Ann
@kotlin.Metadata
@kotlin.jvm.internal.KotlinFileFacade
public final class OnReceiverKt {
public final static @org.jetbrains.annotations.NotNull method getTopLevelP(@Ann p0: java.lang.String): java.lang.String
public final static @org.jetbrains.annotations.NotNull method topLevelF(@Ann p0: java.lang.String): java.lang.String
compiler/testData/codegen/bytecodeListing/defaultImpls.txt
Vendored
-7
View File
@@ -1,20 +1,16 @@
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class A
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class B {
public abstract method foo(): void
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class C {
public abstract method getBar(): int
}
@kotlin.jvm.internal.KotlinSyntheticClass
@kotlin.Metadata
public final class D$DefaultImpls {
inner class D$DefaultImpls
@@ -22,21 +18,18 @@ public final class D$DefaultImpls {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class D {
inner class D$DefaultImpls
public abstract method baz(): int
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public final class E$InsideE {
inner class E$InsideE
public method <init>(): void
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class E {
inner class E$InsideE
}
compiler/testData/codegen/bytecodeListing/inlineOnly.txt
Vendored
-2
View File
@@ -1,5 +1,4 @@
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public final class Foo {
public method <init>(): void
public final method bar(): void
@@ -8,7 +7,6 @@ public final class Foo {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinFileFacade
public final class InlineOnlyKt {
public final static method bar(): void
private final static method baz(): void
compiler/testData/codegen/bytecodeListing/specialBridges/contains.txt
Vendored
-12
View File
@@ -1,5 +1,4 @@
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class A1 {
public method <init>(): void
public method contains(p0: java.lang.Object): boolean
@@ -12,7 +11,6 @@ public abstract class A1 {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class A2 {
public method <init>(): void
public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean
@@ -27,7 +25,6 @@ public abstract class A2 {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class A3 {
public method <init>(): void
public method contains(p0: java.lang.Object): boolean
@@ -41,7 +38,6 @@ public abstract class A3 {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class A4 {
public method <init>(): void
public method contains(p0: java.lang.Object): boolean
@@ -56,7 +52,6 @@ public abstract class A4 {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class A5 {
public method <init>(): void
public final method contains(p0: java.lang.Object): boolean
@@ -74,7 +69,6 @@ public abstract class A5 {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class A6 {
public method <init>(): void
public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean
@@ -93,7 +87,6 @@ public abstract class A6 {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class A7 {
public method <init>(): void
public method contains(p0: int): boolean
@@ -107,7 +100,6 @@ public abstract class A7 {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class A8 {
public method <init>(): void
public method contains(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
@@ -118,7 +110,6 @@ public abstract class A8 {
public method toArray(p0: java.lang.Object[]): java.lang.Object[]
}
@kotlin.jvm.internal.KotlinSyntheticClass
@kotlin.Metadata
public final class I1$DefaultImpls {
inner class I1$DefaultImpls
@@ -127,7 +118,6 @@ public final class I1$DefaultImpls {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class I1 {
inner class I1$DefaultImpls
public abstract method contains(p0: java.lang.Object): boolean
@@ -136,7 +126,6 @@ public abstract class I1 {
public abstract method toArray(p0: java.lang.Object[]): java.lang.Object[]
}
@kotlin.jvm.internal.KotlinSyntheticClass
@kotlin.Metadata
public final class I2$DefaultImpls {
inner class I2$DefaultImpls
@@ -145,7 +134,6 @@ public final class I2$DefaultImpls {
}
@kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class I2 {
inner class I2$DefaultImpls
public abstract method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean