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

Do not write version requirements for InlineClasses

Browse Source 
Language feature InlineClasses is enabled since 1.3. The current lowest
supported language version is 1.4, so any compiler that can read
binaries produced by the current compiler also supports inline classes,
which means that the version requirement is not needed anymore.

No issue reported because it's mostly not a user-visible change. The
main effect is that it reduces differences in metadata between K1 and
K2, because K2 never supported writing this version requirement properly
due to the TODO in `hasInlineClassTypesInSignature`.
This commit is contained in:
Alexander Udalov
2023-07-27 12:17:23 +02:00
committed by Space Team
parent 9e50a3b71d
commit afd35accd8
8 changed files with 7 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlinp/testData/Annotations.txt
Vendored
-9
View File
@@ -2,7 +2,6 @@
// ------------------------------------------
public final annotation class A : kotlin/Annotation {
// requires language version 1.3.0 (level=ERROR)
// signature: <init>(ZCBSIFJDLkotlin/UInt;Lkotlin/UByte;Lkotlin/UShort;Lkotlin/ULong;Lkotlin/UInt;Lkotlin/UByte;Lkotlin/UShort;Lkotlin/ULong;[Z[C[B[S[I[F[J[DLjava/lang/String;Lkotlin/annotation/AnnotationTarget;Lkotlin/reflect/KClass;Lkotlin/reflect/KClass;LB;Lkotlin/Array;Lkotlin/Array;Lkotlin/Array;Lkotlin/Array;)V
public constructor(z: kotlin/Boolean, c: kotlin/Char, b: kotlin/Byte, s: kotlin/Short, i: kotlin/Int, f: kotlin/Float, j: kotlin/Long, d: kotlin/Double, ui: kotlin/UInt, ub: kotlin/UByte, us: kotlin/UShort, ul: kotlin/ULong, ui_max: kotlin/UInt, ub_max: kotlin/UByte, us_max: kotlin/UShort, ul_max: kotlin/ULong, za: kotlin/BooleanArray, ca: kotlin/CharArray, ba: kotlin/ByteArray, sa: kotlin/ShortArray, ia: kotlin/IntArray, fa: kotlin/FloatArray, ja: kotlin/LongArray, da: kotlin/DoubleArray, str: kotlin/String, enum: kotlin/annotation/AnnotationTarget, klass: kotlin/reflect/KClass<*>, klass2: kotlin/reflect/KClass<*>, anno: B, stra: kotlin/Array<kotlin/String>, ka: kotlin/Array<kotlin/reflect/KClass<*>>, ea: kotlin/Array<kotlin/annotation/AnnotationTarget>, aa: kotlin/Array<B>)
@@ -98,56 +97,48 @@ public final annotation class A : kotlin/Annotation {
public final val stra: kotlin/Array<kotlin/String>
public final get
// requires language version 1.3.0 (level=ERROR)
// requires compiler version 1.4.30 (level=ERROR)
// requires language version 1.4.0 (level=ERROR)
// getter: ub()B
public final val ub: kotlin/UByte
public final get
// requires language version 1.3.0 (level=ERROR)
// requires compiler version 1.4.30 (level=ERROR)
// requires language version 1.4.0 (level=ERROR)
// getter: ub_max()B
public final val ub_max: kotlin/UByte
public final get
// requires language version 1.3.0 (level=ERROR)
// requires compiler version 1.4.30 (level=ERROR)
// requires language version 1.4.0 (level=ERROR)
// getter: ui()I
public final val ui: kotlin/UInt
public final get
// requires language version 1.3.0 (level=ERROR)
// requires compiler version 1.4.30 (level=ERROR)
// requires language version 1.4.0 (level=ERROR)
// getter: ui_max()I
public final val ui_max: kotlin/UInt
public final get
// requires language version 1.3.0 (level=ERROR)
// requires compiler version 1.4.30 (level=ERROR)
// requires language version 1.4.0 (level=ERROR)
// getter: ul()J
public final val ul: kotlin/ULong
public final get
// requires language version 1.3.0 (level=ERROR)
// requires compiler version 1.4.30 (level=ERROR)
// requires language version 1.4.0 (level=ERROR)
// getter: ul_max()J
public final val ul_max: kotlin/ULong
public final get
// requires language version 1.3.0 (level=ERROR)
// requires compiler version 1.4.30 (level=ERROR)
// requires language version 1.4.0 (level=ERROR)
// getter: us()S
public final val us: kotlin/UShort
public final get
// requires language version 1.3.0 (level=ERROR)
// requires compiler version 1.4.30 (level=ERROR)
// requires language version 1.4.0 (level=ERROR)
// getter: us_max()S
libraries/tools/kotlinp/testData/ValueClass.txt
Vendored
-6
View File
@@ -1,9 +1,7 @@
// A.class
// ------------------------------------------
// requires language version 1.3.0 (level=ERROR)
public final value class A : kotlin/Any {
// requires language version 1.3.0 (level=ERROR)
// signature: constructor-impl(Ljava/lang/Integer;)Ljava/lang/Integer;
public constructor(i: kotlin/Int?)
@@ -28,10 +26,8 @@ public final value class A : kotlin/Any {
}
// B.class
// ------------------------------------------
// requires language version 1.3.0 (level=ERROR)
public final value class B : kotlin/Any {
// requires language version 1.3.0 (level=ERROR)
// requires language version 1.3.0 (level=ERROR)
// signature: constructor-impl(Lkotlin/jvm/functions/Function1;)Lkotlin/jvm/functions/Function1;
public constructor(f: suspend kotlin/Function1<kotlin/coroutines/Continuation<kotlin/Unit>, kotlin/Any?>)
@@ -58,10 +54,8 @@ public final value class B : kotlin/Any {
}
// Z.class
// ------------------------------------------
// requires language version 1.3.0 (level=ERROR)
public final value class Z : kotlin/Any {
// requires language version 1.3.0 (level=ERROR)
// signature: constructor-impl(Ljava/lang/String;)Ljava/lang/String;
public constructor(s: kotlin/String)