From 8c7f659a3253d66cca1e4c55291da44955057470 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 8 Dec 2021 15:38:33 +0300 Subject: [PATCH] Black box: drop WITH_RUNTIME or replace with WITH_STDLIB --- .../codegen/box/annotations/instances/multimoduleCreation.kt | 2 +- .../funInterfaceConstructor/funInterfaceConstructorThrowsNpe.kt | 2 +- compiler/testData/codegen/box/checkcastOptimization/kt47851a.kt | 1 - compiler/testData/codegen/box/constructorCall/kt49615.kt | 2 +- compiler/testData/codegen/box/constructorCall/kt49615a.kt | 2 +- .../box/controlStructures/forInArray/forPrimitiveIntArray.kt | 2 -- compiler/testData/codegen/box/extensionClasses/constructors.kt | 2 +- .../testData/codegen/box/extensionClasses/genericCollection.kt | 2 +- .../contextReceivers/fromKEEP/decimateEveryEvenThird.kt | 2 +- .../box/extensionFunctions/contextReceivers/fromKEEP/dp.kt | 2 +- .../extensionFunctions/contextReceivers/fromKEEP/monoidSum.kt | 2 +- .../contextReceivers/fromKEEP/structuredConcurrency.kt | 2 +- .../box/extensionFunctions/contextReceivers/plusAssign.kt | 2 +- .../box/extensionFunctions/contextReceivers/plusMatrix.kt | 2 +- .../contextReceivers/useFromAnotherModuleSuspending.kt | 2 +- .../defaults/noDefaultImpls/withCompatibility/defaultArgs.kt | 2 +- .../defaults/noDefaultImpls/withCompatibility/differentCases.kt | 2 +- .../noDefaultImpls/withCompatibility/javaInheritance.kt | 2 +- .../noDefaultImpls/withCompatibility/propertyAnnotation.kt | 2 +- .../jvm8/defaults/noDefaultImpls/withCompatibility/simple.kt | 2 +- compiler/testData/codegen/box/jvmName/fakeOverrideOfProperty.kt | 2 +- compiler/testData/codegen/box/vararg/kt10926.kt | 2 +- 22 files changed, 20 insertions(+), 23 deletions(-) diff --git a/compiler/testData/codegen/box/annotations/instances/multimoduleCreation.kt b/compiler/testData/codegen/box/annotations/instances/multimoduleCreation.kt index 0a02e0f1ecb..fa30742db61 100644 --- a/compiler/testData/codegen/box/annotations/instances/multimoduleCreation.kt +++ b/compiler/testData/codegen/box/annotations/instances/multimoduleCreation.kt @@ -3,7 +3,7 @@ // Please specify value for 'A.kClass' explicitly // TARGET_BACKEND: JVM_IR // IGNORE_DEXING -// WITH_RUNTIME +// WITH_STDLIB // !LANGUAGE: +InstantiationOfAnnotationClasses // MODULE: lib diff --git a/compiler/testData/codegen/box/callableReference/funInterfaceConstructor/funInterfaceConstructorThrowsNpe.kt b/compiler/testData/codegen/box/callableReference/funInterfaceConstructor/funInterfaceConstructorThrowsNpe.kt index ae226ec7e9b..8b83aefb6d5 100644 --- a/compiler/testData/codegen/box/callableReference/funInterfaceConstructor/funInterfaceConstructorThrowsNpe.kt +++ b/compiler/testData/codegen/box/callableReference/funInterfaceConstructor/funInterfaceConstructorThrowsNpe.kt @@ -1,6 +1,6 @@ // !LANGUAGE: +KotlinFunInterfaceConstructorReference -// WITH_RUNTIME +// WITH_STDLIB // TARGET_BACKEND: JVM // DONT_TARGET_EXACT_BACKEND: JVM diff --git a/compiler/testData/codegen/box/checkcastOptimization/kt47851a.kt b/compiler/testData/codegen/box/checkcastOptimization/kt47851a.kt index 40ad8f553f4..70c789c18b4 100644 --- a/compiler/testData/codegen/box/checkcastOptimization/kt47851a.kt +++ b/compiler/testData/codegen/box/checkcastOptimization/kt47851a.kt @@ -1,7 +1,6 @@ // TARGET_BACKEND: JVM // IGNORE_BACKEND_FIR: JVM_IR // FIR status: result.getMethod OK in FE1.0, unresolved in FIR -// WITH_RUNTIME // FULL_JDK val defaultStringConverter = fun(s: String): Any { diff --git a/compiler/testData/codegen/box/constructorCall/kt49615.kt b/compiler/testData/codegen/box/constructorCall/kt49615.kt index e49e55c6821..0591cb1d403 100644 --- a/compiler/testData/codegen/box/constructorCall/kt49615.kt +++ b/compiler/testData/codegen/box/constructorCall/kt49615.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM -// WITH_RUNTIME +// WITH_STDLIB fun builder(c: suspend () -> Unit): Int = 42 diff --git a/compiler/testData/codegen/box/constructorCall/kt49615a.kt b/compiler/testData/codegen/box/constructorCall/kt49615a.kt index 44235702cd4..ef9371d1493 100644 --- a/compiler/testData/codegen/box/constructorCall/kt49615a.kt +++ b/compiler/testData/codegen/box/constructorCall/kt49615a.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM -// WITH_RUNTIME +// WITH_STDLIB @JvmInline value class IC(val s: String) diff --git a/compiler/testData/codegen/box/controlStructures/forInArray/forPrimitiveIntArray.kt b/compiler/testData/codegen/box/controlStructures/forInArray/forPrimitiveIntArray.kt index c8961816097..2bd7a121cd9 100644 --- a/compiler/testData/codegen/box/controlStructures/forInArray/forPrimitiveIntArray.kt +++ b/compiler/testData/codegen/box/controlStructures/forInArray/forPrimitiveIntArray.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun box(): String { val a = IntArray(5) var sum = 0 diff --git a/compiler/testData/codegen/box/extensionClasses/constructors.kt b/compiler/testData/codegen/box/extensionClasses/constructors.kt index b8663c8890e..850fe6ea31d 100644 --- a/compiler/testData/codegen/box/extensionClasses/constructors.kt +++ b/compiler/testData/codegen/box/extensionClasses/constructors.kt @@ -2,7 +2,7 @@ // TARGET_BACKEND: JVM_IR // IGNORE_BACKEND_FIR: JVM_IR // FIR status: context receivers aren't yet supported -// WITH_RUNTIME +// WITH_STDLIB class A(val ok: String) diff --git a/compiler/testData/codegen/box/extensionClasses/genericCollection.kt b/compiler/testData/codegen/box/extensionClasses/genericCollection.kt index 95804fb788b..ea1e0823d17 100644 --- a/compiler/testData/codegen/box/extensionClasses/genericCollection.kt +++ b/compiler/testData/codegen/box/extensionClasses/genericCollection.kt @@ -2,7 +2,7 @@ // TARGET_BACKEND: JVM_IR // IGNORE_BACKEND_FIR: JVM_IR // FIR status: context receivers aren't yet supported -// WITH_RUNTIME +// WITH_STDLIB context(Collection

) class A

