Switch enableJvmDefault to jvmDefaultMode

2026-05-08 15:53:19 +00:00 · 2018-05-23 14:57:14 +02:00
parent bacc2079ed
commit 065780de4c
61 changed files with 114 additions and 70 deletions
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 interface Z {
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_REFLECT
 // FULL_JDK
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // IGNORE_BACKEND: JS
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_REFLECT

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt
+++ b/compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FILE: 1.kt
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FILE: 1.kt
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FILE: 1.kt
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FILE: 1.kt
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // FILE: 1.kt
 interface Test {
    fun test(): String {
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // FILE: 1.kt
 interface Test {
    fun test(): String {
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // FILE: 1.kt
 interface Test {
    fun test(): String {
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithBigHierarchy.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithBigHierarchy.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // FILE: 1.kt
 interface Test {
    fun test(): String {
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // FILE: 1.kt

 interface Test {
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simplePropWithHierarchy.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simplePropWithHierarchy.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // FILE: 1.kt

 interface Test {
--- a/compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt
+++ b/compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

--- a/compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt
+++ b/compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.3
-// !ENABLE_JVM_DEFAULT
+// !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
 // WITH_RUNTIME