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

[FIR] Save declarations in metadata in source order

Browse Source 
^KT-54792 Fixed
^KT-54801
^KT-54800
This commit is contained in:
Dmitriy Novozhilov
2023-04-13 15:11:56 +03:00
committed by Space Team
parent b359a5538c
commit af60681705
128 changed files with 833 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledKotlin/annotations/ClassLiteralArguments.fir.txt → compiler/testData/loadJava/compiledKotlin/annotations/ClassLiteralArguments.fir.k1.txt
Vendored
View File
compiler/testData/loadJava/compiledKotlin/annotations/ClassLiteralArguments.fir.k2.txt
Vendored
+21
View File
@@ -0,0 +1,21 @@
public final annotation class Anno : R|kotlin/Annotation| {
public final val klass: R|kotlin/reflect/KClass<*>|
public get(): R|kotlin/reflect/KClass<*>|
public final val klasses: R|kotlin/Array<kotlin/reflect/KClass<*>>|
public get(): R|kotlin/Array<kotlin/reflect/KClass<*>>|
public final val sarKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|
public get(): R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|
public final val d2arKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|
public get(): R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|
public constructor(klass: R|kotlin/reflect/KClass<*>|, klasses: R|kotlin/Array<kotlin/reflect/KClass<*>>|, sarKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|, d2arKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|): R|test/Anno|
}
@R|test/Anno|(klass = <getClass>(<getClass>(R|kotlin/String|)), klasses = <implicitArrayOf>(<getClass>(<getClass>(R|kotlin/Int|)), <getClass>(<getClass>(R|kotlin/String|)), <getClass>(<getClass>(R|kotlin/Float|))), sarKlass = <getClass>(<getClass>(R|kotlin/String|)), d2arKlass = <getClass>(<getClass>(R|kotlin/DoubleArray|))) public final class Klass : R|kotlin/Any| {
public constructor(): R|test/Klass|
}
compiler/testData/loadJava/compiledKotlin/annotations/PrimitiveArrayArguments.fir.txt → compiler/testData/loadJava/compiledKotlin/annotations/PrimitiveArrayArguments.fir.k1.txt
Vendored
View File
compiler/testData/loadJava/compiledKotlin/annotations/PrimitiveArrayArguments.fir.k2.txt
Vendored
+33
View File
@@ -0,0 +1,33 @@
public final annotation class Anno : R|kotlin/Annotation| {
public final val bytes: R|kotlin/ByteArray|
public get(): R|kotlin/ByteArray|
public final val shorts: R|kotlin/ShortArray|
public get(): R|kotlin/ShortArray|
public final val ints: R|kotlin/IntArray|
public get(): R|kotlin/IntArray|
public final val longs: R|kotlin/LongArray|
public get(): R|kotlin/LongArray|
public final val chars: R|kotlin/CharArray|
public get(): R|kotlin/CharArray|
public final val floats: R|kotlin/FloatArray|
public get(): R|kotlin/FloatArray|
public final val doubles: R|kotlin/DoubleArray|
public get(): R|kotlin/DoubleArray|
public final val booleans: R|kotlin/BooleanArray|
public get(): R|kotlin/BooleanArray|
public constructor(bytes: R|kotlin/ByteArray|, shorts: R|kotlin/ShortArray|, ints: R|kotlin/IntArray|, longs: R|kotlin/LongArray|, chars: R|kotlin/CharArray|, floats: R|kotlin/FloatArray|, doubles: R|kotlin/DoubleArray|, booleans: R|kotlin/BooleanArray|): R|test/Anno|
}
@R|test/Anno|(bytes = <implicitArrayOf>(Byte(42), Byte(-1)), shorts = <implicitArrayOf>(Short(-42), Short(0)), ints = <implicitArrayOf>(Int(42), Int(239)), longs = <implicitArrayOf>(Long(42), Long(239)), chars = <implicitArrayOf>(Char(a), Char(Z)), floats = <implicitArrayOf>(Float(2.72), Float(0.0)), doubles = <implicitArrayOf>(Double(42.0), Double(-3.14)), booleans = <implicitArrayOf>(Boolean(true), Boolean(false))) public final class Klass : R|kotlin/Any| {
public constructor(): R|test/Klass|
}
compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.fir.txt → compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.fir.k1.txt
Vendored
View File
compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.fir.k2.txt
Vendored
+18
View File
@@ -0,0 +1,18 @@
public final annotation class Anno : R|kotlin/Annotation| {
public final val int: R|kotlin/Int|
public get(): R|kotlin/Int|
public final val string: R|kotlin/String|
public get(): R|kotlin/String|
public final val double: R|kotlin/Double|
public get(): R|kotlin/Double|
public constructor(int: R|kotlin/Int|, string: R|kotlin/String|, double: R|kotlin/Double|): R|test/Anno|
}
@R|test/Anno|(int = Int(42), string = String(OK), double = Double(3.14)) public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
}
compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.fir.k2.txt
Vendored
+3 -3
View File
@@ -2,12 +2,12 @@ public final class Class : R|kotlin/Any| {
@PROPERTY:R|test/IntAnno|() public final val R|kotlin/Int|.extension: R|kotlin/Int|
public get(): R|kotlin/Int|
@PROPERTY:R|test/DoubleAnno|() public final val R|kotlin/Double|.extension: R|kotlin/Int|
public get(): R|kotlin/Int|
@PROPERTY:R|test/StringAnno|() public final val R|kotlin/String|.extension: R|kotlin/String|
public get(): R|kotlin/String|
@PROPERTY:R|test/DoubleAnno|() public final val R|kotlin/Double|.extension: R|kotlin/Int|
public get(): R|kotlin/Int|
public constructor(): R|test/Class|
}
compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.txt → compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.k1.txt
Vendored
-1
View File
@@ -38,4 +38,3 @@ public final class Simple : R|kotlin/Any| {
public constructor(): R|test/Simple|
}
compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.k2.txt
Vendored
+40
View File
@@ -0,0 +1,40 @@
public final class A : R|kotlin/Any| {
public final fun simple(s: R|@R|test/Ann|(klass = <getClass>(<getClass>(R|test/Simple|))) kotlin/String|): R|kotlin/Unit|
public final fun generic(s: R|@R|test/Ann|(klass = <getClass>(<getClass>(R|test/Generic|))) kotlin/String|): R|kotlin/Unit|
public final fun innerGeneric(s: R|@R|test/Ann|(klass = <getClass>(<getClass>(R|test/InnerGeneric.Inner|))) kotlin/String|): R|kotlin/Unit|
public final fun arrays(s: R|@R|test/Ann|(klass = <getClass>(<getClass>(R|kotlin/Int|))) kotlin/Array<kotlin/Int>|, t: R|@R|test/Ann|(klass = <getClass>(<getClass>(R|kotlin/IntArray|))) kotlin/Array<kotlin/IntArray>|, u: R|@R|test/Ann|(klass = <getClass>(<getClass>(R|kotlin/Int|))) kotlin/Array<kotlin/Array<kotlin/Int>>|, v: R|@R|test/Ann|(klass = <getClass>(<getClass>(R|kotlin/String|))) kotlin/Array<kotlin/Array<kotlin/Array<kotlin/String>>>|): R|kotlin/Unit|
public constructor(): R|test/A|
}
@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.TYPE|)) public final annotation class Ann : R|kotlin/Annotation| {
public final val klass: R|kotlin/reflect/KClass<*>|
public get(): R|kotlin/reflect/KClass<*>|
public constructor(klass: R|kotlin/reflect/KClass<*>|): R|test/Ann|
}
public final class Generic<T> : R|kotlin/Any| {
public constructor<T>(): R|test/Generic<T>|
}
public final class InnerGeneric<A, B> : R|kotlin/Any| {
public constructor<A, B>(): R|test/InnerGeneric<A, B>|
public final inner class Inner<in C, D : R|A|, A, B> : R|kotlin/Any| {
public test/InnerGeneric<A, B>.constructor<in C, D : R|A|>(): R|test/InnerGeneric.Inner<C, D, A, B>|
}
}
public final class Simple : R|kotlin/Any| {
public constructor(): R|test/Simple|
}
compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k2.txt
Vendored
+4 -4
View File
@@ -15,10 +15,6 @@ public final annotation class B : R|kotlin/Annotation| {
}
public abstract interface I : R|kotlin/Any| {
public abstract var getterAndSetter: R|kotlin/Int|
@R|test/A|(value = String(getter)) public get(): R|kotlin/Int|
@R|test/B|(value = <implicitArrayOf>(String(setter))) public set(value: R|kotlin/Int|): R|kotlin/Unit|
@PROPERTY:R|test/A|(value = String(property)) public abstract var propertyAndGetter: R|kotlin/Int|
@R|test/B|(value = <implicitArrayOf>(String(getter))) public get(): R|kotlin/Int|
public set(value: R|kotlin/Int|): R|kotlin/Unit|
@@ -27,4 +23,8 @@ public abstract interface I : R|kotlin/Any| {
public get(): R|kotlin/Int|
@R|test/B|(value = <implicitArrayOf>(String(setter))) public set(value: R|kotlin/Int|): R|kotlin/Unit|
public abstract var getterAndSetter: R|kotlin/Int|
@R|test/A|(value = String(getter)) public get(): R|kotlin/Int|
@R|test/B|(value = <implicitArrayOf>(String(setter))) public set(value: R|kotlin/Int|): R|kotlin/Unit|
}