{ val result = if (!isEmpty()) "OK" else "fail" diff --git a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/decimateEveryEvenThird.kt b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/decimateEveryEvenThird.kt index 5151ee6da3e..021dadadec0 100644 --- a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/decimateEveryEvenThird.kt +++ b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/decimateEveryEvenThird.kt @@ -2,7 +2,7 @@ // TARGET_BACKEND: JVM_IR // IGNORE_BACKEND_FIR: JVM_IR // FIR status: context receivers aren't yet supported -// WITH_RUNTIME +// WITH_STDLIB fun List.decimateEveryEvenThird() = sequence { var counter = 1 diff --git a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/dp.kt b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/dp.kt index 7c2a39c3b57..f0e2ab88f97 100644 --- a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/dp.kt +++ b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/dp.kt @@ -2,7 +2,7 @@ // TARGET_BACKEND: JVM_IR // IGNORE_BACKEND_FIR: JVM_IR // FIR status: context receivers aren't yet supported -// WITH_RUNTIME +// WITH_STDLIB class View { val coefficient = 42 diff --git a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/monoidSum.kt b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/monoidSum.kt index eb6623c1dd5..716654739d1 100644 --- a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/monoidSum.kt +++ b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/monoidSum.kt @@ -2,7 +2,7 @@ // TARGET_BACKEND: JVM_IR // IGNORE_BACKEND_FIR: JVM_IR // FIR status: context receivers aren't yet supported -// WITH_RUNTIME +// WITH_STDLIB interface Semigroup { infix fun T.combine(other: T): T diff --git a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/structuredConcurrency.kt b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/structuredConcurrency.kt index e27e3519a76..5a8e86b4003 100644 --- a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/structuredConcurrency.kt +++ b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/fromKEEP/structuredConcurrency.kt @@ -2,7 +2,7 @@ // TARGET_BACKEND: JVM_IR // IGNORE_BACKEND_FIR: JVM_IR // FIR status: context receivers aren't yet supported -// WITH_RUNTIME +// WITH_STDLIB // WITH_COROUTINES import helpers.* diff --git a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/plusAssign.kt b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/plusAssign.kt index 7412d09c4be..beeff6563e4 100644 --- a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/plusAssign.kt +++ b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/plusAssign.kt @@ -2,7 +2,7 @@ // TARGET_BACKEND: JVM_IR // IGNORE_BACKEND_FIR: JVM_IR // FIR status: context receivers aren't yet supported -// WITH_RUNTIME +// WITH_STDLIB @file:Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS") diff --git a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/plusMatrix.kt b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/plusMatrix.kt index 956497f281d..ec736c4f2a2 100644 --- a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/plusMatrix.kt +++ b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/plusMatrix.kt @@ -2,7 +2,7 @@ // TARGET_BACKEND: JVM_IR // IGNORE_BACKEND_FIR: JVM_IR // FIR status: context receivers aren't yet supported -// WITH_RUNTIME +// WITH_STDLIB interface NumberOperations { operator fun Number.plus(other: Number): Number diff --git a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/useFromAnotherModuleSuspending.kt b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/useFromAnotherModuleSuspending.kt index 02016357353..64ecbe38d4c 100644 --- a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/useFromAnotherModuleSuspending.kt +++ b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/useFromAnotherModuleSuspending.kt @@ -2,7 +2,7 @@ // TARGET_BACKEND: JVM_IR // IGNORE_BACKEND_FIR: JVM_IR // FIR status: context receivers aren't yet supported -// WITH_RUNTIME +// WITH_STDLIB // WITH_COROUTINES // MODULE: lib diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/defaultArgs.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/defaultArgs.kt index f6621b7c8c9..923dec0c3a7 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/defaultArgs.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/defaultArgs.kt @@ -1,7 +1,7 @@ // !JVM_DEFAULT_MODE: all // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 -// WITH_RUNTIME +// WITH_STDLIB // CHECK_BYTECODE_LISTING @JvmDefaultWithCompatibility diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/differentCases.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/differentCases.kt index 61378652318..4328ea507d7 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/differentCases.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/differentCases.kt @@ -1,7 +1,7 @@ // !JVM_DEFAULT_MODE: all // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 -// WITH_RUNTIME +// WITH_STDLIB // CHECK_BYTECODE_LISTING @JvmDefaultWithCompatibility diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/javaInheritance.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/javaInheritance.kt index fad1dd432ee..5ecdcf8363b 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/javaInheritance.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/javaInheritance.kt @@ -1,7 +1,7 @@ // !JVM_DEFAULT_MODE: all // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 -// WITH_RUNTIME +// WITH_STDLIB // CHECK_BYTECODE_LISTING // FILE: KBase.kt diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/propertyAnnotation.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/propertyAnnotation.kt index 3eb4d0814b9..f7885f4deb6 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/propertyAnnotation.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/propertyAnnotation.kt @@ -1,7 +1,7 @@ // !JVM_DEFAULT_MODE: all // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 -// WITH_RUNTIME +// WITH_STDLIB // CHECK_BYTECODE_LISTING annotation class MyAnn diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/simple.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/simple.kt index 57e7eb18311..e019d819503 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/simple.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/withCompatibility/simple.kt @@ -1,7 +1,7 @@ // !JVM_DEFAULT_MODE: all // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 -// WITH_RUNTIME +// WITH_STDLIB // FILE: Simple.java public interface Simple extends KInterface { diff --git a/compiler/testData/codegen/box/jvmName/fakeOverrideOfProperty.kt b/compiler/testData/codegen/box/jvmName/fakeOverrideOfProperty.kt index ad5f7100044..815cfa0c3b3 100644 --- a/compiler/testData/codegen/box/jvmName/fakeOverrideOfProperty.kt +++ b/compiler/testData/codegen/box/jvmName/fakeOverrideOfProperty.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM -// WITH_RUNTIME +// WITH_STDLIB abstract class Base { protected abstract fun getChart(context: CharSequence): String diff --git a/compiler/testData/codegen/box/vararg/kt10926.kt b/compiler/testData/codegen/box/vararg/kt10926.kt index 85ec08f934a..8a5bf23b0dd 100644 --- a/compiler/testData/codegen/box/vararg/kt10926.kt +++ b/compiler/testData/codegen/box/vararg/kt10926.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +EliminateAmbiguitiesWithExternalTypeParameters -// WITH_RUNTIME +// WITH_STDLIB class AllCollection { fun addAll1(vararg values: T) = "NOK"