From 5075484c8e52fe73b4f29d862c3c5730f9b9d149 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 22 Jan 2021 16:10:05 +0300 Subject: [PATCH] [TD] Update directives in kotlinAgainstKotlin testdata --- .../compileKotlinAgainstKotlin/annotationInInterface.kt | 3 +++ .../compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt | 5 ++++- .../callsToMultifileClassFromOtherPackage.kt | 2 ++ .../constPropertyReferenceFromMultifileClass.kt | 3 +++ .../box/compileKotlinAgainstKotlin/copySamOnInline.kt | 4 +++- .../box/compileKotlinAgainstKotlin/copySamOnInline2.kt | 4 +++- .../box/compileKotlinAgainstKotlin/coroutinesBinary.kt | 2 +- .../defaultLambdaRegeneration.kt | 2 ++ .../defaultLambdaRegeneration2.kt | 2 ++ .../fir/IncrementalCompilerRunner.kt | 4 ++-- .../fir/IrConstAcceptMultiModule.kt | 2 +- .../box/compileKotlinAgainstKotlin/fir/LibraryProperty.kt | 4 ++-- .../inlineClassFromBinaryDependencies.kt | 4 +++- .../compileKotlinAgainstKotlin/inlineClassesOldMangling.kt | 3 ++- .../box/compileKotlinAgainstKotlin/inlinedConstants.kt | 2 ++ .../jvm8/defaults/allCompatibility/callStackTrace.kt | 2 ++ .../jvm8/defaults/interop/likeMemberClash.kt | 5 +++-- .../jvm8/defaults/interop/likeSpecialization.kt | 5 +++-- .../jvm8/defaults/interop/newAndOldSchemes.kt | 5 ++++- .../jvm8/defaults/interop/newAndOldSchemes2.kt | 7 +++++-- .../defaults/interop/newAndOldSchemes2Compatibility.kt | 7 +++++-- .../jvm8/defaults/interop/newAndOldSchemes3.kt | 7 +++++-- .../jvm8/defaults/interop/newSchemeWithJvmDefault.kt | 5 +++-- .../jvm8/jvm8against6/delegation/diamond.kt | 2 +- .../jvm8/jvm8against6/delegation/diamond2.kt | 2 +- .../jvm8/jvm8against6/delegation/diamond3.kt | 2 +- .../jvm8/jvm8against6/jdk8Against6.kt | 2 +- .../jvm8/jvm8against6/simpleCall.kt | 2 +- .../jvm8/jvm8against6/simpleCallWithBigHierarchy.kt | 2 +- .../jvm8/jvm8against6/simpleCallWithHierarchy.kt | 2 +- .../jvm8/jvm8against6/simpleProp.kt | 2 +- .../jvm8/jvm8against6/simplePropWithHierarchy.kt | 2 +- .../codegen/box/compileKotlinAgainstKotlin/jvmField.kt | 2 ++ .../compileKotlinAgainstKotlin/jvmFieldInConstructor.kt | 2 ++ .../codegen/box/compileKotlinAgainstKotlin/jvmNames.kt | 3 +++ .../box/compileKotlinAgainstKotlin/jvmPackageName.kt | 2 ++ .../jvmPackageNameInRootPackage.kt | 2 ++ .../jvmPackageNameWithJvmName.kt | 2 ++ .../box/compileKotlinAgainstKotlin/jvmStaticInObject.kt | 2 ++ .../box/compileKotlinAgainstKotlin/kt14012_multi.kt | 2 ++ .../metadataForMembersInLocalClassInInitializer.kt | 3 +++ .../multifileClassInlineFunctionAccessingProperty.kt | 2 ++ .../multifileClassWithTypealias.kt | 2 ++ .../box/compileKotlinAgainstKotlin/optionalAnnotation.kt | 2 ++ .../box/compileKotlinAgainstKotlin/recursiveGeneric.kt | 2 ++ .../suspendFunWithDefaultMangling.kt | 3 ++- .../box/compileKotlinAgainstKotlin/targetedJvmName.kt | 4 +++- .../unsignedTypesInAnnotations.kt | 5 +++-- 48 files changed, 110 insertions(+), 37 deletions(-) diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationInInterface.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationInInterface.kt index 94a6808ed6f..3fa31f3de8b 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationInInterface.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationInInterface.kt @@ -1,5 +1,8 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM +// WITH_STDLIB +// WITH_REFLECT + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt index 90bfdbe1100..6d64ff59d17 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt @@ -1,5 +1,7 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt package a @@ -16,6 +18,7 @@ annotation class Ann(val x: Int) typealias TA = Any // MODULE: main(lib) +// FULL_JDK // FILE: B.kt import a.Ann @@ -29,4 +32,4 @@ fun box(): String { Class.forName("a.AKt").assertHasDeclaredMethodWithAnn() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/callsToMultifileClassFromOtherPackage.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/callsToMultifileClassFromOtherPackage.kt index e622dfd36fe..1b3eac8023e 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/callsToMultifileClassFromOtherPackage.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/callsToMultifileClassFromOtherPackage.kt @@ -1,4 +1,6 @@ // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/constPropertyReferenceFromMultifileClass.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/constPropertyReferenceFromMultifileClass.kt index 5866a12d5c0..4c563da79ec 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/constPropertyReferenceFromMultifileClass.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/constPropertyReferenceFromMultifileClass.kt @@ -1,4 +1,7 @@ // TARGET_BACKEND: JVM +// WITH_STDLIB +// WITH_REFLECT + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/copySamOnInline.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/copySamOnInline.kt index c421c033181..20b52506eda 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/copySamOnInline.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/copySamOnInline.kt @@ -1,7 +1,9 @@ // IGNORE_BACKEND_FIR: JVM_IR +// FULL_JDK +// WITH_STDLIB + // MODULE: lib // FILE: A.kt -// FULL_JDK package test diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/copySamOnInline2.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/copySamOnInline2.kt index 88d8b8be0c5..06b19f700ab 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/copySamOnInline2.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/copySamOnInline2.kt @@ -1,7 +1,9 @@ // IGNORE_BACKEND_FIR: JVM_IR +// FULL_JDK +// WITH_STDLIB + // MODULE: lib // FILE: A.kt -// FULL_JDK package test diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/coroutinesBinary.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/coroutinesBinary.kt index 01afa8c36e2..a79b8d5a986 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/coroutinesBinary.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/coroutinesBinary.kt @@ -1,7 +1,7 @@ // MODULE: lib -// FILE: A.kt // WITH_RUNTIME // WITH_COROUTINES +// FILE: A.kt package a import kotlin.coroutines.* diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultLambdaRegeneration.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultLambdaRegeneration.kt index 855d294061a..c792b0c31b8 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultLambdaRegeneration.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultLambdaRegeneration.kt @@ -1,5 +1,7 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultLambdaRegeneration2.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultLambdaRegeneration2.kt index f76903c5270..42c2c35939f 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultLambdaRegeneration2.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultLambdaRegeneration2.kt @@ -1,5 +1,7 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IncrementalCompilerRunner.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IncrementalCompilerRunner.kt index 9541f39e550..313ce7389c1 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IncrementalCompilerRunner.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IncrementalCompilerRunner.kt @@ -1,7 +1,7 @@ // TARGET_BACKEND: JVM // MODULE: lib -// FILE: A.kt // WITH_RUNTIME +// FILE: A.kt abstract class IncrementalCompilerRunner( private val workingDir: String, @@ -23,4 +23,4 @@ class IncrementalJsCompilerRunner( fun box(): String { val runner = IncrementalJsCompilerRunner(workingDir = "OK", fail = false) return runner.res() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IrConstAcceptMultiModule.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IrConstAcceptMultiModule.kt index 9f4328a072a..e7e1c121860 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IrConstAcceptMultiModule.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IrConstAcceptMultiModule.kt @@ -1,8 +1,8 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // MODULE: lib -// FILE: A.kt // WITH_RUNTIME +// FILE: A.kt abstract class IrConst : IrExpression(), IrExpressionWithCopy { abstract val kind: IrConstKind diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/LibraryProperty.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/LibraryProperty.kt index 01d185907f4..4a56db00e82 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/LibraryProperty.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/LibraryProperty.kt @@ -1,7 +1,7 @@ // TARGET_BACKEND: JVM // MODULE: lib -// FILE: A.kt // WITH_RUNTIME +// FILE: A.kt package first.second @@ -20,4 +20,4 @@ fun foo() = hasAnnotation(VOLATILE_ANNOTATION_FQ_NAME) fun hasAnnotation(name: FqName): Boolean = true -fun box() = if (foo()) "OK" else "FAIL" \ No newline at end of file +fun box() = if (foo()) "OK" else "FAIL" diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassFromBinaryDependencies.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassFromBinaryDependencies.kt index 8b8b4402739..effae59f82e 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassFromBinaryDependencies.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassFromBinaryDependencies.kt @@ -1,4 +1,6 @@ // !LANGUAGE: +InlineClasses +// WITH_STDLIB + // MODULE: lib // FILE: A.kt package z @@ -37,4 +39,4 @@ fun box(): String { test(Z(1234)) test(Z.z(1234)) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt index dce8093f7d6..30060eb0e33 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt @@ -1,9 +1,10 @@ // IGNORE_BACKEND_FIR: JVM_IR // !LANGUAGE: +InlineClasses +// WITH_STDLIB // MODULE: lib -// FILE: 1.kt // KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME +// FILE: 1.kt package test inline class IC(val s: String) diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlinedConstants.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlinedConstants.kt index 6006cf90d31..29ea554b454 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlinedConstants.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlinedConstants.kt @@ -1,5 +1,7 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/callStackTrace.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/callStackTrace.kt index 7d9805e8a2f..7f636a0cc30 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/callStackTrace.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/callStackTrace.kt @@ -1,6 +1,8 @@ // !JVM_DEFAULT_MODE: all-compatibility // JVM_TARGET: 1.8 // FULL_JDK +// WITH_STDLIB + // MODULE: lib // FILE: 1.kt interface KInterface { diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/likeMemberClash.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/likeMemberClash.kt index 50e602c6ced..f588ba0652d 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/likeMemberClash.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/likeMemberClash.kt @@ -1,8 +1,8 @@ // IGNORE_BACKEND_FIR: JVM_IR // FULL_JDK // MODULE: lib -// FILE: 1.kt // !JVM_DEFAULT_MODE: disable +// FILE: 1.kt interface Check { fun test(): String { return "fail"; @@ -18,9 +18,10 @@ interface SubCheck : Check { open class CheckClass : Check -// FILE: main.kt +// MODULE: main(lib) // !JVM_DEFAULT_MODE: all // JVM_TARGET: 1.8 +// FILE: main.kt class SubCheckClass : CheckClass(), SubCheck fun box(): String { diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/likeSpecialization.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/likeSpecialization.kt index e134ed9befb..b09c5375f82 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/likeSpecialization.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/likeSpecialization.kt @@ -2,8 +2,8 @@ // WITH_RUNTIME // JVM_TARGET: 1.8 // MODULE: lib -// FILE: 1.kt // !JVM_DEFAULT_MODE: disable +// FILE: 1.kt interface Foo { fun test(p: T) = p @@ -13,8 +13,9 @@ interface Foo { interface FooDerived: Foo -// FILE: main.kt +// MODULE: main(lib) // !JVM_DEFAULT_MODE: all-compatibility +// FILE: main.kt open class UnspecializedFromDerived : FooDerived fun box(): String { diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes.kt index e2a32d16bb9..95dbddab51b 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes.kt @@ -1,5 +1,7 @@ // IGNORE_BACKEND_FIR: JVM_IR // FULL_JDK +// WITH_STDLIB + // MODULE: lib // FILE: 1.kt interface KInterface { @@ -10,9 +12,10 @@ interface KInterface { fun superCall() = Thread.currentThread().getStackTrace().map { it.className + "." + it.methodName } } -// FILE: main.kt +// MODULE: main(lib) // !JVM_DEFAULT_MODE: all-compatibility // JVM_TARGET: 1.8 +// FILE: main.kt interface KInterface2 : KInterface { override fun superCall() = super.superCall() } diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes2.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes2.kt index a7388ae0220..2e4c94ce732 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes2.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes2.kt @@ -1,6 +1,8 @@ +// WITH_STDLIB + // MODULE: lib -// FILE: 1.kt // !JVM_DEFAULT_MODE: disable +// FILE: 1.kt interface Foo { fun test(p: T) = "fail" @@ -8,9 +10,10 @@ interface Foo { get() = "fail" } -// FILE: main.kt +// MODULE: main(lib) // !JVM_DEFAULT_MODE: all // JVM_TARGET: 1.8 +// FILE: main.kt interface Foo2: Foo { override fun test(p: String) = p diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes2Compatibility.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes2Compatibility.kt index 4570cd01716..e04176190ac 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes2Compatibility.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes2Compatibility.kt @@ -1,6 +1,8 @@ +// WITH_STDLIB + // MODULE: lib -// FILE: 1.kt // !JVM_DEFAULT_MODE: disable +// FILE: 1.kt interface Foo { fun test(p: T) = "fail" @@ -8,9 +10,10 @@ interface Foo { get() = "fail" } -// FILE: main.kt +// MODULE: main(lib) // !JVM_DEFAULT_MODE: all-compatibility // JVM_TARGET: 1.8 +// FILE: main.kt interface Foo2: Foo { override fun test(p: String) : String = p diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt index de4b454c1b4..a24dfbe03fd 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt @@ -1,17 +1,20 @@ // IGNORE_BACKEND_FIR: JVM_IR // FULL_JDK +// WITH_STDLIB + // MODULE: lib -// FILE: 1.kt // !JVM_DEFAULT_MODE: disable +// FILE: 1.kt interface KInterface { fun call(): List { return Thread.currentThread().getStackTrace().map { it.className + "." + it.methodName } } } -// FILE: main.kt +// MODULE: main(lib) // !JVM_DEFAULT_MODE: all // JVM_TARGET: 1.8 +// FILE: main.kt interface KInterface2 : KInterface { } diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt index a900a5dc95f..bfba673831e 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt @@ -3,8 +3,8 @@ // WITH_RUNTIME // JVM_TARGET: 1.8 // MODULE: lib -// FILE: 1.kt // !JVM_DEFAULT_MODE: enable +// FILE: 1.kt interface KInterface { @JvmDefault fun call(): List { @@ -14,8 +14,9 @@ interface KInterface { fun superCall() = Thread.currentThread().getStackTrace().map { it.className + "." + it.methodName } } -// FILE: main.kt +// MODULE: main(lib) // !JVM_DEFAULT_MODE: all +// FILE: main.kt interface KInterface2 : KInterface { override fun superCall() = super.superCall() } diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt index 74ba37d1395..d7fdbc19216 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt @@ -8,9 +8,9 @@ interface Test { } // MODULE: main(lib) -// FILE: 2.kt // JVM_TARGET: 1.8 // WITH_RUNTIME +// FILE: 2.kt interface Test2 : Test { @JvmDefault override fun test(): String { diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt index 4cea8c7f1a9..e3e7073effc 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt @@ -8,9 +8,9 @@ interface Test { } // MODULE: main(lib) -// FILE: 2.kt // JVM_TARGET: 1.8 // WITH_RUNTIME +// FILE: 2.kt open class TestClass : Test { override fun test(): String { return super.test() diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt index 6669b00a515..3840ffc72b6 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt @@ -8,9 +8,9 @@ interface Test { } // MODULE: main(lib) -// FILE: 2.kt // JVM_TARGET: 1.8 // WITH_RUNTIME +// FILE: 2.kt abstract class TestClass : Test { abstract override fun test(): String } diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/jdk8Against6.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/jdk8Against6.kt index 9822d3d939e..ea875801559 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/jdk8Against6.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/jdk8Against6.kt @@ -13,8 +13,8 @@ class Jdk6List : AbstractList() { } // MODULE: main(lib) -// FILE: B.kt // FULL_JDK +// FILE: B.kt fun box(): String { val result = Jdk6List().stream().filter { it == "OK" }.count() diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCall.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCall.kt index 648b73ff1a2..c3cb58b5d95 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCall.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCall.kt @@ -8,8 +8,8 @@ interface Test { } // MODULE: main(lib) -// FILE: 2.kt // JVM_TARGET: 1.8 +// FILE: 2.kt class TestClass : Test { override fun test(): String { return super.test() diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt index 922e7c8db84..4e1d2e5790e 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt @@ -8,9 +8,9 @@ interface Test { } // MODULE: main(lib) -// FILE: 2.kt // JVM_TARGET: 1.8 // WITH_RUNTIME +// FILE: 2.kt interface Test2 : Test { @JvmDefault override fun test(): String { diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt index 10ac0f6aa20..e6efeea1e54 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt @@ -9,9 +9,9 @@ interface Test { } // MODULE: main(lib) -// FILE: 2.kt // JVM_TARGET: 1.8 // WITH_RUNTIME +// FILE: 2.kt interface Test2 : Test { @JvmDefault override fun test(): String { diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleProp.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleProp.kt index d6ee34ed0d4..17c1d1183dc 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleProp.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleProp.kt @@ -7,8 +7,8 @@ interface Test { } // MODULE: main(lib) -// FILE: 2.kt // JVM_TARGET: 1.8 +// FILE: 2.kt class TestClass : Test { override val test: String get() = super.test diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt index d21666d1576..037829a113b 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt @@ -8,9 +8,9 @@ interface Test { } // MODULE: main(lib) -// FILE: 2.kt // JVM_TARGET: 1.8 // WITH_RUNTIME +// FILE: 2.kt interface Test2 : Test { @JvmDefault override val test: String diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmField.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmField.kt index f637755a3e5..1cb3e188a32 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmField.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmField.kt @@ -1,5 +1,7 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmFieldInConstructor.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmFieldInConstructor.kt index af8f67504c5..6d299d677f5 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmFieldInConstructor.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmFieldInConstructor.kt @@ -1,5 +1,7 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmNames.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmNames.kt index 9c02a1c8591..f6e9815858a 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmNames.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmNames.kt @@ -1,5 +1,8 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM +// WITH_STDLIB +// WITH_REFLECT + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageName.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageName.kt index a723278ffee..77b05692b11 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageName.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageName.kt @@ -1,5 +1,7 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt index 2d17da5d850..99bb9a443a9 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt @@ -1,5 +1,7 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt index 6e1955c7fb7..0fbd87621b3 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt @@ -1,6 +1,8 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // MODULE: lib +// WITH_STDLIB + // FILE: A.kt @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmStaticInObject.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmStaticInObject.kt index c063e0c6ed8..ba1db15ee7a 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmStaticInObject.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmStaticInObject.kt @@ -1,4 +1,6 @@ // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/kt14012_multi.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/kt14012_multi.kt index f6f29e06ef4..93ff37f8daf 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/kt14012_multi.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/kt14012_multi.kt @@ -1,4 +1,6 @@ // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt @file:JvmName("TTest") diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/metadataForMembersInLocalClassInInitializer.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/metadataForMembersInLocalClassInInitializer.kt index f0d6ad2df0b..3ed9664d4c8 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/metadataForMembersInLocalClassInInitializer.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/metadataForMembersInLocalClassInInitializer.kt @@ -1,5 +1,8 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM +// WITH_STDLIB +// WITH_REFLECT + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/multifileClassInlineFunctionAccessingProperty.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/multifileClassInlineFunctionAccessingProperty.kt index 452bc04360e..e5f4cd71792 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/multifileClassInlineFunctionAccessingProperty.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/multifileClassInlineFunctionAccessingProperty.kt @@ -1,4 +1,6 @@ // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/multifileClassWithTypealias.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/multifileClassWithTypealias.kt index 4b989490827..4cb6085da7f 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/multifileClassWithTypealias.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/multifileClassWithTypealias.kt @@ -1,4 +1,6 @@ // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/optionalAnnotation.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/optionalAnnotation.kt index 724f7e0f9ed..a91d6325f44 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/optionalAnnotation.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/optionalAnnotation.kt @@ -3,6 +3,8 @@ // !USE_EXPERIMENTAL: kotlin.ExperimentalMultiplatform // TARGET_BACKEND: JVM // FULL_JDK +// WITH_STDLIB + // MODULE: lib // FILE: A.kt package a diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/recursiveGeneric.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/recursiveGeneric.kt index 51c4be90afa..948af9ada40 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/recursiveGeneric.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/recursiveGeneric.kt @@ -1,5 +1,7 @@ // IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM +// WITH_STDLIB +// FULL_JDK // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt index 3a367377714..a58fa376dbf 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt @@ -1,6 +1,6 @@ // IGNORE_BACKEND_FIR: JVM_IR // !LANGUAGE: +InlineClasses -// WITH_COROUTINES +// WITH_STDLIB // MODULE: lib // FILE: a.kt @@ -16,6 +16,7 @@ suspend fun foo(p: P = P("OK")) { } // MODULE: main(lib) +// WITH_COROUTINES // FILE: b.kt import kotlin.coroutines.* diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/targetedJvmName.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/targetedJvmName.kt index 453e0fbd3d5..1da13150cb6 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/targetedJvmName.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/targetedJvmName.kt @@ -1,4 +1,6 @@ // TARGET_BACKEND: JVM +// WITH_STDLIB + // MODULE: lib // FILE: A.kt package lib @@ -14,4 +16,4 @@ import lib.* fun box(): String { foo = "OK" return foo -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt index 0b8f41f648b..017f51009de 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt @@ -1,6 +1,8 @@ // IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: NATIVE // WITH_RUNTIME +// WITH_STDLIB +// WITH_REFLECT // MODULE: lib // FILE: A.kt @@ -21,7 +23,6 @@ object ForTest { // MODULE: main(lib) // FILE: B.kt - fun box(): String { val fResult = (ForTest::f.annotations.first() as Anno).u // force annotation deserialization if (fResult != 0u) return "Fail" @@ -32,4 +33,4 @@ fun box(): String { if (ONE_UINT != 1u) return "Fail" return "OK" -} \ No newline at end of file +}