From 390eda1b9dfb9e24a6a890aa74abeb7221333d38 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Thu, 15 Jul 2021 10:53:58 +0200 Subject: [PATCH] Fix CompileKotlinAgainstCustomBinariesTest tests --- .../output14.txt | 1 + .../library/lib.kt | 202 ------------------ .../output.txt | 10 - .../source.kt | 194 ----------------- .../requireKotlin/output.txt | 24 +-- .../requireKotlinInNestedClasses/output.txt | 4 +- .../library/a.kt | 12 -- .../output.txt | 7 - .../source.kt | 5 - .../output.txt | 4 +- .../requireKotlinInNestedClassesJs/output.txt | 4 +- .../output.txt | 10 +- .../wrongInlineTarget/warningsOnly_1_3.kt | 18 -- .../wrongInlineTarget/warningsOnly_1_3.txt | 20 -- .../ant/jvm/languageVersion/main.kt | 8 +- .../CompileKotlinAgainstCustomBinariesTest.kt | 46 +--- 16 files changed, 33 insertions(+), 536 deletions(-) delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/library/lib.kt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/output.txt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/source.kt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/library/a.kt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/output.txt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/source.kt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.kt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.txt diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output14.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output14.txt index d86bac9de59..856bf234263 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output14.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output14.txt @@ -1 +1,2 @@ +warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/library/lib.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/library/lib.kt deleted file mode 100644 index c0655a02f05..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/library/lib.kt +++ /dev/null @@ -1,202 +0,0 @@ -inline class ICString(val a: String) -inline class ICStringNullable(val a: String?) -inline class ICAny(val a: Any) -inline class ICAnyNullable(val a: Any?) -inline class ICInt(val a: Int) -inline class ICIntNullable(val a: Int?) - -fun ordinaryNoninlineReturnsICString(): ICString = ICString("") -fun ordinaryNoninlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("") -fun ordinaryNoninlineReturnsICAny(): ICAny = ICAny("") -fun ordinaryNoninlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("") -fun ordinaryNoninlineReturnsICInt(): ICInt = ICInt(0) -fun ordinaryNoninlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0) -fun ordinaryNoninlineReturnsICString_Null(): ICString? = null -fun ordinaryNoninlineReturnsICStringNullable_Null(): ICStringNullable? = null -fun ordinaryNoninlineReturnsICAny_Null(): ICAny? = null -fun ordinaryNoninlineReturnsICAnyNullable_Null(): ICAnyNullable? = null -fun ordinaryNoninlineReturnsICInt_Null(): ICInt? = null -fun ordinaryNoninlineReturnsICIntNullable_Null(): ICIntNullable? = null -fun ordinaryNoninlineAcceptsICString(i: Int, ic: ICString) {} -fun ordinaryNoninlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {} -fun ordinaryNoninlineAcceptsICAny(i: Int, ic: ICAny) {} -fun ordinaryNoninlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {} -fun ordinaryNoninlineAcceptsICInt(i: Int, ic: ICInt) {} -fun ordinaryNoninlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {} -fun ordinaryNoninlineAcceptsICString_Null(i: Int, ic: ICString?) {} -fun ordinaryNoninlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {} -fun ordinaryNoninlineAcceptsICAny_Null(i: Int, ic: ICAny?) {} -fun ordinaryNoninlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {} -fun ordinaryNoninlineAcceptsICInt_Null(i: Int, ic: ICInt?) {} -fun ordinaryNoninlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {} -inline fun ordinaryInlineReturnsICString(): ICString = ICString("") -inline fun ordinaryInlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("") -inline fun ordinaryInlineReturnsICAny(): ICAny = ICAny("") -inline fun ordinaryInlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("") -inline fun ordinaryInlineReturnsICInt(): ICInt = ICInt(0) -inline fun ordinaryInlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0) -inline fun ordinaryInlineReturnsICString_Null(): ICString? = null -inline fun ordinaryInlineReturnsICStringNullable_Null(): ICStringNullable? = null -inline fun ordinaryInlineReturnsICAny_Null(): ICAny? = null -inline fun ordinaryInlineReturnsICAnyNullable_Null(): ICAnyNullable? = null -inline fun ordinaryInlineReturnsICInt_Null(): ICInt? = null -inline fun ordinaryInlineReturnsICIntNullable_Null(): ICIntNullable? = null -inline fun ordinaryInlineAcceptsICString(i: Int, ic: ICString) {} -inline fun ordinaryInlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {} -inline fun ordinaryInlineAcceptsICAny(i: Int, ic: ICAny) {} -inline fun ordinaryInlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {} -inline fun ordinaryInlineAcceptsICInt(i: Int, ic: ICInt) {} -inline fun ordinaryInlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {} -inline fun ordinaryInlineAcceptsICString_Null(i: Int, ic: ICString?) {} -inline fun ordinaryInlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {} -inline fun ordinaryInlineAcceptsICAny_Null(i: Int, ic: ICAny?) {} -inline fun ordinaryInlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {} -inline fun ordinaryInlineAcceptsICInt_Null(i: Int, ic: ICInt?) {} -inline fun ordinaryInlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {} -suspend fun suspendNoninlineReturnsICString(): ICString = ICString("") -suspend fun suspendNoninlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("") -suspend fun suspendNoninlineReturnsICAny(): ICAny = ICAny("") -suspend fun suspendNoninlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("") -suspend fun suspendNoninlineReturnsICInt(): ICInt = ICInt(0) -suspend fun suspendNoninlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0) -suspend fun suspendNoninlineReturnsICString_Null(): ICString? = null -suspend fun suspendNoninlineReturnsICStringNullable_Null(): ICStringNullable? = null -suspend fun suspendNoninlineReturnsICAny_Null(): ICAny? = null -suspend fun suspendNoninlineReturnsICAnyNullable_Null(): ICAnyNullable? = null -suspend fun suspendNoninlineReturnsICInt_Null(): ICInt? = null -suspend fun suspendNoninlineReturnsICIntNullable_Null(): ICIntNullable? = null -suspend fun suspendNoninlineAcceptsICString(i: Int, ic: ICString) {} -suspend fun suspendNoninlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {} -suspend fun suspendNoninlineAcceptsICAny(i: Int, ic: ICAny) {} -suspend fun suspendNoninlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {} -suspend fun suspendNoninlineAcceptsICInt(i: Int, ic: ICInt) {} -suspend fun suspendNoninlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {} -suspend fun suspendNoninlineAcceptsICString_Null(i: Int, ic: ICString?) {} -suspend fun suspendNoninlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {} -suspend fun suspendNoninlineAcceptsICAny_Null(i: Int, ic: ICAny?) {} -suspend fun suspendNoninlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {} -suspend fun suspendNoninlineAcceptsICInt_Null(i: Int, ic: ICInt?) {} -suspend fun suspendNoninlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {} -suspend inline fun suspendInlineReturnsICString(): ICString = ICString("") -suspend inline fun suspendInlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("") -suspend inline fun suspendInlineReturnsICAny(): ICAny = ICAny("") -suspend inline fun suspendInlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("") -suspend inline fun suspendInlineReturnsICInt(): ICInt = ICInt(0) -suspend inline fun suspendInlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0) -suspend inline fun suspendInlineReturnsICString_Null(): ICString? = null -suspend inline fun suspendInlineReturnsICStringNullable_Null(): ICStringNullable? = null -suspend inline fun suspendInlineReturnsICAny_Null(): ICAny? = null -suspend inline fun suspendInlineReturnsICAnyNullable_Null(): ICAnyNullable? = null -suspend inline fun suspendInlineReturnsICInt_Null(): ICInt? = null -suspend inline fun suspendInlineReturnsICIntNullable_Null(): ICIntNullable? = null -suspend inline fun suspendInlineAcceptsICString(i: Int, ic: ICString) {} -suspend inline fun suspendInlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {} -suspend inline fun suspendInlineAcceptsICAny(i: Int, ic: ICAny) {} -suspend inline fun suspendInlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {} -suspend inline fun suspendInlineAcceptsICInt(i: Int, ic: ICInt) {} -suspend inline fun suspendInlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {} -suspend inline fun suspendInlineAcceptsICString_Null(i: Int, ic: ICString?) {} -suspend inline fun suspendInlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {} -suspend inline fun suspendInlineAcceptsICAny_Null(i: Int, ic: ICAny?) {} -suspend inline fun suspendInlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {} -suspend inline fun suspendInlineAcceptsICInt_Null(i: Int, ic: ICInt?) {} -suspend inline fun suspendInlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {} - -class C { - fun ordinaryNoninlineReturnsICString(): ICString = ICString("") - fun ordinaryNoninlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("") - fun ordinaryNoninlineReturnsICAny(): ICAny = ICAny("") - fun ordinaryNoninlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("") - fun ordinaryNoninlineReturnsICInt(): ICInt = ICInt(0) - fun ordinaryNoninlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0) - fun ordinaryNoninlineReturnsICString_Null(): ICString? = null - fun ordinaryNoninlineReturnsICStringNullable_Null(): ICStringNullable? = null - fun ordinaryNoninlineReturnsICAny_Null(): ICAny? = null - fun ordinaryNoninlineReturnsICAnyNullable_Null(): ICAnyNullable? = null - fun ordinaryNoninlineReturnsICInt_Null(): ICInt? = null - fun ordinaryNoninlineReturnsICIntNullable_Null(): ICIntNullable? = null - fun ordinaryNoninlineAcceptsICString(i: Int, ic: ICString) {} - fun ordinaryNoninlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {} - fun ordinaryNoninlineAcceptsICAny(i: Int, ic: ICAny) {} - fun ordinaryNoninlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {} - fun ordinaryNoninlineAcceptsICInt(i: Int, ic: ICInt) {} - fun ordinaryNoninlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {} - fun ordinaryNoninlineAcceptsICString_Null(i: Int, ic: ICString?) {} - fun ordinaryNoninlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {} - fun ordinaryNoninlineAcceptsICAny_Null(i: Int, ic: ICAny?) {} - fun ordinaryNoninlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {} - fun ordinaryNoninlineAcceptsICInt_Null(i: Int, ic: ICInt?) {} - fun ordinaryNoninlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {} - inline fun ordinaryInlineReturnsICString(): ICString = ICString("") - inline fun ordinaryInlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("") - inline fun ordinaryInlineReturnsICAny(): ICAny = ICAny("") - inline fun ordinaryInlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("") - inline fun ordinaryInlineReturnsICInt(): ICInt = ICInt(0) - inline fun ordinaryInlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0) - inline fun ordinaryInlineReturnsICString_Null(): ICString? = null - inline fun ordinaryInlineReturnsICStringNullable_Null(): ICStringNullable? = null - inline fun ordinaryInlineReturnsICAny_Null(): ICAny? = null - inline fun ordinaryInlineReturnsICAnyNullable_Null(): ICAnyNullable? = null - inline fun ordinaryInlineReturnsICInt_Null(): ICInt? = null - inline fun ordinaryInlineReturnsICIntNullable_Null(): ICIntNullable? = null - inline fun ordinaryInlineAcceptsICString(i: Int, ic: ICString) {} - inline fun ordinaryInlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {} - inline fun ordinaryInlineAcceptsICAny(i: Int, ic: ICAny) {} - inline fun ordinaryInlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {} - inline fun ordinaryInlineAcceptsICInt(i: Int, ic: ICInt) {} - inline fun ordinaryInlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {} - inline fun ordinaryInlineAcceptsICString_Null(i: Int, ic: ICString?) {} - inline fun ordinaryInlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {} - inline fun ordinaryInlineAcceptsICAny_Null(i: Int, ic: ICAny?) {} - inline fun ordinaryInlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {} - inline fun ordinaryInlineAcceptsICInt_Null(i: Int, ic: ICInt?) {} - inline fun ordinaryInlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {} - suspend fun suspendNoninlineReturnsICString(): ICString = ICString("") - suspend fun suspendNoninlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("") - suspend fun suspendNoninlineReturnsICAny(): ICAny = ICAny("") - suspend fun suspendNoninlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("") - suspend fun suspendNoninlineReturnsICInt(): ICInt = ICInt(0) - suspend fun suspendNoninlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0) - suspend fun suspendNoninlineReturnsICString_Null(): ICString? = null - suspend fun suspendNoninlineReturnsICStringNullable_Null(): ICStringNullable? = null - suspend fun suspendNoninlineReturnsICAny_Null(): ICAny? = null - suspend fun suspendNoninlineReturnsICAnyNullable_Null(): ICAnyNullable? = null - suspend fun suspendNoninlineReturnsICInt_Null(): ICInt? = null - suspend fun suspendNoninlineReturnsICIntNullable_Null(): ICIntNullable? = null - suspend fun suspendNoninlineAcceptsICString(i: Int, ic: ICString) {} - suspend fun suspendNoninlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {} - suspend fun suspendNoninlineAcceptsICAny(i: Int, ic: ICAny) {} - suspend fun suspendNoninlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {} - suspend fun suspendNoninlineAcceptsICInt(i: Int, ic: ICInt) {} - suspend fun suspendNoninlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {} - suspend fun suspendNoninlineAcceptsICString_Null(i: Int, ic: ICString?) {} - suspend fun suspendNoninlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {} - suspend fun suspendNoninlineAcceptsICAny_Null(i: Int, ic: ICAny?) {} - suspend fun suspendNoninlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {} - suspend fun suspendNoninlineAcceptsICInt_Null(i: Int, ic: ICInt?) {} - suspend fun suspendNoninlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {} - suspend inline fun suspendInlineReturnsICString(): ICString = ICString("") - suspend inline fun suspendInlineReturnsICStringNullable(): ICStringNullable = ICStringNullable("") - suspend inline fun suspendInlineReturnsICAny(): ICAny = ICAny("") - suspend inline fun suspendInlineReturnsICAnyNullable(): ICAnyNullable = ICAnyNullable("") - suspend inline fun suspendInlineReturnsICInt(): ICInt = ICInt(0) - suspend inline fun suspendInlineReturnsICIntNullable(): ICIntNullable = ICIntNullable(0) - suspend inline fun suspendInlineReturnsICString_Null(): ICString? = null - suspend inline fun suspendInlineReturnsICStringNullable_Null(): ICStringNullable? = null - suspend inline fun suspendInlineReturnsICAny_Null(): ICAny? = null - suspend inline fun suspendInlineReturnsICAnyNullable_Null(): ICAnyNullable? = null - suspend inline fun suspendInlineReturnsICInt_Null(): ICInt? = null - suspend inline fun suspendInlineReturnsICIntNullable_Null(): ICIntNullable? = null - suspend inline fun suspendInlineAcceptsICString(i: Int, ic: ICString) {} - suspend inline fun suspendInlineAcceptsICStringNullable(i: Int, ic: ICStringNullable) {} - suspend inline fun suspendInlineAcceptsICAny(i: Int, ic: ICAny) {} - suspend inline fun suspendInlineAcceptsICAnyNullable(i: Int, ic: ICAnyNullable) {} - suspend inline fun suspendInlineAcceptsICInt(i: Int, ic: ICInt) {} - suspend inline fun suspendInlineAcceptsICIntNullable(i: Int, ic: ICIntNullable) {} - suspend inline fun suspendInlineAcceptsICString_Null(i: Int, ic: ICString?) {} - suspend inline fun suspendInlineAcceptsICStringNullable_Null(i: Int, ic: ICStringNullable?) {} - suspend inline fun suspendInlineAcceptsICAny_Null(i: Int, ic: ICAny?) {} - suspend inline fun suspendInlineAcceptsICAnyNullable_Null(i: Int, ic: ICAnyNullable?) {} - suspend inline fun suspendInlineAcceptsICInt_Null(i: Int, ic: ICInt?) {} - suspend inline fun suspendInlineAcceptsICIntNullable_Null(i: Int, ic: ICIntNullable?) {} -} \ No newline at end of file diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/output.txt deleted file mode 100644 index 53fc69e8ebb..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/output.txt +++ /dev/null @@ -1,10 +0,0 @@ -warning: ATTENTION! -This build uses unsafe internal compiler arguments: - --XXLanguage:-MangleClassMembersReturningInlineClasses - -This mode is not recommended for production use, -as no stability/compatibility guarantees are given on -compiler or generated code. Use it at your own risk! - -OK diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/source.kt deleted file mode 100644 index 1c6a1ff1f7d..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/inlineClassesManglingAgainstLV13/source.kt +++ /dev/null @@ -1,194 +0,0 @@ -suspend fun main() { - ordinaryNoninlineReturnsICString() - ordinaryNoninlineReturnsICStringNullable() - ordinaryNoninlineReturnsICAny() - ordinaryNoninlineReturnsICAnyNullable() - ordinaryNoninlineReturnsICInt() - ordinaryNoninlineReturnsICIntNullable() - ordinaryNoninlineReturnsICString_Null() - ordinaryNoninlineReturnsICStringNullable_Null() - ordinaryNoninlineReturnsICAny_Null() - ordinaryNoninlineReturnsICAnyNullable_Null() - ordinaryNoninlineReturnsICInt_Null() - ordinaryNoninlineReturnsICIntNullable_Null() - ordinaryNoninlineAcceptsICString(1, ICString("")) - ordinaryNoninlineAcceptsICStringNullable(1, ICStringNullable("")) - ordinaryNoninlineAcceptsICAny(1, ICAny("")) - ordinaryNoninlineAcceptsICAnyNullable(1, ICAnyNullable("")) - ordinaryNoninlineAcceptsICInt(1, ICInt(0)) - ordinaryNoninlineAcceptsICIntNullable(1, ICIntNullable(0)) - ordinaryNoninlineAcceptsICString_Null(1, null) - ordinaryNoninlineAcceptsICStringNullable_Null(1, null) - ordinaryNoninlineAcceptsICAny_Null(1, null) - ordinaryNoninlineAcceptsICAnyNullable_Null(1, null) - ordinaryNoninlineAcceptsICInt_Null(1, null) - ordinaryNoninlineAcceptsICIntNullable_Null(1, null) - ordinaryInlineReturnsICString() - ordinaryInlineReturnsICStringNullable() - ordinaryInlineReturnsICAny() - ordinaryInlineReturnsICAnyNullable() - ordinaryInlineReturnsICInt() - ordinaryInlineReturnsICIntNullable() - ordinaryInlineReturnsICString_Null() - ordinaryInlineReturnsICStringNullable_Null() - ordinaryInlineReturnsICAny_Null() - ordinaryInlineReturnsICAnyNullable_Null() - ordinaryInlineReturnsICInt_Null() - ordinaryInlineReturnsICIntNullable_Null() - ordinaryInlineAcceptsICString(1, ICString("")) - ordinaryInlineAcceptsICStringNullable(1, ICStringNullable("")) - ordinaryInlineAcceptsICAny(1, ICAny("")) - ordinaryInlineAcceptsICAnyNullable(1, ICAnyNullable("")) - ordinaryInlineAcceptsICInt(1, ICInt(0)) - ordinaryInlineAcceptsICIntNullable(1, ICIntNullable(0)) - ordinaryInlineAcceptsICString_Null(1, null) - ordinaryInlineAcceptsICStringNullable_Null(1, null) - ordinaryInlineAcceptsICAny_Null(1, null) - ordinaryInlineAcceptsICAnyNullable_Null(1, null) - ordinaryInlineAcceptsICInt_Null(1, null) - ordinaryInlineAcceptsICIntNullable_Null(1, null) - suspendNoninlineReturnsICString() - suspendNoninlineReturnsICStringNullable() - suspendNoninlineReturnsICAny() - suspendNoninlineReturnsICAnyNullable() - suspendNoninlineReturnsICInt() - suspendNoninlineReturnsICIntNullable() - suspendNoninlineReturnsICString_Null() - suspendNoninlineReturnsICStringNullable_Null() - suspendNoninlineReturnsICAny_Null() - suspendNoninlineReturnsICAnyNullable_Null() - suspendNoninlineReturnsICInt_Null() - suspendNoninlineReturnsICIntNullable_Null() - suspendNoninlineAcceptsICString(1, ICString("")) - suspendNoninlineAcceptsICStringNullable(1, ICStringNullable("")) - suspendNoninlineAcceptsICAny(1, ICAny("")) - suspendNoninlineAcceptsICAnyNullable(1, ICAnyNullable("")) - suspendNoninlineAcceptsICInt(1, ICInt(0)) - suspendNoninlineAcceptsICIntNullable(1, ICIntNullable(0)) - suspendNoninlineAcceptsICString_Null(1, null) - suspendNoninlineAcceptsICStringNullable_Null(1, null) - suspendNoninlineAcceptsICAny_Null(1, null) - suspendNoninlineAcceptsICAnyNullable_Null(1, null) - suspendNoninlineAcceptsICInt_Null(1, null) - suspendNoninlineAcceptsICIntNullable_Null(1, null) - suspendInlineReturnsICString() - suspendInlineReturnsICStringNullable() - suspendInlineReturnsICAny() - suspendInlineReturnsICAnyNullable() - suspendInlineReturnsICInt() - suspendInlineReturnsICIntNullable() - suspendInlineReturnsICString_Null() - suspendInlineReturnsICStringNullable_Null() - suspendInlineReturnsICAny_Null() - suspendInlineReturnsICAnyNullable_Null() - suspendInlineReturnsICInt_Null() - suspendInlineReturnsICIntNullable_Null() - suspendInlineAcceptsICString(1, ICString("")) - suspendInlineAcceptsICStringNullable(1, ICStringNullable("")) - suspendInlineAcceptsICAny(1, ICAny("")) - suspendInlineAcceptsICAnyNullable(1, ICAnyNullable("")) - suspendInlineAcceptsICInt(1, ICInt(0)) - suspendInlineAcceptsICIntNullable(1, ICIntNullable(0)) - suspendInlineAcceptsICString_Null(1, null) - suspendInlineAcceptsICStringNullable_Null(1, null) - suspendInlineAcceptsICAny_Null(1, null) - suspendInlineAcceptsICAnyNullable_Null(1, null) - suspendInlineAcceptsICInt_Null(1, null) - suspendInlineAcceptsICIntNullable_Null(1, null) - C().ordinaryNoninlineReturnsICString() - C().ordinaryNoninlineReturnsICStringNullable() - C().ordinaryNoninlineReturnsICAny() - C().ordinaryNoninlineReturnsICAnyNullable() - C().ordinaryNoninlineReturnsICInt() - C().ordinaryNoninlineReturnsICIntNullable() - C().ordinaryNoninlineReturnsICString_Null() - C().ordinaryNoninlineReturnsICStringNullable_Null() - C().ordinaryNoninlineReturnsICAny_Null() - C().ordinaryNoninlineReturnsICAnyNullable_Null() - C().ordinaryNoninlineReturnsICInt_Null() - C().ordinaryNoninlineReturnsICIntNullable_Null() - C().ordinaryNoninlineAcceptsICString(1, ICString("")) - C().ordinaryNoninlineAcceptsICStringNullable(1, ICStringNullable("")) - C().ordinaryNoninlineAcceptsICAny(1, ICAny("")) - C().ordinaryNoninlineAcceptsICAnyNullable(1, ICAnyNullable("")) - C().ordinaryNoninlineAcceptsICInt(1, ICInt(0)) - C().ordinaryNoninlineAcceptsICIntNullable(1, ICIntNullable(0)) - C().ordinaryNoninlineAcceptsICString_Null(1, null) - C().ordinaryNoninlineAcceptsICStringNullable_Null(1, null) - C().ordinaryNoninlineAcceptsICAny_Null(1, null) - C().ordinaryNoninlineAcceptsICAnyNullable_Null(1, null) - C().ordinaryNoninlineAcceptsICInt_Null(1, null) - C().ordinaryNoninlineAcceptsICIntNullable_Null(1, null) - C().ordinaryInlineReturnsICString() - C().ordinaryInlineReturnsICStringNullable() - C().ordinaryInlineReturnsICAny() - C().ordinaryInlineReturnsICAnyNullable() - C().ordinaryInlineReturnsICInt() - C().ordinaryInlineReturnsICIntNullable() - C().ordinaryInlineReturnsICString_Null() - C().ordinaryInlineReturnsICStringNullable_Null() - C().ordinaryInlineReturnsICAny_Null() - C().ordinaryInlineReturnsICAnyNullable_Null() - C().ordinaryInlineReturnsICInt_Null() - C().ordinaryInlineReturnsICIntNullable_Null() - C().ordinaryInlineAcceptsICString(1, ICString("")) - C().ordinaryInlineAcceptsICStringNullable(1, ICStringNullable("")) - C().ordinaryInlineAcceptsICAny(1, ICAny("")) - C().ordinaryInlineAcceptsICAnyNullable(1, ICAnyNullable("")) - C().ordinaryInlineAcceptsICInt(1, ICInt(0)) - C().ordinaryInlineAcceptsICIntNullable(1, ICIntNullable(0)) - C().ordinaryInlineAcceptsICString_Null(1, null) - C().ordinaryInlineAcceptsICStringNullable_Null(1, null) - C().ordinaryInlineAcceptsICAny_Null(1, null) - C().ordinaryInlineAcceptsICAnyNullable_Null(1, null) - C().ordinaryInlineAcceptsICInt_Null(1, null) - C().ordinaryInlineAcceptsICIntNullable_Null(1, null) - C().suspendNoninlineReturnsICString() - C().suspendNoninlineReturnsICStringNullable() - C().suspendNoninlineReturnsICAny() - C().suspendNoninlineReturnsICAnyNullable() - C().suspendNoninlineReturnsICInt() - C().suspendNoninlineReturnsICIntNullable() - C().suspendNoninlineReturnsICString_Null() - C().suspendNoninlineReturnsICStringNullable_Null() - C().suspendNoninlineReturnsICAny_Null() - C().suspendNoninlineReturnsICAnyNullable_Null() - C().suspendNoninlineReturnsICInt_Null() - C().suspendNoninlineReturnsICIntNullable_Null() - C().suspendNoninlineAcceptsICString(1, ICString("")) - C().suspendNoninlineAcceptsICStringNullable(1, ICStringNullable("")) - C().suspendNoninlineAcceptsICAny(1, ICAny("")) - C().suspendNoninlineAcceptsICAnyNullable(1, ICAnyNullable("")) - C().suspendNoninlineAcceptsICInt(1, ICInt(0)) - C().suspendNoninlineAcceptsICIntNullable(1, ICIntNullable(0)) - C().suspendNoninlineAcceptsICString_Null(1, null) - C().suspendNoninlineAcceptsICStringNullable_Null(1, null) - C().suspendNoninlineAcceptsICAny_Null(1, null) - C().suspendNoninlineAcceptsICAnyNullable_Null(1, null) - C().suspendNoninlineAcceptsICInt_Null(1, null) - C().suspendNoninlineAcceptsICIntNullable_Null(1, null) - C().suspendInlineReturnsICString() - C().suspendInlineReturnsICStringNullable() - C().suspendInlineReturnsICAny() - C().suspendInlineReturnsICAnyNullable() - C().suspendInlineReturnsICInt() - C().suspendInlineReturnsICIntNullable() - C().suspendInlineReturnsICString_Null() - C().suspendInlineReturnsICStringNullable_Null() - C().suspendInlineReturnsICAny_Null() - C().suspendInlineReturnsICAnyNullable_Null() - C().suspendInlineReturnsICInt_Null() - C().suspendInlineReturnsICIntNullable_Null() - C().suspendInlineAcceptsICString(1, ICString("")) - C().suspendInlineAcceptsICStringNullable(1, ICStringNullable("")) - C().suspendInlineAcceptsICAny(1, ICAny("")) - C().suspendInlineAcceptsICAnyNullable(1, ICAnyNullable("")) - C().suspendInlineAcceptsICInt(1, ICInt(0)) - C().suspendInlineAcceptsICIntNullable(1, ICIntNullable(0)) - C().suspendInlineAcceptsICString_Null(1, null) - C().suspendInlineAcceptsICStringNullable_Null(1, null) - C().suspendInlineAcceptsICAny_Null(1, null) - C().suspendInlineAcceptsICAnyNullable_Null(1, null) - C().suspendInlineAcceptsICInt_Null(1, null) - C().suspendInlineAcceptsICIntNullable_Null(1, null) -} \ No newline at end of file diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/output.txt index f71f823905f..48b5bbe1983 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/output.txt @@ -1,37 +1,37 @@ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:13: error: 'A' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.5. This declaration is only supported since Kotlin 42.33 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:13: error: 'A' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.6. This declaration is only supported since Kotlin 42.33 fun test(a: A): TA { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:13: error: 'A' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:13: error: 'A' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.6 fun test(a: A): TA { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:13: error: 'A' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:13: error: 'A' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.6 fun test(a: A): TA { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:17: error: 'typealias TA = String' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.5. This declaration is only supported since Kotlin 42.33 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:17: error: 'typealias TA = String' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.6. This declaration is only supported since Kotlin 42.33 fun test(a: A): TA { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:17: error: 'typealias TA = String' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:17: error: 'typealias TA = String' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.6 fun test(a: A): TA { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:17: error: 'typealias TA = String' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:17: error: 'typealias TA = String' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.6 fun test(a: A): TA { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:4:5: error: 'f(): Unit' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.5. This declaration is only supported since Kotlin 42.33 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:4:5: error: 'f(): Unit' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.6. This declaration is only supported since Kotlin 42.33 f() ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:4:5: error: 'f(): Unit' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:4:5: error: 'f(): Unit' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.6 f() ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:4:5: error: 'f(): Unit' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:4:5: error: 'f(): Unit' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.6 f() ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:5:12: error: 'p: String' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.5. This declaration is only supported since Kotlin 42.33 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:5:12: error: 'p: String' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.6. This declaration is only supported since Kotlin 42.33 return p ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:5:12: error: 'p: String' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:5:12: error: 'p: String' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.6 return p ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:5:12: error: 'p: String' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:5:12: error: 'p: String' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.6 return p ^ COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/output.txt index 5d188de16f8..570d92fa0f0 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/output.txt @@ -1,7 +1,7 @@ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.6 fun test(a: Outer.Nested) { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.6 a.f() ^ COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/library/a.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/library/a.kt deleted file mode 100644 index ec17d72359e..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/library/a.kt +++ /dev/null @@ -1,12 +0,0 @@ -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -package a - -import kotlin.internal.RequireKotlin - -class Outer { - @RequireKotlin("1.44") - class Nested { - @RequireKotlin("1.88") - fun f() {} - } -} diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/output.txt deleted file mode 100644 index 94d31bbf20d..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/output.txt +++ /dev/null @@ -1,7 +0,0 @@ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.5 -fun test(a: Outer.Nested) { - ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.5 - a.f() - ^ -COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/source.kt deleted file mode 100644 index 850b632de23..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst13/source.kt +++ /dev/null @@ -1,5 +0,0 @@ -import a.Outer - -fun test(a: Outer.Nested) { - a.f() -} diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/output.txt index 38b553628f6..ef29e66b492 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/output.txt @@ -1,7 +1,7 @@ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.6 fun test(a: Outer.Nested) { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.6 a.f() ^ COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/output.txt index d234abc4811..86eccb127d5 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/output.txt @@ -1,7 +1,7 @@ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.6 fun test(a: Outer.Nested) { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.5 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.6 a.f() ^ COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/output.txt index 516d02f626e..83015d120cb 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/output.txt @@ -1,6 +1,6 @@ error: incompatible classes were found in dependencies. Remove them from the classpath or use '-Xskip-metadata-version-check' to suppress errors -$TMP_DIR$/library.jar!/META-INF/main.kotlin_module: error: module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.6.0, expected version is $ABI_VERSION$. -compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:3:13: error: class 'a.C' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.6.0, expected version is $ABI_VERSION$. +$TMP_DIR$/library.jar!/META-INF/main.kotlin_module: error: module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.7.0, expected version is $ABI_VERSION$. +compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:3:13: error: class 'a.C' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.7.0, expected version is $ABI_VERSION$. The class is loaded from $TMP_DIR$/library.jar!/a/C.class fun test(c: C) { ^ @@ -10,15 +10,15 @@ compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemant compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:5:5: error: unresolved reference: v v ^ -compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:6:5: error: class 'a.C' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.6.0, expected version is $ABI_VERSION$. +compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:6:5: error: class 'a.C' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.7.0, expected version is $ABI_VERSION$. The class is loaded from $TMP_DIR$/library.jar!/a/C.class c.let { C() } ^ -compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:6:7: error: class 'a.C' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.6.0, expected version is $ABI_VERSION$. +compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:6:7: error: class 'a.C' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.7.0, expected version is $ABI_VERSION$. The class is loaded from $TMP_DIR$/library.jar!/a/C.class c.let { C() } ^ -compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:6:13: error: class 'a.C' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.6.0, expected version is $ABI_VERSION$. +compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:6:13: error: class 'a.C' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.7.0, expected version is $ABI_VERSION$. The class is loaded from $TMP_DIR$/library.jar!/a/C.class c.let { C() } ^ diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.kt deleted file mode 100644 index 9e4210d8bd2..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.kt +++ /dev/null @@ -1,18 +0,0 @@ -package usage - -import a.* - -class Derived : Base() { - - fun test() { - inlineFunBase {} - inlineGetterBase - inlineGetterBase = 1 - - inlineSetterBase - inlineSetterBase = 1 - - allInlineBase - allInlineBase = 1 - } -} diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.txt deleted file mode 100644 index 410b9f229b7..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.txt +++ /dev/null @@ -1,20 +0,0 @@ -warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.kt:8:9: warning: cannot inline bytecode built with JVM target 11 into bytecode that is being built with JVM target 1.8. Please specify proper '-jvm-target' option - inlineFunBase {} - ^ -compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.kt:9:9: warning: cannot inline bytecode built with JVM target 11 into bytecode that is being built with JVM target 1.8. Please specify proper '-jvm-target' option - inlineGetterBase - ^ -compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.kt:10:9: warning: cannot inline bytecode built with JVM target 11 into bytecode that is being built with JVM target 1.8. Please specify proper '-jvm-target' option - inlineGetterBase = 1 - ^ -compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.kt:13:9: warning: cannot inline bytecode built with JVM target 11 into bytecode that is being built with JVM target 1.8. Please specify proper '-jvm-target' option - inlineSetterBase = 1 - ^ -compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.kt:15:9: warning: cannot inline bytecode built with JVM target 11 into bytecode that is being built with JVM target 1.8. Please specify proper '-jvm-target' option - allInlineBase - ^ -compiler/testData/compileKotlinAgainstCustomBinaries/wrongInlineTarget/warningsOnly_1_3.kt:16:9: warning: cannot inline bytecode built with JVM target 11 into bytecode that is being built with JVM target 1.8. Please specify proper '-jvm-target' option - allInlineBase = 1 - ^ -OK diff --git a/compiler/testData/integration/ant/jvm/languageVersion/main.kt b/compiler/testData/integration/ant/jvm/languageVersion/main.kt index 51b3d3b4bdd..dd4ae569e3d 100644 --- a/compiler/testData/integration/ant/jvm/languageVersion/main.kt +++ b/compiler/testData/integration/ant/jvm/languageVersion/main.kt @@ -1,7 +1 @@ -fun test() { - while (true) { - when { - true -> break - } - } -} +sealead interface Test \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt index c417879f652..3b123428cfd 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt @@ -386,21 +386,6 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration compileKotlin("source.kt", File(tmpdir, "usage.js"), listOf(compileJsLibrary("library")), K2JSCompiler()) } - fun testRequireKotlinInNestedClassesAgainst13() { - val library = compileLibrary( - "library", - additionalOptions = listOf("-language-version", "1.3"), - checkKotlinOutput = { actual -> - assertEquals( - normalizeOutput( - "warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin\n" to ExitCode.OK - ), actual - ) - } - ) - compileKotlin("source.kt", tmpdir, listOf(library)) - } - fun testRequireKotlinInNestedClassesAgainst14Js() { val library = compileJsLibrary("library", additionalOptions = listOf("-Xmetadata-version=1.4.0")) compileKotlin( @@ -549,12 +534,6 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration val library = compileLibrary("library", additionalOptions = listOf("-jvm-target", "11")) compileKotlin("source.kt", tmpdir, listOf(library), additionalOptions = listOf("-jvm-target", "1.8")) - - compileKotlin( - "warningsOnly_1_3.kt", tmpdir, listOf(library), - additionalOptions = listOf("-language-version", "1.3"), - expectedFileName = "warningsOnly_1_3.txt" - ) } fun testInlineFunctionsWithMatchingJvmSignatures() { @@ -725,22 +704,6 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration ) } - fun testInlineClassesManglingAgainstLV13() { - val library = compileLibrary( - "library", - additionalOptions = listOf("-language-version", "1.3", "-Xinline-classes"), - checkKotlinOutput = {} - ) - compileKotlin( - "source.kt", - tmpdir, - listOf(library), - additionalOptions = listOf("-XXLanguage:-MangleClassMembersReturningInlineClasses", "-Xinline-classes") - ) - // Difference in mangling becomes apparent only on load time as NSME, so, to check the mangling we need to load the classfile - loadClassFile("SourceKt", tmpdir, library) - } - fun testAnonymousObjectTypeMetadata() { val library = compileCommonLibrary( libraryName = "library", @@ -770,7 +733,14 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration fun testActualTypealiasToCompiledInlineClass() { val library14 = compileLibrary( "library14", - additionalOptions = listOf("-language-version", "1.4") + additionalOptions = listOf("-language-version", "1.4"), + checkKotlinOutput = { result -> + KotlinTestUtils.assertEqualsToFile( + "Expected output check failed", + File(testDataDirectory, "output14.txt"), + result + ) + } ) val library15 = compileLibrary( "library15",