From 49c659b3792fec6a63ac093b2b39e3f7036951cd Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Sun, 17 Sep 2023 00:21:14 +0200
Subject: [PATCH] CLI: remove obsolete -Xdump-declarations-to

It was only used in the very old version of binary compatibility
validator. It was never supported in the JVM IR backend.
---
 .space/CODEOWNERS                             |   1 -
 .../kotlin/codegen/state/GenerationState.kt   |   4 -
 .../K2JVMCompilerArgumentsCopyGenerated.kt    |   1 -
 .../arguments/K2JVMCompilerArguments.kt       |  11 -
 .../jetbrains/kotlin/cli/jvm/jvmArguments.kt  |   2 -
 .../kotlin/config/JVMConfigurationKeys.java   |   3 -
 compiler/testData/cli/jvm/extraHelp.out       |   1 -
 .../codegen/dumpDeclarations/annotation.json  |  18 -
 .../codegen/dumpDeclarations/annotation.kt    |  12 -
 .../dumpDeclarations/classMembers.json        | 156 --------
 .../dumpDeclarations/classMembers.jvm_abi.txt |  21 --
 .../codegen/dumpDeclarations/classMembers.kt  |  94 -----
 .../codegen/dumpDeclarations/classes.json     | 351 ------------------
 .../codegen/dumpDeclarations/classes.kt       |  58 ---
 .../codegen/dumpDeclarations/interfaces.json  | 209 -----------
 .../codegen/dumpDeclarations/interfaces.kt    |  32 --
 .../intermediateAbstractSuspendFunction.json  |  44 ---
 .../intermediateAbstractSuspendFunction.kt    |  10 -
 .../dumpDeclarations/localClasses.json        |  89 -----
 .../codegen/dumpDeclarations/localClasses.kt  |  39 --
 .../multifileFacadeMembers.json               |  60 ---
 .../multifileFacadeMembers.kt                 |  43 ---
 .../dumpDeclarations/suspendLambda.json       |  23 --
 .../codegen/dumpDeclarations/suspendLambda.kt |  10 -
 .../dumpDeclarations/suspendOverride.json     |  44 ---
 .../dumpDeclarations/suspendOverride.kt       |  14 -
 .../dumpDeclarations/topLevelMembers.json     |  48 ---
 .../dumpDeclarations/topLevelMembers.kt       |  40 --
 .../JvmAbiConsistencyTestRestGenerated.java   |  70 ----
 .../codegen/AbstractDumpDeclarationsTest.kt   |  29 --
 .../generators/GenerateJUnit3CompilerTests.kt |   4 -
 .../generators/GenerateJUnit5CompilerTests.kt |   1 -
 .../DumpDeclarationsTestGenerated.java        |  81 ----
 .../kotlin/config/facetSerialization.kt       |   1 -
 .../CompilerArgumentsContentProspectorTest.kt |   1 -
 35 files changed, 1625 deletions(-)
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/annotation.json
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/annotation.kt
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/classMembers.json
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/classMembers.jvm_abi.txt
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/classMembers.kt
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/classes.json
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/classes.kt
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/interfaces.json
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/interfaces.kt
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.json
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.kt
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/localClasses.json
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/localClasses.kt
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.json
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.kt
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/suspendLambda.json
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/suspendLambda.kt
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/suspendOverride.json
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/suspendOverride.kt
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/topLevelMembers.json
 delete mode 100644 compiler/testData/codegen/dumpDeclarations/topLevelMembers.kt
 delete mode 100644 compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt
 delete mode 100644 compiler/tests-gen/org/jetbrains/kotlin/codegen/DumpDeclarationsTestGenerated.java

diff --git a/.space/CODEOWNERS b/.space/CODEOWNERS
index 84717a173e8..c3831d91e8c 100644
--- a/.space/CODEOWNERS
+++ b/.space/CODEOWNERS
@@ -129,7 +129,6 @@
 /compiler/testData/codegen/composeLikeBytecodeText/ "Kotlin JVM"
 /compiler/testData/codegen/customScript/ "Kotlin Compiler Core"
 /compiler/testData/codegen/defaultArguments/reflection/ "Kotlin JVM"
-/compiler/testData/codegen/dumpDeclarations/ "Kotlin JVM"
 /compiler/testData/codegen/helpers/ "Kotlin JVM"
 /compiler/testData/codegen/innerClassInfo/ "Kotlin JVM"
 /compiler/testData/codegen/java6/ "Kotlin JVM"
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
index 0a371f24766..5209e090ecc 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
@@ -326,10 +326,6 @@ class GenerationState private constructor(
                         ).apply { duplicateSignatureFactory = this }
                 },
                 { BuilderFactoryForDuplicateClassNameDiagnostics(it, this) },
-                {
-                    configuration.get(JVMConfigurationKeys.DECLARATIONS_JSON_PATH)
-                        ?.let { destination -> SignatureDumpingBuilderFactory(it, File(destination)) } ?: it
-                }
             )
             .wrapWith(loadClassBuilderInterceptors()) { classBuilderFactory, extension ->
                 extension.interceptClassBuilderFactory(classBuilderFactory, originalFrontendBindingContext, diagnostics)
diff --git a/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArgumentsCopyGenerated.kt b/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArgumentsCopyGenerated.kt
index f125da99d21..78005d287ed 100644
--- a/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArgumentsCopyGenerated.kt
+++ b/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArgumentsCopyGenerated.kt
@@ -19,7 +19,6 @@ fun copyK2JVMCompilerArguments(from: K2JVMCompilerArguments, to: K2JVMCompilerAr
     to.buildFile = from.buildFile
     to.classpath = from.classpath
     to.compileJava = from.compileJava
-    to.declarationsOutputPath = from.declarationsOutputPath
     to.defaultScriptExtension = from.defaultScriptExtension
     to.destination = from.destination
     to.disableStandardScript = from.disableStandardScript
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
index 4c695caa2ed..e48186be0b3 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
@@ -313,17 +313,6 @@ This can be used in the event of problems with the new implementation."""
             field = value
         }
 
-    @Argument(
-        value = "-Xdump-declarations-to",
-        valueDescription = "<path>",
-        description = "Path to the JSON file where Java-to-Kotlin declaration mappings should be dumped."
-    )
-    var declarationsOutputPath: String? = null
-        set(value) {
-            checkFrozen()
-            field = if (value.isNullOrEmpty()) null else value
-        }
-
     @Argument(
         value = "-Xsuppress-missing-builtins-error",
         description = """Suppress the "cannot access built-in declaration" error (useful with '-no-stdlib')."""
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
index 0f2d5957eef..d4f5e5853be 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
@@ -322,8 +322,6 @@ fun CompilerConfiguration.configureAdvancedJvmOptions(arguments: K2JVMCompilerAr
         messageCollector.report(INFO, "Using preview Java language features")
     }
 
-    arguments.declarationsOutputPath?.let { put(JVMConfigurationKeys.DECLARATIONS_JSON_PATH, it) }
-
     val nThreadsRaw = parseBackendThreads(arguments.backendThreads, messageCollector)
     val nThreads = if (nThreadsRaw == 0) Runtime.getRuntime().availableProcessors() else nThreadsRaw
     if (nThreads > 1) {
diff --git a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
index 55296bed061..d8749e11d02 100644
--- a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
+++ b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
@@ -70,9 +70,6 @@ public class JVMConfigurationKeys {
     public static final CompilerConfigurationKey<File> MODULE_XML_FILE =
             CompilerConfigurationKey.create("path to module.xml");
 
-    public static final CompilerConfigurationKey<String> DECLARATIONS_JSON_PATH =
-            CompilerConfigurationKey.create("path to declarations output");
-
     public static final CompilerConfigurationKey<List<Module>> MODULES =
             CompilerConfigurationKey.create("module data");
 
diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out
index 837f719c621..9cf9b4e826b 100644
--- a/compiler/testData/cli/jvm/extraHelp.out
+++ b/compiler/testData/cli/jvm/extraHelp.out
@@ -20,7 +20,6 @@ where advanced options include:
                              The default value is 1.
   -Xbuild-file=<path>        Path to the .xml build file to compile.
   -Xcompile-java             Reuse 'javac' analysis and compile Java source files.
-  -Xdump-declarations-to=<path> Path to the JSON file where Java-to-Kotlin declaration mappings should be dumped.
   -Xdefault-script-extension=<script filename extension>
                              Compile expressions and unrecognized scripts passed with the -script argument as scripts with the given filename extension.
   -Xdisable-standard-script  Disable standard Kotlin scripting support.
diff --git a/compiler/testData/codegen/dumpDeclarations/annotation.json b/compiler/testData/codegen/dumpDeclarations/annotation.json
deleted file mode 100644
index ea12df103ee..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/annotation.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-	{
-		"declaration": "final annotation class Ann : kotlin.Annotation defined in root package",
-		"visibility": "internal",
-		"class": "Ann",
-		"members": [
-			{"visibility": "public",	"declaration": "final val i: kotlin.Int", "name": "i", "desc": "()I"},
-			{"visibility": "public",	"declaration": "final val s: kotlin.Short", "name": "s", "desc": "()S"},
-			{"visibility": "public",	"declaration": "final val f: kotlin.Float", "name": "f", "desc": "()F"},
-			{"visibility": "public",	"declaration": "final val d: kotlin.Double", "name": "d", "desc": "()D"},
-			{"visibility": "public",	"declaration": "final val l: kotlin.Long", "name": "l", "desc": "()J"},
-			{"visibility": "public",	"declaration": "final val b: kotlin.Byte", "name": "b", "desc": "()B"},
-			{"visibility": "public",	"declaration": "final val bool: kotlin.Boolean", "name": "bool", "desc": "()Z"},
-			{"visibility": "public",	"declaration": "final val c: kotlin.Char", "name": "c", "desc": "()C"},
-			{"visibility": "public",	"declaration": "final val str: kotlin.String", "name": "str", "desc": "()Ljava/lang/String;"}
-		]
-	}
-]
diff --git a/compiler/testData/codegen/dumpDeclarations/annotation.kt b/compiler/testData/codegen/dumpDeclarations/annotation.kt
deleted file mode 100644
index 69f7e6818a0..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/annotation.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class Ann(
-        val i: Int,
-        val s: Short,
-        val f: Float,
-        val d: Double,
-        val l: Long,
-        val b: Byte,
-        val bool: Boolean,
-        val c: Char,
-        val str: String
-)
\ No newline at end of file
diff --git a/compiler/testData/codegen/dumpDeclarations/classMembers.json b/compiler/testData/codegen/dumpDeclarations/classMembers.json
deleted file mode 100644
index 3d0c106c60b..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/classMembers.json
+++ /dev/null
@@ -1,156 +0,0 @@
-[
-	{
-		"declaration": "final class ClassWithProperties defined in root package",
-		"visibility": "public",
-		"class": "ClassWithProperties",
-		"members": [
-			{"visibility": "public",	"declaration": "final val publicVal: kotlin.Int", "name": "publicVal", "desc": "I"},
-			{"visibility": "public",	"declaration": "final fun `<get-publicVal>`(): kotlin.Int", "name": "getPublicVal", "desc": "()I"},
-			{"visibility": "public",	"declaration": "final var publicVar: kotlin.Int", "name": "publicVar", "desc": "I"},
-			{"visibility": "public",	"declaration": "final fun `<get-publicVar>`(): kotlin.Int", "name": "getPublicVar", "desc": "()I"},
-			{"visibility": "public",	"declaration": "final fun `<set-publicVar>`(`<set-?>`: kotlin.Int): kotlin.Unit", "name": "setPublicVar", "desc": "(I)V"},
-			{"visibility": "internal",	"declaration": "final val internalVal: kotlin.Long", "name": "internalVal", "desc": "J"},
-			{"visibility": "internal",	"declaration": "final fun `<get-internalVal>`(): kotlin.Long", "name": "getInternalVal$test_module", "desc": "()J"},
-			{"visibility": "internal",	"declaration": "final var internalVar: kotlin.Long", "name": "internalVar", "desc": "J"},
-			{"visibility": "internal",	"declaration": "final fun `<get-internalVar>`(): kotlin.Long", "name": "getInternalVar$test_module", "desc": "()J"},
-			{"visibility": "internal",	"declaration": "final fun `<set-internalVar>`(`<set-?>`: kotlin.Long): kotlin.Unit", "name": "setInternalVar$test_module", "desc": "(J)V"},
-			{"visibility": "protected",	"declaration": "final val protectedVal: kotlin.String", "name": "protectedVal", "desc": "Ljava/lang/String;"},
-			{"visibility": "protected",	"declaration": "final fun `<get-protectedVal>`(): kotlin.String", "name": "getProtectedVal", "desc": "()Ljava/lang/String;"},
-			{"visibility": "protected",	"declaration": "final var protectedVar: kotlin.String", "name": "protectedVar", "desc": "Ljava/lang/String;"},
-			{"visibility": "protected",	"declaration": "final fun `<get-protectedVar>`(): kotlin.String", "name": "getProtectedVar", "desc": "()Ljava/lang/String;"},
-			{"visibility": "protected",	"declaration": "final fun `<set-protectedVar>`(`<set-?>`: kotlin.String): kotlin.Unit", "name": "setProtectedVar", "desc": "(Ljava/lang/String;)V"},
-			{"visibility": "private",	"declaration": "final val privateVal: kotlin.Any?", "name": "privateVal", "desc": "Ljava/lang/Object;"},
-			{"visibility": "private",	"declaration": "final var privateVar: kotlin.Any?", "name": "privateVar", "desc": "Ljava/lang/Object;"},
-			{"visibility": "public",	"declaration": "constructor ClassWithProperties()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class ClassWithLateinit defined in root package",
-		"visibility": "public",
-		"class": "ClassWithLateinit",
-		"members": [
-			{"visibility": "public",	"declaration": "final lateinit var publicVar: kotlin.String", "name": "publicVar", "desc": "Ljava/lang/String;"},
-			{"visibility": "public",	"declaration": "final fun `<get-publicVar>`(): kotlin.String", "name": "getPublicVar", "desc": "()Ljava/lang/String;"},
-			{"visibility": "public",	"declaration": "final fun `<set-publicVar>`(`<set-?>`: kotlin.String): kotlin.Unit", "name": "setPublicVar", "desc": "(Ljava/lang/String;)V"},
-			{"visibility": "public",	"declaration": "final lateinit var publicVarInternalSet: kotlin.String", "name": "publicVarInternalSet", "desc": "Ljava/lang/String;"},
-			{"visibility": "public",	"declaration": "final fun `<get-publicVarInternalSet>`(): kotlin.String", "name": "getPublicVarInternalSet", "desc": "()Ljava/lang/String;"},
-			{"visibility": "internal",	"declaration": "final fun `<set-publicVarInternalSet>`(`<set-?>`: kotlin.String): kotlin.Unit", "name": "setPublicVarInternalSet$test_module", "desc": "(Ljava/lang/String;)V"},
-			{"visibility": "internal",	"declaration": "final lateinit var internalVar: kotlin.String", "name": "internalVar", "desc": "Ljava/lang/String;"},
-			{"visibility": "internal",	"declaration": "final fun `<get-internalVar>`(): kotlin.String", "name": "getInternalVar$test_module", "desc": "()Ljava/lang/String;"},
-			{"visibility": "internal",	"declaration": "final fun `<set-internalVar>`(`<set-?>`: kotlin.String): kotlin.Unit", "name": "setInternalVar$test_module", "desc": "(Ljava/lang/String;)V"},
-			{"visibility": "internal",	"declaration": "final lateinit var internalVarPrivateSet: kotlin.String", "name": "internalVarPrivateSet", "desc": "Ljava/lang/String;"},
-			{"visibility": "internal",	"declaration": "final fun `<get-internalVarPrivateSet>`(): kotlin.String", "name": "getInternalVarPrivateSet$test_module", "desc": "()Ljava/lang/String;"},
-			{"visibility": "protected",	"declaration": "final lateinit var protectedVar: kotlin.String", "name": "protectedVar", "desc": "Ljava/lang/String;"},
-			{"visibility": "protected",	"declaration": "final fun `<get-protectedVar>`(): kotlin.String", "name": "getProtectedVar", "desc": "()Ljava/lang/String;"},
-			{"visibility": "protected",	"declaration": "final fun `<set-protectedVar>`(`<set-?>`: kotlin.String): kotlin.Unit", "name": "setProtectedVar", "desc": "(Ljava/lang/String;)V"},
-			{"visibility": "protected",	"declaration": "final lateinit var protectedVarPrivateSet: kotlin.String", "name": "protectedVarPrivateSet", "desc": "Ljava/lang/String;"},
-			{"visibility": "protected",	"declaration": "final fun `<get-protectedVarPrivateSet>`(): kotlin.String", "name": "getProtectedVarPrivateSet", "desc": "()Ljava/lang/String;"},
-			{"visibility": "private",	"declaration": "final lateinit var privateVar: kotlin.Any", "name": "privateVar", "desc": "Ljava/lang/Object;"},
-			{"visibility": "public",	"declaration": "constructor ClassWithLateinit()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class ClassWithFields defined in root package",
-		"visibility": "public",
-		"class": "ClassWithFields",
-		"members": [
-			{"visibility": "public",	"declaration": "final val publicVal: kotlin.Int", "name": "publicVal", "desc": "I"},
-			{"visibility": "public",	"declaration": "final var publicVar: kotlin.Int", "name": "publicVar", "desc": "I"},
-			{"visibility": "internal",	"declaration": "final val internalVal: kotlin.Long", "name": "internalVal", "desc": "J"},
-			{"visibility": "internal",	"declaration": "final var internalVar: kotlin.Long", "name": "internalVar", "desc": "J"},
-			{"visibility": "protected",	"declaration": "final val protectedVal: kotlin.String", "name": "protectedVal", "desc": "Ljava/lang/String;"},
-			{"visibility": "protected",	"declaration": "final var protectedVar: kotlin.String", "name": "protectedVar", "desc": "Ljava/lang/String;"},
-			{"visibility": "public",	"declaration": "constructor ClassWithFields()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class ClassWithConstructors defined in root package",
-		"visibility": "public",
-		"class": "ClassWithConstructors",
-		"members": [
-			{"visibility": "public",	"declaration": "final val a: kotlin.Any", "name": "a", "desc": "Ljava/lang/Object;"},
-			{"visibility": "public",	"declaration": "final fun `<get-a>`(): kotlin.Any", "name": "getA", "desc": "()Ljava/lang/Object;"},
-			{"visibility": "public",	"declaration": "constructor ClassWithConstructors(a: kotlin.Any, b: kotlin.Int)", "name": "<init>", "desc": "(Ljava/lang/Object;I)V"},
-			{"visibility": "public",	"declaration": "constructor ClassWithConstructors(a: kotlin.String)", "name": "<init>", "desc": "(Ljava/lang/String;)V"},
-			{"visibility": "internal",	"declaration": "constructor ClassWithConstructors(a: kotlin.Int)", "name": "<init>", "desc": "(I)V"},
-			{"visibility": "protected",	"declaration": "constructor ClassWithConstructors(a: kotlin.Any)", "name": "<init>", "desc": "(Ljava/lang/Object;)V"}
-		]
-	},
-	{
-		"declaration": "final class ClassWithFunctions defined in root package",
-		"visibility": "public",
-		"class": "ClassWithFunctions",
-		"members": [
-			{"visibility": "public",	"declaration": "final fun publicFun(): kotlin.Unit", "name": "publicFun", "desc": "()V"},
-			{"visibility": "internal",	"declaration": "final fun internalFun(param1: kotlin.Int): kotlin.Unit", "name": "internalFun$test_module", "desc": "(I)V"},
-			{"visibility": "protected",	"declaration": "final fun protectedFun(a: kotlin.String, b: kotlin.Long): kotlin.Unit", "name": "protectedFun", "desc": "(Ljava/lang/String;J)V"},
-			{"visibility": "private",	"declaration": "final fun privateFun(x: kotlin.Any): kotlin.Unit", "name": "privateFun", "desc": "(Ljava/lang/Object;)V"},
-			{"visibility": "internal",	"declaration": "final fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$test_module", "desc": "(Ljava/lang/String;Ljava/lang/Long;)V"},
-			{"visibility": "internal",	"declaration": "final fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$test_module$default", "desc": "(LClassWithFunctions;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)V"},
-			{"visibility": "internal",	"declaration": "final fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$test_module", "desc": "(Ljava/lang/String;)V"},
-			{"visibility": "internal",	"declaration": "final fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$test_module", "desc": "()V"},
-			{"visibility": "public",	"declaration": "constructor ClassWithFunctions()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "object ObjectWithProperties defined in root package",
-		"visibility": "public",
-		"class": "ObjectWithProperties",
-		"members": [
-			{"visibility": "public",	"declaration": "final val publicVal: kotlin.Int", "name": "publicVal", "desc": "I"},
-			{"visibility": "public",	"declaration": "final fun `<get-publicVal>`(): kotlin.Int", "name": "getPublicVal", "desc": "()I"},
-			{"visibility": "public",	"declaration": "final var publicVar: kotlin.Int", "name": "publicVar", "desc": "I"},
-			{"visibility": "public",	"declaration": "final fun `<get-publicVar>`(): kotlin.Int", "name": "getPublicVar", "desc": "()I"},
-			{"visibility": "public",	"declaration": "final fun `<set-publicVar>`(`<set-?>`: kotlin.Int): kotlin.Unit", "name": "setPublicVar", "desc": "(I)V"},
-			{"visibility": "internal",	"declaration": "final val internalVal: kotlin.Long", "name": "internalVal", "desc": "J"},
-			{"visibility": "internal",	"declaration": "final fun `<get-internalVal>`(): kotlin.Long", "name": "getInternalVal$test_module", "desc": "()J"},
-			{"visibility": "internal",	"declaration": "final var internalVar: kotlin.Long", "name": "internalVar", "desc": "J"},
-			{"visibility": "internal",	"declaration": "final fun `<get-internalVar>`(): kotlin.Long", "name": "getInternalVar$test_module", "desc": "()J"},
-			{"visibility": "internal",	"declaration": "final fun `<set-internalVar>`(`<set-?>`: kotlin.Long): kotlin.Unit", "name": "setInternalVar$test_module", "desc": "(J)V"},
-			{"visibility": "private",	"declaration": "final val privateVal: kotlin.Any?", "name": "privateVal", "desc": "Ljava/lang/Object;"},
-			{"visibility": "private",	"declaration": "final var privateVar: kotlin.Any?", "name": "privateVar", "desc": "Ljava/lang/Object;"},
-			{"visibility": "private",	"declaration": "constructor ObjectWithProperties()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LObjectWithProperties;"},
-			{"visibility": "public",	"declaration": "object ObjectWithProperties", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "object ObjectWithFields defined in root package",
-		"visibility": "public",
-		"class": "ObjectWithFields",
-		"members": [
-			{"visibility": "public",	"declaration": "final val publicVal: kotlin.Int", "name": "publicVal", "desc": "I"},
-			{"visibility": "public",	"declaration": "final var publicVar: kotlin.Int", "name": "publicVar", "desc": "I"},
-			{"visibility": "internal",	"declaration": "final val internalVal: kotlin.Long", "name": "internalVal", "desc": "J"},
-			{"visibility": "internal",	"declaration": "final var internalVar: kotlin.Long", "name": "internalVar", "desc": "J"},
-			{"visibility": "private",	"declaration": "constructor ObjectWithFields()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LObjectWithFields;"},
-			{"visibility": "public",	"declaration": "object ObjectWithFields", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class ObjectWithFunctions defined in root package",
-		"visibility": "public",
-		"class": "ObjectWithFunctions",
-		"members": [
-			{"visibility": "public",	"declaration": "final fun publicFun(): kotlin.Unit", "name": "publicFun", "desc": "()V"},
-			{"visibility": "internal",	"declaration": "final fun internalFun(param1: kotlin.Int): kotlin.Unit", "name": "internalFun$test_module", "desc": "(I)V"},
-			{"visibility": "protected",	"declaration": "final fun protectedFun(a: kotlin.String, b: kotlin.Long): kotlin.Unit", "name": "protectedFun", "desc": "(Ljava/lang/String;J)V"},
-			{"visibility": "private",	"declaration": "final fun privateFun(x: kotlin.Any): kotlin.Unit", "name": "privateFun", "desc": "(Ljava/lang/Object;)V"},
-			{"visibility": "public",	"declaration": "constructor ObjectWithFunctions()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "object ObjectWithConst defined in root package",
-		"visibility": "public",
-		"class": "ObjectWithConst",
-		"members": [
-			{"visibility": "public",	"declaration": "const final val publicConst: kotlin.Int", "name": "publicConst", "desc": "I"},
-			{"visibility": "internal",	"declaration": "const final val internalConst: kotlin.Int", "name": "internalConst", "desc": "I"},
-			{"visibility": "private",	"declaration": "const final val privateConst: kotlin.Int", "name": "privateConst", "desc": "I"},
-			{"visibility": "private",	"declaration": "constructor ObjectWithConst()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LObjectWithConst;"},
-			{"visibility": "public",	"declaration": "object ObjectWithConst", "name": "<clinit>", "desc": "()V"}
-		]
-	}
-]
diff --git a/compiler/testData/codegen/dumpDeclarations/classMembers.jvm_abi.txt b/compiler/testData/codegen/dumpDeclarations/classMembers.jvm_abi.txt
deleted file mode 100644
index c5922540834..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/classMembers.jvm_abi.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-MODULE main
-	CLASS ClassWithLateinit.class
-		CLASS METADATA
-			PROPERTY getInternalVarPrivateSet$main()Ljava/lang/String;
-				Property: class.metadata.property.setterValueParameter
-					K1
-						<set-?>: kotlin/String
-					K2
-						value: kotlin/String
-			PROPERTY getProtectedVarPrivateSet()Ljava/lang/String;
-				Property: class.metadata.property.setterValueParameter
-					K1
-						<set-?>: kotlin/String
-					K2
-						value: kotlin/String
-			PROPERTY getPublicVarInternalSet()Ljava/lang/String;
-				Property: class.metadata.property.setterValueParameter
-					K1
-						<set-?>: kotlin/String
-					K2
-						value: kotlin/String
diff --git a/compiler/testData/codegen/dumpDeclarations/classMembers.kt b/compiler/testData/codegen/dumpDeclarations/classMembers.kt
deleted file mode 100644
index b3142ca56d8..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/classMembers.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-// WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-63984
-public class ClassWithProperties {
-
-    public val publicVal: Int = 1
-    public var publicVar: Int = 1
-    internal val internalVal: Long = 1
-    internal var internalVar: Long = 1
-    protected val protectedVal: String = ""
-    protected var protectedVar: String = ""
-    private val privateVal: Any? = 1
-    private var privateVar: Any? = 1
-
-}
-
-public class ClassWithLateinit {
-
-    public lateinit var publicVar: String
-    public lateinit var publicVarInternalSet: String
-        internal set
-
-    internal lateinit var internalVar: String
-    internal lateinit var internalVarPrivateSet: String
-        private set
-
-    protected lateinit var protectedVar: String
-    protected lateinit var protectedVarPrivateSet: String
-        private set
-
-    private lateinit var privateVar: Any
-
-}
-
-public class ClassWithFields {
-
-    @JvmField public val publicVal: Int = 1
-    @JvmField public var publicVar: Int = 1
-    @JvmField internal val internalVal: Long = 1
-    @JvmField internal var internalVar: Long = 1
-    @JvmField protected val protectedVal: String = ""
-    @JvmField protected var protectedVar: String = ""
-
-}
-
-public class ClassWithConstructors(val a: Any, b: Int) {
-    public constructor(a: String) : this(a, 1) {}
-    internal constructor(a: Int) : this(a, 2) {}
-    protected constructor(a: Any) : this(a, 0) {}
-}
-
-public class ClassWithFunctions {
-    public fun publicFun() {}
-    internal fun internalFun(param1: Int) {}
-    protected fun protectedFun(a: String, b: Long) {}
-    private fun privateFun(x: Any) {}
-
-    @JvmOverloads
-    internal fun internalOverloads(a: String = "", b: Long? = null) {}
-}
-
-public object ObjectWithProperties {
-    public val publicVal: Int = 1
-    public var publicVar: Int = 1
-    internal val internalVal: Long = 1
-    internal var internalVar: Long = 1
-    private val privateVal: Any? = 1
-    private var privateVar: Any? = 1
-}
-
-public object ObjectWithFields {
-
-    @JvmField public val publicVal: Int = 1
-    @JvmField public var publicVar: Int = 1
-    @JvmField internal val internalVal: Long = 1
-    @JvmField internal var internalVar: Long = 1
-
-}
-
-public class ObjectWithFunctions {
-
-    public fun publicFun() {}
-    internal fun internalFun(param1: Int) {}
-    protected fun protectedFun(a: String, b: Long) {}
-    private fun privateFun(x: Any) {}
-
-}
-
-public object ObjectWithConst {
-
-    public const val publicConst: Int = 2
-    internal const val internalConst: Int = 3
-    private const val privateConst: Int = 4
-
-}
diff --git a/compiler/testData/codegen/dumpDeclarations/classes.json b/compiler/testData/codegen/dumpDeclarations/classes.json
deleted file mode 100644
index 61868b562ee..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/classes.json
+++ /dev/null
@@ -1,351 +0,0 @@
-[
-	{
-		"declaration": "object ObjPublic defined in PublicClass",
-		"visibility": "public",
-		"class": "PublicClass$ObjPublic",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor ObjPublic()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LPublicClass$ObjPublic;"},
-			{"visibility": "public",	"declaration": "object ObjPublic", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "object ObjInternal defined in PublicClass",
-		"visibility": "internal",
-		"class": "PublicClass$ObjInternal",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor ObjInternal()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LPublicClass$ObjInternal;"},
-			{"visibility": "internal",	"declaration": "object ObjInternal", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "object ObjProtected defined in PublicClass",
-		"visibility": "protected",
-		"class": "PublicClass$ObjProtected",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor ObjProtected()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LPublicClass$ObjProtected;"},
-			{"visibility": "protected",	"declaration": "object ObjProtected", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "object ObjPrivate defined in PublicClass",
-		"visibility": "private",
-		"class": "PublicClass$ObjPrivate",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor ObjPrivate()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LPublicClass$ObjPrivate;"},
-			{"visibility": "private",	"declaration": "object ObjPrivate", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class NestedPublic defined in PublicClass",
-		"visibility": "public",
-		"class": "PublicClass$NestedPublic",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor NestedPublic()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class NestedInternal defined in PublicClass",
-		"visibility": "internal",
-		"class": "PublicClass$NestedInternal",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor NestedInternal()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class NestedProtected defined in PublicClass",
-		"visibility": "protected",
-		"class": "PublicClass$NestedProtected",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor NestedProtected()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class NestedPrivate defined in PublicClass",
-		"visibility": "private",
-		"class": "PublicClass$NestedPrivate",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor NestedPrivate()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final inner class InnerPublic defined in PublicClass",
-		"visibility": "public",
-		"class": "PublicClass$InnerPublic",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor InnerPublic()", "name": "<init>", "desc": "(LPublicClass;)V"},
-			{"name": "this$0", "desc": "LPublicClass;"}
-		]
-	},
-	{
-		"declaration": "final inner class InnerInternal defined in PublicClass",
-		"visibility": "internal",
-		"class": "PublicClass$InnerInternal",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor InnerInternal()", "name": "<init>", "desc": "(LPublicClass;)V"},
-			{"name": "this$0", "desc": "LPublicClass;"}
-		]
-	},
-	{
-		"declaration": "final inner class InnerProtected defined in PublicClass",
-		"visibility": "protected",
-		"class": "PublicClass$InnerProtected",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor InnerProtected()", "name": "<init>", "desc": "(LPublicClass;)V"},
-			{"name": "this$0", "desc": "LPublicClass;"}
-		]
-	},
-	{
-		"declaration": "final inner class InnerPrivate defined in PublicClass",
-		"visibility": "private",
-		"class": "PublicClass$InnerPrivate",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor InnerPrivate()", "name": "<init>", "desc": "(LPublicClass;)V"},
-			{"name": "this$0", "desc": "LPublicClass;"}
-		]
-	},
-	{
-		"declaration": "companion object defined in PublicClass",
-		"visibility": "public",
-		"class": "PublicClass$Companion",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "(Lkotlin/jvm/internal/DefaultConstructorMarker;)V"}
-		]
-	},
-	{
-		"declaration": "final class PublicClass defined in root package",
-		"visibility": "public",
-		"class": "PublicClass",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor PublicClass()", "name": "<init>", "desc": "()V"},
-			{"visibility": "public",	"declaration": "final class PublicClass", "name": "<clinit>", "desc": "()V"},
-			{"name": "Companion", "desc": "LPublicClass$Companion;"}
-		]
-	},
-	{
-		"declaration": "companion object defined in InternalClass",
-		"visibility": "public",
-		"class": "InternalClass$Companion",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "(Lkotlin/jvm/internal/DefaultConstructorMarker;)V"}
-		]
-	},
-	{
-		"declaration": "final class InternalClass defined in root package",
-		"visibility": "internal",
-		"class": "InternalClass",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor InternalClass()", "name": "<init>", "desc": "()V"},
-			{"visibility": "internal",	"declaration": "final class InternalClass", "name": "<clinit>", "desc": "()V"},
-			{"name": "Companion", "desc": "LInternalClass$Companion;"}
-		]
-	},
-	{
-		"declaration": "companion object defined in InternalClassInternalCompanion",
-		"visibility": "internal",
-		"class": "InternalClassInternalCompanion$Companion",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "(Lkotlin/jvm/internal/DefaultConstructorMarker;)V"}
-		]
-	},
-	{
-		"declaration": "final class InternalClassInternalCompanion defined in root package",
-		"visibility": "internal",
-		"class": "InternalClassInternalCompanion",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor InternalClassInternalCompanion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "internal",	"declaration": "final class InternalClassInternalCompanion", "name": "<clinit>", "desc": "()V"},
-			{"name": "Companion", "desc": "LInternalClassInternalCompanion$Companion;"}
-		]
-	},
-	{
-		"declaration": "companion object defined in InternalClassPrivateCompanion",
-		"visibility": "private",
-		"class": "InternalClassPrivateCompanion$Companion",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "(Lkotlin/jvm/internal/DefaultConstructorMarker;)V"}
-		]
-	},
-	{
-		"declaration": "final class InternalClassPrivateCompanion defined in root package",
-		"visibility": "internal",
-		"class": "InternalClassPrivateCompanion",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor InternalClassPrivateCompanion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "internal",	"declaration": "final class InternalClassPrivateCompanion", "name": "<clinit>", "desc": "()V"},
-			{"name": "Companion", "desc": "LInternalClassPrivateCompanion$Companion;"}
-		]
-	},
-	{
-		"declaration": "object ObjPublic defined in PrivateClass",
-		"visibility": "public",
-		"class": "PrivateClass$ObjPublic",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor ObjPublic()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LPrivateClass$ObjPublic;"},
-			{"visibility": "public",	"declaration": "object ObjPublic", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "object ObjInternal defined in PrivateClass",
-		"visibility": "internal",
-		"class": "PrivateClass$ObjInternal",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor ObjInternal()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LPrivateClass$ObjInternal;"},
-			{"visibility": "internal",	"declaration": "object ObjInternal", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "object ObjProtected defined in PrivateClass",
-		"visibility": "protected",
-		"class": "PrivateClass$ObjProtected",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor ObjProtected()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LPrivateClass$ObjProtected;"},
-			{"visibility": "protected",	"declaration": "object ObjProtected", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "object ObjPrivate defined in PrivateClass",
-		"visibility": "private",
-		"class": "PrivateClass$ObjPrivate",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor ObjPrivate()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LPrivateClass$ObjPrivate;"},
-			{"visibility": "private",	"declaration": "object ObjPrivate", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class NestedPublic defined in PrivateClass",
-		"visibility": "public",
-		"class": "PrivateClass$NestedPublic",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor NestedPublic()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class NestedInternal defined in PrivateClass",
-		"visibility": "internal",
-		"class": "PrivateClass$NestedInternal",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor NestedInternal()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class NestedProtected defined in PrivateClass",
-		"visibility": "protected",
-		"class": "PrivateClass$NestedProtected",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor NestedProtected()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class NestedPrivate defined in PrivateClass",
-		"visibility": "private",
-		"class": "PrivateClass$NestedPrivate",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor NestedPrivate()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final inner class InnerPublic defined in PrivateClass",
-		"visibility": "public",
-		"class": "PrivateClass$InnerPublic",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor InnerPublic()", "name": "<init>", "desc": "(LPrivateClass;)V"},
-			{"name": "this$0", "desc": "LPrivateClass;"}
-		]
-	},
-	{
-		"declaration": "final inner class InnerInternal defined in PrivateClass",
-		"visibility": "internal",
-		"class": "PrivateClass$InnerInternal",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor InnerInternal()", "name": "<init>", "desc": "(LPrivateClass;)V"},
-			{"name": "this$0", "desc": "LPrivateClass;"}
-		]
-	},
-	{
-		"declaration": "final inner class InnerProtected defined in PrivateClass",
-		"visibility": "protected",
-		"class": "PrivateClass$InnerProtected",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor InnerProtected()", "name": "<init>", "desc": "(LPrivateClass;)V"},
-			{"name": "this$0", "desc": "LPrivateClass;"}
-		]
-	},
-	{
-		"declaration": "final inner class InnerPrivate defined in PrivateClass",
-		"visibility": "private",
-		"class": "PrivateClass$InnerPrivate",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor InnerPrivate()", "name": "<init>", "desc": "(LPrivateClass;)V"},
-			{"name": "this$0", "desc": "LPrivateClass;"}
-		]
-	},
-	{
-		"declaration": "companion object defined in PrivateClass",
-		"visibility": "public",
-		"class": "PrivateClass$Companion",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "(Lkotlin/jvm/internal/DefaultConstructorMarker;)V"}
-		]
-	},
-	{
-		"declaration": "final class PrivateClass defined in root package",
-		"visibility": "private",
-		"class": "PrivateClass",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor PrivateClass()", "name": "<init>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "final class PrivateClass", "name": "<clinit>", "desc": "()V"},
-			{"name": "Companion", "desc": "LPrivateClass$Companion;"}
-		]
-	},
-	{
-		"declaration": "companion object defined in PrivateClassInternalCompanion",
-		"visibility": "internal",
-		"class": "PrivateClassInternalCompanion$Companion",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "(Lkotlin/jvm/internal/DefaultConstructorMarker;)V"}
-		]
-	},
-	{
-		"declaration": "final class PrivateClassInternalCompanion defined in root package",
-		"visibility": "private",
-		"class": "PrivateClassInternalCompanion",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor PrivateClassInternalCompanion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "final class PrivateClassInternalCompanion", "name": "<clinit>", "desc": "()V"},
-			{"name": "Companion", "desc": "LPrivateClassInternalCompanion$Companion;"}
-		]
-	},
-	{
-		"declaration": "companion object defined in PrivateClassPrivateCompanion",
-		"visibility": "private",
-		"class": "PrivateClassPrivateCompanion$Companion",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "(Lkotlin/jvm/internal/DefaultConstructorMarker;)V"}
-		]
-	},
-	{
-		"declaration": "final class PrivateClassPrivateCompanion defined in root package",
-		"visibility": "private",
-		"class": "PrivateClassPrivateCompanion",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor PrivateClassPrivateCompanion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "final class PrivateClassPrivateCompanion", "name": "<clinit>", "desc": "()V"},
-			{"name": "Companion", "desc": "LPrivateClassPrivateCompanion$Companion;"}
-		]
-	}
-]
diff --git a/compiler/testData/codegen/dumpDeclarations/classes.kt b/compiler/testData/codegen/dumpDeclarations/classes.kt
deleted file mode 100644
index 60a0ce82e0e..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/classes.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-public class PublicClass {
-
-    companion object {}
-
-    public object ObjPublic
-    internal object ObjInternal
-    protected object ObjProtected
-    private object ObjPrivate
-
-    public class NestedPublic
-    internal class NestedInternal
-    protected class NestedProtected
-    private  class NestedPrivate
-
-    public inner class InnerPublic
-    internal inner class InnerInternal
-    protected inner class InnerProtected
-    private inner class InnerPrivate
-}
-
-internal class InternalClass {
-    companion object {}
-}
-
-internal class InternalClassInternalCompanion {
-    internal companion object {}
-}
-
-internal class InternalClassPrivateCompanion {
-    private companion object {}
-}
-
-private class PrivateClass {
-    companion object {}
-
-    public object ObjPublic
-    internal object ObjInternal
-    protected object ObjProtected
-    private object ObjPrivate
-
-    public class NestedPublic
-    internal class NestedInternal
-    protected class NestedProtected
-    private  class NestedPrivate
-
-    public inner class InnerPublic
-    internal inner class InnerInternal
-    protected inner class InnerProtected
-    private inner class InnerPrivate
-}
-
-private class PrivateClassInternalCompanion {
-    internal companion object
-}
-private class PrivateClassPrivateCompanion {
-    private companion object
-}
-
diff --git a/compiler/testData/codegen/dumpDeclarations/interfaces.json b/compiler/testData/codegen/dumpDeclarations/interfaces.json
deleted file mode 100644
index b9a10a0e879..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/interfaces.json
+++ /dev/null
@@ -1,209 +0,0 @@
-[
-	{
-		"declaration": "object ObjPublic defined in PublicInterface",
-		"visibility": "public",
-		"class": "PublicInterface$ObjPublic",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor ObjPublic()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LPublicInterface$ObjPublic;"},
-			{"visibility": "public",	"declaration": "object ObjPublic", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "object ObjPrivate defined in PublicInterface",
-		"visibility": "private",
-		"class": "PublicInterface$ObjPrivate",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor ObjPrivate()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LPublicInterface$ObjPrivate;"},
-			{"visibility": "private",	"declaration": "object ObjPrivate", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class NestedPublic defined in PublicInterface",
-		"visibility": "public",
-		"class": "PublicInterface$NestedPublic",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor NestedPublic()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class NestedPrivate defined in PublicInterface",
-		"visibility": "private",
-		"class": "PublicInterface$NestedPrivate",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor NestedPrivate()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "interface PublicInterface defined in root package",
-		"visibility": "public",
-		"class": "PublicInterface$DefaultImpls",
-		"members": [
-
-		]
-	},
-	{
-		"declaration": "companion object defined in PublicInterface",
-		"visibility": "public",
-		"class": "PublicInterface$Companion",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "public",	"declaration": "companion object", "name": "$$INSTANCE", "desc": "LPublicInterface$Companion;"},
-			{"visibility": "public",	"declaration": "companion object", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "interface PublicInterface defined in root package",
-		"visibility": "public",
-		"class": "PublicInterface",
-		"members": [
-			{"visibility": "public",	"declaration": "interface PublicInterface", "name": "<clinit>", "desc": "()V"},
-			{"name": "Companion", "desc": "LPublicInterface$Companion;"}
-		]
-	},
-	{
-		"declaration": "interface InternalInterface defined in root package",
-		"visibility": "internal",
-		"class": "InternalInterface$DefaultImpls",
-		"members": [
-
-		]
-	},
-	{
-		"declaration": "companion object defined in InternalInterface",
-		"visibility": "public",
-		"class": "InternalInterface$Companion",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "public",	"declaration": "companion object", "name": "$$INSTANCE", "desc": "LInternalInterface$Companion;"},
-			{"visibility": "public",	"declaration": "companion object", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "interface InternalInterface defined in root package",
-		"visibility": "internal",
-		"class": "InternalInterface",
-		"members": [
-			{"visibility": "internal",	"declaration": "interface InternalInterface", "name": "<clinit>", "desc": "()V"},
-			{"name": "Companion", "desc": "LInternalInterface$Companion;"}
-		]
-	},
-	{
-		"declaration": "interface InternalInterfacePrivateCompanion defined in root package",
-		"visibility": "internal",
-		"class": "InternalInterfacePrivateCompanion$DefaultImpls",
-		"members": [
-
-		]
-	},
-	{
-		"declaration": "companion object defined in InternalInterfacePrivateCompanion",
-		"visibility": "private",
-		"class": "InternalInterfacePrivateCompanion$Companion",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "companion object", "name": "$$INSTANCE", "desc": "LInternalInterfacePrivateCompanion$Companion;"},
-			{"visibility": "private",	"declaration": "companion object", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "interface InternalInterfacePrivateCompanion defined in root package",
-		"visibility": "internal",
-		"class": "InternalInterfacePrivateCompanion",
-		"members": [
-			{"visibility": "internal",	"declaration": "interface InternalInterfacePrivateCompanion", "name": "<clinit>", "desc": "()V"},
-			{"name": "Companion", "desc": "LInternalInterfacePrivateCompanion$Companion;"}
-		]
-	},
-	{
-		"declaration": "object ObjPublic defined in PrivateInterface",
-		"visibility": "public",
-		"class": "PrivateInterface$ObjPublic",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor ObjPublic()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LPrivateInterface$ObjPublic;"},
-			{"visibility": "public",	"declaration": "object ObjPublic", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "object ObjPrivate defined in PrivateInterface",
-		"visibility": "private",
-		"class": "PrivateInterface$ObjPrivate",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor ObjPrivate()", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LPrivateInterface$ObjPrivate;"},
-			{"visibility": "private",	"declaration": "object ObjPrivate", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class NestedPublic defined in PrivateInterface",
-		"visibility": "public",
-		"class": "PrivateInterface$NestedPublic",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor NestedPublic()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class NestedPrivate defined in PrivateInterface",
-		"visibility": "private",
-		"class": "PrivateInterface$NestedPrivate",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor NestedPrivate()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "interface PrivateInterface defined in root package",
-		"visibility": "private",
-		"class": "PrivateInterface$DefaultImpls",
-		"members": [
-
-		]
-	},
-	{
-		"declaration": "companion object defined in PrivateInterface",
-		"visibility": "public",
-		"class": "PrivateInterface$Companion",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "public",	"declaration": "companion object", "name": "$$INSTANCE", "desc": "LPrivateInterface$Companion;"},
-			{"visibility": "public",	"declaration": "companion object", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "interface PrivateInterface defined in root package",
-		"visibility": "private",
-		"class": "PrivateInterface",
-		"members": [
-			{"visibility": "private",	"declaration": "interface PrivateInterface", "name": "<clinit>", "desc": "()V"},
-			{"name": "Companion", "desc": "LPrivateInterface$Companion;"}
-		]
-	},
-	{
-		"declaration": "interface PrivateInterfacePrivateCompanion defined in root package",
-		"visibility": "private",
-		"class": "PrivateInterfacePrivateCompanion$DefaultImpls",
-		"members": [
-
-		]
-	},
-	{
-		"declaration": "companion object defined in PrivateInterfacePrivateCompanion",
-		"visibility": "private",
-		"class": "PrivateInterfacePrivateCompanion$Companion",
-		"members": [
-			{"visibility": "private",	"declaration": "constructor Companion()", "name": "<init>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "companion object", "name": "$$INSTANCE", "desc": "LPrivateInterfacePrivateCompanion$Companion;"},
-			{"visibility": "private",	"declaration": "companion object", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "interface PrivateInterfacePrivateCompanion defined in root package",
-		"visibility": "private",
-		"class": "PrivateInterfacePrivateCompanion",
-		"members": [
-			{"visibility": "private",	"declaration": "interface PrivateInterfacePrivateCompanion", "name": "<clinit>", "desc": "()V"},
-			{"name": "Companion", "desc": "LPrivateInterfacePrivateCompanion$Companion;"}
-		]
-	}
-]
diff --git a/compiler/testData/codegen/dumpDeclarations/interfaces.kt b/compiler/testData/codegen/dumpDeclarations/interfaces.kt
deleted file mode 100644
index b2c524f0ad1..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/interfaces.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-public interface PublicInterface {
-
-    companion object {}
-
-    public object ObjPublic
-    private object ObjPrivate
-
-    public class NestedPublic
-    private  class NestedPrivate
-}
-
-internal interface InternalInterface {
-    companion object {}
-}
-
-internal interface InternalInterfacePrivateCompanion {
-    private companion object {}
-}
-
-private interface PrivateInterface {
-    companion object {}
-
-    public object ObjPublic
-    private object ObjPrivate
-
-    public class NestedPublic
-    private class NestedPrivate
-}
-
-private interface PrivateInterfacePrivateCompanion {
-    private companion object
-}
diff --git a/compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.json b/compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.json
deleted file mode 100644
index 51933666904..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.json
+++ /dev/null
@@ -1,44 +0,0 @@
-[
-	{
-		"declaration": "abstract class C<V> : B<V> defined in root package",
-		"visibility": "public",
-		"class": "C",
-		"members": [
-			{"visibility": "public",	"declaration": "open suspend fun foo(): V", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"},
-			{"visibility": "public",	"declaration": "open suspend fun foo(): V", "name": "foo$suspendImpl", "desc": "(LC;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"},
-			{"visibility": "public",	"declaration": "constructor C<V>()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "interface B<K> : A<K> defined in root package",
-		"visibility": "public",
-		"class": "B$DefaultImpls",
-		"members": [
-
-		]
-	},
-	{
-		"declaration": "interface B<K> : A<K> defined in root package",
-		"visibility": "public",
-		"class": "B",
-		"members": [
-
-		]
-	},
-	{
-		"declaration": "interface A<T> defined in root package",
-		"visibility": "public",
-		"class": "A$DefaultImpls",
-		"members": [
-
-		]
-	},
-	{
-		"declaration": "interface A<T> defined in root package",
-		"visibility": "public",
-		"class": "A",
-		"members": [
-			{"visibility": "public",	"declaration": "abstract suspend fun foo(): T", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"}
-		]
-	}
-]
diff --git a/compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.kt b/compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.kt
deleted file mode 100644
index 3da7b73e55c..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// WITH_STDLIB
-interface A<T> {
-    suspend fun foo(): T
-}
-
-interface B<K> : A<K>
-
-abstract class C<V> : B<V> {
-    override suspend fun foo(): V = TODO()
-}
diff --git a/compiler/testData/codegen/dumpDeclarations/localClasses.json b/compiler/testData/codegen/dumpDeclarations/localClasses.json
deleted file mode 100644
index 5cf09495a00..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/localClasses.json
+++ /dev/null
@@ -1,89 +0,0 @@
-[
-	{
-		"declaration": "final inner class C defined in A.a.B",
-		"visibility": "local",
-		"class": "A$a$B$C",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor C()", "name": "<init>", "desc": "(LA$a$B;)V"},
-			{"name": "this$0", "desc": "LA$a$B;"}
-		]
-	},
-	{
-		"declaration": "final class B defined in A.a",
-		"visibility": "local",
-		"class": "A$a$B",
-		"members": [
-			{"visibility": "public",	"declaration": "final fun s(): kotlin.String", "name": "s", "desc": "()Ljava/lang/String;"},
-			{"visibility": "public",	"declaration": "constructor B()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class A defined in root package",
-		"visibility": "public",
-		"class": "A",
-		"members": [
-			{"visibility": "public",	"declaration": "final fun a(): kotlin.String", "name": "a", "desc": "()Ljava/lang/String;"},
-			{"visibility": "public",	"declaration": "constructor A()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class B defined in B.a",
-		"visibility": "local",
-		"class": "B$a$B",
-		"members": [
-			{"visibility": "public",	"declaration": "final fun s(): kotlin.String", "name": "s", "desc": "()Ljava/lang/String;"},
-			{"visibility": "public",	"declaration": "constructor B()", "name": "<init>", "desc": "(Ljava/lang/String;)V"},
-			{"name": "$p", "desc": "Ljava/lang/String;"}
-		]
-	},
-	{
-		"declaration": "final class B defined in root package",
-		"visibility": "public",
-		"class": "B",
-		"members": [
-			{"visibility": "public",	"declaration": "final fun a(p: kotlin.String): kotlin.String", "name": "a", "desc": "(Ljava/lang/String;)Ljava/lang/String;"},
-			{"visibility": "public",	"declaration": "constructor B()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final fun `<anonymous>`(): kotlin.Unit defined in L.b",
-		"visibility": "local",
-		"class": "L$b$1",
-		"members": [
-			{"visibility": "local",	"declaration": "final fun `<anonymous>`(): kotlin.Unit", "name": "invoke", "desc": "()Ljava/lang/Object;"},
-			{"visibility": "local",	"declaration": "final fun `<anonymous>`(): kotlin.Unit", "name": "invoke", "desc": "()V"},
-			{"visibility": "local",	"declaration": "final fun `<anonymous>`(): kotlin.Unit", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LL$b$1;"},
-			{"visibility": "public",	"declaration": "final class `<closure-L$b$1>` : kotlin.jvm.internal.Lambda, () -> kotlin.Unit", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class L defined in root package",
-		"visibility": "public",
-		"class": "L",
-		"members": [
-			{"visibility": "public",	"declaration": "final fun a(lambda: () -> kotlin.Unit): kotlin.Unit", "name": "a", "desc": "(Lkotlin/jvm/functions/Function0;)V"},
-			{"visibility": "public",	"declaration": "final inline fun b(): kotlin.Unit", "name": "b", "desc": "()V"},
-			{"visibility": "public",	"declaration": "constructor L()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final fun `<anonymous>`(): kotlin.Unit defined in L.b",
-		"visibility": "local",
-		"class": "L$b$1",
-		"members": [
-			{"visibility": "local",	"declaration": "final fun `<anonymous>`(): kotlin.Unit", "name": "invoke", "desc": "()Ljava/lang/Object;"},
-			{"visibility": "local",	"declaration": "final fun `<anonymous>`(): kotlin.Unit", "name": "invoke", "desc": "()V"},
-			{"visibility": "local",	"declaration": "final fun `<anonymous>`(): kotlin.Unit", "name": "<init>", "desc": "()V"},
-			{"name": "INSTANCE", "desc": "LL$b$1;"},
-			{"visibility": "public",	"declaration": "final class `<closure-L$b$1>` : kotlin.jvm.internal.Lambda, () -> kotlin.Unit", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "package-fragment",
-		"class": "Part2Kt",
-		"members": [
-			{"visibility": "public",	"declaration": "fun box(): kotlin.Unit", "name": "box", "desc": "()V"}
-		]
-	}
-]
diff --git a/compiler/testData/codegen/dumpDeclarations/localClasses.kt b/compiler/testData/codegen/dumpDeclarations/localClasses.kt
deleted file mode 100644
index 3604ae5eeef..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/localClasses.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-// WITH_STDLIB
-// FILE: Part1.kt
-class A {
-    fun a() : String {
-        class B() {
-            fun s() : String = "OK"
-
-            inner class C {}
-
-        }
-        return B().s()
-    }
-}
-
-
-class B {
-    fun a(p: String) : String {
-        class B() {
-            fun s() : String = p
-        }
-        return B().s()
-    }
-}
-
-class L {
-    fun a(lambda: () -> Unit) = lambda()
-
-    inline fun b() {
-        a {
-            println("OK")
-        }
-    }
-
-}
-
-// FILE: Part2.kt
-fun box() {
-    L().b()
-}
diff --git a/compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.json b/compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.json
deleted file mode 100644
index 1a1578a3b20..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-	{
-		"declaration": "package-fragment",
-		"class": "MultifileFacade__Part1Kt",
-		"members": [
-			{"visibility": "public",	"declaration": "val publicVal: kotlin.Int", "name": "publicVal", "desc": "I"},
-			{"visibility": "public",	"declaration": "fun `<get-publicVal>`(): kotlin.Int", "name": "getPublicVal", "desc": "()I"},
-			{"visibility": "public",	"declaration": "var publicVar: kotlin.Int", "name": "publicVar", "desc": "I"},
-			{"visibility": "public",	"declaration": "fun `<get-publicVar>`(): kotlin.Int", "name": "getPublicVar", "desc": "()I"},
-			{"visibility": "public",	"declaration": "fun `<set-publicVar>`(`<set-?>`: kotlin.Int): kotlin.Unit", "name": "setPublicVar", "desc": "(I)V"},
-			{"visibility": "internal",	"declaration": "val internalVal: kotlin.Long", "name": "internalVal", "desc": "J"},
-			{"visibility": "internal",	"declaration": "fun `<get-internalVal>`(): kotlin.Long", "name": "getInternalVal", "desc": "()J"},
-			{"visibility": "internal",	"declaration": "var internalVar: kotlin.Long", "name": "internalVar", "desc": "J"},
-			{"visibility": "internal",	"declaration": "fun `<get-internalVar>`(): kotlin.Long", "name": "getInternalVar", "desc": "()J"},
-			{"visibility": "internal",	"declaration": "fun `<set-internalVar>`(`<set-?>`: kotlin.Long): kotlin.Unit", "name": "setInternalVar", "desc": "(J)V"},
-			{"visibility": "private",	"declaration": "val privateVal: kotlin.Any?", "name": "privateVal", "desc": "Ljava/lang/Object;"},
-			{"visibility": "private",	"declaration": "fun `<get-privateVal>`(): kotlin.Any?", "name": "getPrivateVal$MultifileFacade__Part1Kt", "desc": "()Ljava/lang/Object;"},
-			{"visibility": "private",	"declaration": "var privateVar: kotlin.Any?", "name": "privateVar", "desc": "Ljava/lang/Object;"},
-			{"visibility": "private",	"declaration": "fun `<get-privateVar>`(): kotlin.Any?", "name": "getPrivateVar$MultifileFacade__Part1Kt", "desc": "()Ljava/lang/Object;"},
-			{"visibility": "private",	"declaration": "fun `<set-privateVar>`(`<set-?>`: kotlin.Any?): kotlin.Unit", "name": "setPrivateVar$MultifileFacade__Part1Kt", "desc": "(Ljava/lang/Object;)V"},
-			{"declaration": "package-fragment", "name": "<clinit>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class PrivateClass defined in root package",
-		"visibility": "private",
-		"class": "PrivateClass",
-		"members": [
-			{"visibility": "internal",	"declaration": "final fun accessUsage(): kotlin.Unit", "name": "accessUsage$test_module", "desc": "()V"},
-			{"visibility": "public",	"declaration": "constructor PrivateClass()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "package-fragment",
-		"class": "MultifileFacade__Part2Kt",
-		"members": [
-			{"visibility": "private",	"declaration": "const val privateConst: kotlin.Int", "name": "privateConst", "desc": "I"},
-			{"visibility": "public",	"declaration": "fun publicFun(): kotlin.Unit", "name": "publicFun", "desc": "()V"},
-			{"visibility": "internal",	"declaration": "fun internalFun(param1: kotlin.Int): kotlin.Unit", "name": "internalFun", "desc": "(I)V"},
-			{"visibility": "private",	"declaration": "fun privateFun(x: kotlin.Any): kotlin.Unit", "name": "privateFun$MultifileFacade__Part2Kt", "desc": "(Ljava/lang/Object;)V"},
-			{"visibility": "private",	"declaration": "fun privateFun(x: kotlin.Any): kotlin.Unit", "name": "access$privateFun", "desc": "(Ljava/lang/Object;)V"}
-		]
-	},
-	{
-		"declaration": "package-fragment",
-		"class": "MultifileFacade",
-		"members": [
-			{"visibility": "internal",	"declaration": "const val internalConst: kotlin.Int", "name": "internalConst", "desc": "I"},
-			{"visibility": "internal",	"declaration": "fun `<get-internalVal>`(): kotlin.Long", "name": "getInternalVal", "desc": "()J"},
-			{"visibility": "internal",	"declaration": "fun `<get-internalVar>`(): kotlin.Long", "name": "getInternalVar", "desc": "()J"},
-			{"visibility": "internal",	"declaration": "fun `<set-internalVar>`(`<set-?>`: kotlin.Long): kotlin.Unit", "name": "setInternalVar", "desc": "(J)V"},
-			{"visibility": "public",	"declaration": "const val publicConst: kotlin.Int", "name": "publicConst", "desc": "I"},
-			{"visibility": "public",	"declaration": "fun `<get-publicVal>`(): kotlin.Int", "name": "getPublicVal", "desc": "()I"},
-			{"visibility": "public",	"declaration": "fun `<get-publicVar>`(): kotlin.Int", "name": "getPublicVar", "desc": "()I"},
-			{"visibility": "public",	"declaration": "fun `<set-publicVar>`(`<set-?>`: kotlin.Int): kotlin.Unit", "name": "setPublicVar", "desc": "(I)V"},
-			{"visibility": "internal",	"declaration": "fun internalFun(param1: kotlin.Int): kotlin.Unit", "name": "internalFun", "desc": "(I)V"},
-			{"visibility": "public",	"declaration": "fun publicFun(): kotlin.Unit", "name": "publicFun", "desc": "()V"}
-		]
-	}
-]
diff --git a/compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.kt b/compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.kt
deleted file mode 100644
index e446ab5d6c4..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-// WITH_STDLIB
-// FILE: Part1.kt
-@file:kotlin.jvm.JvmMultifileClass
-@file:kotlin.jvm.JvmName("MultifileFacade")
-// properties
-
-public val publicVal: Int = 1
-public var publicVar: Int = 1
-internal val internalVal: Long = 1
-internal var internalVar: Long = 1
-private val privateVal: Any? = 1
-private var privateVar: Any? = 1
-
-//// fields
-//@JvmField public val publicValField: Int = 1
-//@JvmField public var publicVarField: Int = 1
-//@JvmField internal val internalValField: Long = 1
-//@JvmField internal var internalVarField: Long = 1
-
-
-// FILE: Part2.kt
-@file:kotlin.jvm.JvmMultifileClass
-@file:kotlin.jvm.JvmName("MultifileFacade")
-
-// constants
-
-public const val publicConst: Int = 2
-internal const val internalConst: Int = 3
-private const val privateConst: Int = 4
-
-// fun
-
-public fun publicFun() {}
-internal fun internalFun(param1: Int) {}
-private fun privateFun(x: Any) {}
-
-
-private class PrivateClass {
-    internal fun accessUsage() {
-        privateFun(privateConst)
-    }
-
-}
diff --git a/compiler/testData/codegen/dumpDeclarations/suspendLambda.json b/compiler/testData/codegen/dumpDeclarations/suspendLambda.json
deleted file mode 100644
index 1289af5e879..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/suspendLambda.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-	{
-		"declaration": "final suspend fun kotlin.Any.`<anonymous>`(): kotlin.Unit defined in invokeCoroutineBuilder",
-		"visibility": "local",
-		"class": "SuspendLambdaKt$invokeCoroutineBuilder$1",
-		"members": [
-			{"visibility": "local",	"declaration": "<this>", "name": "L$0", "desc": "Ljava/lang/Object;"},
-			{"name": "invokeSuspend", "desc": "(Ljava/lang/Object;)Ljava/lang/Object;"},
-			{"visibility": "local",	"declaration": "final suspend fun kotlin.Any.`<anonymous>`(): kotlin.Unit", "name": "<init>", "desc": "(Lkotlin/coroutines/Continuation;)V"},
-			{"name": "label", "desc": "I"},
-			{"name": "create", "desc": "(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;"},
-			{"visibility": "local",	"declaration": "final suspend fun kotlin.Any.`<anonymous>`(): kotlin.Unit", "name": "invoke", "desc": "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"}
-		]
-	},
-	{
-		"declaration": "package-fragment",
-		"class": "SuspendLambdaKt",
-		"members": [
-			{"visibility": "public",	"declaration": "fun invokeCoroutineBuilder(): kotlin.Unit", "name": "invokeCoroutineBuilder", "desc": "()V"},
-			{"visibility": "public",	"declaration": "fun buildCoroutine(builderAction: suspend kotlin.Any.() -> kotlin.Unit): kotlin.Unit", "name": "buildCoroutine", "desc": "(Lkotlin/jvm/functions/Function2;)V"}
-		]
-	}
-]
diff --git a/compiler/testData/codegen/dumpDeclarations/suspendLambda.kt b/compiler/testData/codegen/dumpDeclarations/suspendLambda.kt
deleted file mode 100644
index d836683cd71..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/suspendLambda.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// WITH_STDLIB
-public fun invokeCoroutineBuilder() {
-    return buildCoroutine {
-        println(this)
-    }
-}
-
-public fun buildCoroutine(builderAction: suspend Any.() -> Unit) {
-
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/dumpDeclarations/suspendOverride.json b/compiler/testData/codegen/dumpDeclarations/suspendOverride.json
deleted file mode 100644
index d5585faba87..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/suspendOverride.json
+++ /dev/null
@@ -1,44 +0,0 @@
-[
-	{
-		"declaration": "final class B : A defined in root package",
-		"visibility": "public",
-		"class": "B",
-		"members": [
-			{"visibility": "public",	"declaration": "open suspend fun foo(): kotlin.Boolean", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"},
-			{"visibility": "public",	"declaration": "constructor B()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "final class D : C, A defined in root package",
-		"visibility": "public",
-		"class": "D",
-		"members": [
-			{"visibility": "public",	"declaration": "constructor D()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "interface A defined in root package",
-		"visibility": "public",
-		"class": "A$DefaultImpls",
-		"members": [
-
-		]
-	},
-	{
-		"declaration": "interface A defined in root package",
-		"visibility": "public",
-		"class": "A",
-		"members": [
-			{"visibility": "public",	"declaration": "abstract suspend fun foo(): kotlin.Boolean", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"}
-		]
-	},
-	{
-		"declaration": "open class C defined in root package",
-		"visibility": "public",
-		"class": "C",
-		"members": [
-			{"visibility": "public",	"declaration": "final suspend fun foo(): kotlin.Boolean", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"},
-			{"visibility": "public",	"declaration": "constructor C()", "name": "<init>", "desc": "()V"}
-		]
-	}
-]
diff --git a/compiler/testData/codegen/dumpDeclarations/suspendOverride.kt b/compiler/testData/codegen/dumpDeclarations/suspendOverride.kt
deleted file mode 100644
index 5a54c6e9d52..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/suspendOverride.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// WITH_STDLIB
-interface A {
-    suspend fun foo(): Boolean
-}
-
-class B : A {
-    suspend override fun foo(): Boolean = true
-}
-
-open class C {
-    suspend fun foo(): Boolean = true
-}
-
-class D : C(), A
diff --git a/compiler/testData/codegen/dumpDeclarations/topLevelMembers.json b/compiler/testData/codegen/dumpDeclarations/topLevelMembers.json
deleted file mode 100644
index 1345ccfd942..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/topLevelMembers.json
+++ /dev/null
@@ -1,48 +0,0 @@
-[
-	{
-		"declaration": "final class PrivateClass defined in root package",
-		"visibility": "private",
-		"class": "PrivateClass",
-		"members": [
-			{"visibility": "internal",	"declaration": "final fun accessUsage(): kotlin.Unit", "name": "accessUsage$test_module", "desc": "()V"},
-			{"visibility": "public",	"declaration": "constructor PrivateClass()", "name": "<init>", "desc": "()V"}
-		]
-	},
-	{
-		"declaration": "package-fragment",
-		"class": "TopLevelMembersKt",
-		"members": [
-			{"visibility": "public",	"declaration": "val publicVal: kotlin.Int", "name": "publicVal", "desc": "I"},
-			{"visibility": "public",	"declaration": "fun `<get-publicVal>`(): kotlin.Int", "name": "getPublicVal", "desc": "()I"},
-			{"visibility": "public",	"declaration": "var publicVar: kotlin.Int", "name": "publicVar", "desc": "I"},
-			{"visibility": "public",	"declaration": "fun `<get-publicVar>`(): kotlin.Int", "name": "getPublicVar", "desc": "()I"},
-			{"visibility": "public",	"declaration": "fun `<set-publicVar>`(`<set-?>`: kotlin.Int): kotlin.Unit", "name": "setPublicVar", "desc": "(I)V"},
-			{"visibility": "internal",	"declaration": "val internalVal: kotlin.Long", "name": "internalVal", "desc": "J"},
-			{"visibility": "internal",	"declaration": "fun `<get-internalVal>`(): kotlin.Long", "name": "getInternalVal", "desc": "()J"},
-			{"visibility": "internal",	"declaration": "var internalVar: kotlin.Long", "name": "internalVar", "desc": "J"},
-			{"visibility": "internal",	"declaration": "fun `<get-internalVar>`(): kotlin.Long", "name": "getInternalVar", "desc": "()J"},
-			{"visibility": "internal",	"declaration": "fun `<set-internalVar>`(`<set-?>`: kotlin.Long): kotlin.Unit", "name": "setInternalVar", "desc": "(J)V"},
-			{"visibility": "private",	"declaration": "val privateVal: kotlin.Any?", "name": "privateVal", "desc": "Ljava/lang/Object;"},
-			{"visibility": "private",	"declaration": "var privateVar: kotlin.Any?", "name": "privateVar", "desc": "Ljava/lang/Object;"},
-			{"visibility": "public",	"declaration": "val publicValField: kotlin.Int", "name": "publicValField", "desc": "I"},
-			{"visibility": "public",	"declaration": "var publicVarField: kotlin.Int", "name": "publicVarField", "desc": "I"},
-			{"visibility": "internal",	"declaration": "val internalValField: kotlin.Long", "name": "internalValField", "desc": "J"},
-			{"visibility": "internal",	"declaration": "var internalVarField: kotlin.Long", "name": "internalVarField", "desc": "J"},
-			{"visibility": "public",	"declaration": "const val publicConst: kotlin.Int", "name": "publicConst", "desc": "I"},
-			{"visibility": "internal",	"declaration": "const val internalConst: kotlin.Int", "name": "internalConst", "desc": "I"},
-			{"visibility": "private",	"declaration": "const val privateConst: kotlin.Int", "name": "privateConst", "desc": "I"},
-			{"visibility": "public",	"declaration": "fun publicFun(): kotlin.Unit", "name": "publicFun", "desc": "()V"},
-			{"visibility": "internal",	"declaration": "fun internalFun(param1: kotlin.Int): kotlin.Unit", "name": "internalFun", "desc": "(I)V"},
-			{"visibility": "private",	"declaration": "fun privateFun(x: kotlin.Any?): kotlin.Unit", "name": "privateFun", "desc": "(Ljava/lang/Object;)V"},
-			{"visibility": "internal",	"declaration": "fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads", "desc": "(Ljava/lang/String;Ljava/lang/Long;)V"},
-			{"visibility": "internal",	"declaration": "fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$default", "desc": "(Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)V"},
-			{"visibility": "internal",	"declaration": "fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads", "desc": "(Ljava/lang/String;)V"},
-			{"visibility": "internal",	"declaration": "fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads", "desc": "()V"},
-			{"declaration": "package-fragment", "name": "<clinit>", "desc": "()V"},
-			{"visibility": "private",	"declaration": "fun privateFun(x: kotlin.Any?): kotlin.Unit", "name": "access$privateFun", "desc": "(Ljava/lang/Object;)V"},
-			{"visibility": "private",	"declaration": "fun `<get-privateVal>`(): kotlin.Any?", "name": "access$getPrivateVal$p", "desc": "()Ljava/lang/Object;"},
-			{"visibility": "private",	"declaration": "fun `<get-privateVar>`(): kotlin.Any?", "name": "access$getPrivateVar$p", "desc": "()Ljava/lang/Object;"},
-			{"visibility": "private",	"declaration": "fun `<set-privateVar>`(`<set-?>`: kotlin.Any?): kotlin.Unit", "name": "access$setPrivateVar$p", "desc": "(Ljava/lang/Object;)V"}
-		]
-	}
-]
diff --git a/compiler/testData/codegen/dumpDeclarations/topLevelMembers.kt b/compiler/testData/codegen/dumpDeclarations/topLevelMembers.kt
deleted file mode 100644
index 1e60e6fc29f..00000000000
--- a/compiler/testData/codegen/dumpDeclarations/topLevelMembers.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-// WITH_STDLIB
-// properties
-
-public val publicVal: Int = 1
-public var publicVar: Int = 1
-internal val internalVal: Long = 1
-internal var internalVar: Long = 1
-private val privateVal: Any? = 1
-private var privateVar: Any? = 1
-
-// fields
-@JvmField public val publicValField: Int = 1
-@JvmField public var publicVarField: Int = 1
-@JvmField internal val internalValField: Long = 1
-@JvmField internal var internalVarField: Long = 1
-
-// constants
-
-public const val publicConst: Int = 2
-internal const val internalConst: Int = 3
-private const val privateConst: Int = 4
-
-// fun
-
-public fun publicFun() {}
-internal fun internalFun(param1: Int) {}
-private fun privateFun(x: Any?) {}
-
-@JvmOverloads
-internal fun internalOverloads(a: String = "", b: Long? = null) {}
-
-
-private class PrivateClass {
-    internal fun accessUsage() {
-        privateFun(privateVal)
-        privateFun(privateVar)
-        privateFun(privateConst)
-    }
-
-}
\ No newline at end of file
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestRestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestRestGenerated.java
index d99790ab3dc..41cfd7371b8 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestRestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestRestGenerated.java
@@ -15821,76 +15821,6 @@ public class JvmAbiConsistencyTestRestGenerated extends AbstractJvmAbiConsistenc
         }
     }
 
-    @Nested
-    @TestMetadata("compiler/testData/codegen/dumpDeclarations")
-    @TestDataPath("$PROJECT_ROOT")
-    public class DumpDeclarations {
-        @Test
-        public void testAllFilesPresentInDumpDeclarations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/dumpDeclarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-        }
-
-        @Test
-        @TestMetadata("annotation.kt")
-        public void testAnnotation() throws Exception {
-            runTest("compiler/testData/codegen/dumpDeclarations/annotation.kt");
-        }
-
-        @Test
-        @TestMetadata("classMembers.kt")
-        public void testClassMembers() throws Exception {
-            runTest("compiler/testData/codegen/dumpDeclarations/classMembers.kt");
-        }
-
-        @Test
-        @TestMetadata("classes.kt")
-        public void testClasses() throws Exception {
-            runTest("compiler/testData/codegen/dumpDeclarations/classes.kt");
-        }
-
-        @Test
-        @TestMetadata("interfaces.kt")
-        public void testInterfaces() throws Exception {
-            runTest("compiler/testData/codegen/dumpDeclarations/interfaces.kt");
-        }
-
-        @Test
-        @TestMetadata("intermediateAbstractSuspendFunction.kt")
-        public void testIntermediateAbstractSuspendFunction() throws Exception {
-            runTest("compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.kt");
-        }
-
-        @Test
-        @TestMetadata("localClasses.kt")
-        public void testLocalClasses() throws Exception {
-            runTest("compiler/testData/codegen/dumpDeclarations/localClasses.kt");
-        }
-
-        @Test
-        @TestMetadata("multifileFacadeMembers.kt")
-        public void testMultifileFacadeMembers() throws Exception {
-            runTest("compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.kt");
-        }
-
-        @Test
-        @TestMetadata("suspendLambda.kt")
-        public void testSuspendLambda() throws Exception {
-            runTest("compiler/testData/codegen/dumpDeclarations/suspendLambda.kt");
-        }
-
-        @Test
-        @TestMetadata("suspendOverride.kt")
-        public void testSuspendOverride() throws Exception {
-            runTest("compiler/testData/codegen/dumpDeclarations/suspendOverride.kt");
-        }
-
-        @Test
-        @TestMetadata("topLevelMembers.kt")
-        public void testTopLevelMembers() throws Exception {
-            runTest("compiler/testData/codegen/dumpDeclarations/topLevelMembers.kt");
-        }
-    }
-
     @Nested
     @TestMetadata("compiler/testData/codegen/script")
     @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt
deleted file mode 100644
index c47c6429ea7..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.codegen
-
-import org.jetbrains.kotlin.config.CompilerConfiguration
-import org.jetbrains.kotlin.config.JVMConfigurationKeys
-import org.jetbrains.kotlin.test.KotlinTestUtils
-import java.io.File
-
-abstract class AbstractDumpDeclarationsTest : CodegenTestCase() {
-
-    private lateinit var dumpToFile: File
-
-    override fun doMultiFileTest(wholeFile: File, files: List<TestFile>) {
-        val expectedResult = KotlinTestUtils.replaceExtension(wholeFile, "json")
-        dumpToFile = KotlinTestUtils.tmpDirForTest(this).resolve("$name.json")
-        compile(files)
-        classFileFactory.generationState.destroy()
-        KotlinTestUtils.assertEqualsToFile(expectedResult, dumpToFile.readText())
-    }
-
-    override fun updateConfiguration(configuration: CompilerConfiguration) {
-        super.updateConfiguration(configuration)
-        configuration.put(JVMConfigurationKeys.DECLARATIONS_JSON_PATH, dumpToFile.path)
-    }
-}
diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
index d95c33be2cb..d3ad0c2483b 100644
--- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
@@ -130,10 +130,6 @@ fun generateJUnit3CompilerTests(args: Array<String>, mainClassName: String?) {
                 model("codegen/defaultArguments/reflection")
             }
 
-            testClass<AbstractDumpDeclarationsTest> {
-                model("codegen/dumpDeclarations")
-            }
-
             testClass<AbstractLoadJavaTest> {
                 model("loadJava/compiledJava", extension = "java", testMethod = "doTestCompiledJava")
                 model("loadJava/compiledJavaAndKotlin", extension = "txt", testMethod = "doTestCompiledJavaAndKotlin")
diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
index cb11a67a18f..8a1164a6ba8 100644
--- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
@@ -91,7 +91,6 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
                 model("codegen/composeLike")
                 model("codegen/composeLikeBytecodeText")
                 model("codegen/defaultArguments")
-                model("codegen/dumpDeclarations")
                 model("codegen/script", pattern = "^(.*)\\.kts?$", excludedPattern = excludedCustomTestdataPattern)
             }
 
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/DumpDeclarationsTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/DumpDeclarationsTestGenerated.java
deleted file mode 100644
index 006df98c7a5..00000000000
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/DumpDeclarationsTestGenerated.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.codegen;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/codegen/dumpDeclarations")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class DumpDeclarationsTestGenerated extends AbstractDumpDeclarationsTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInDumpDeclarations() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/dumpDeclarations"), Pattern.compile("^(.+)\\.kt$"), null, true);
-    }
-
-    @TestMetadata("annotation.kt")
-    public void testAnnotation() throws Exception {
-        runTest("compiler/testData/codegen/dumpDeclarations/annotation.kt");
-    }
-
-    @TestMetadata("classMembers.kt")
-    public void testClassMembers() throws Exception {
-        runTest("compiler/testData/codegen/dumpDeclarations/classMembers.kt");
-    }
-
-    @TestMetadata("classes.kt")
-    public void testClasses() throws Exception {
-        runTest("compiler/testData/codegen/dumpDeclarations/classes.kt");
-    }
-
-    @TestMetadata("interfaces.kt")
-    public void testInterfaces() throws Exception {
-        runTest("compiler/testData/codegen/dumpDeclarations/interfaces.kt");
-    }
-
-    @TestMetadata("intermediateAbstractSuspendFunction.kt")
-    public void testIntermediateAbstractSuspendFunction() throws Exception {
-        runTest("compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.kt");
-    }
-
-    @TestMetadata("localClasses.kt")
-    public void testLocalClasses() throws Exception {
-        runTest("compiler/testData/codegen/dumpDeclarations/localClasses.kt");
-    }
-
-    @TestMetadata("multifileFacadeMembers.kt")
-    public void testMultifileFacadeMembers() throws Exception {
-        runTest("compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.kt");
-    }
-
-    @TestMetadata("suspendLambda.kt")
-    public void testSuspendLambda() throws Exception {
-        runTest("compiler/testData/codegen/dumpDeclarations/suspendLambda.kt");
-    }
-
-    @TestMetadata("suspendOverride.kt")
-    public void testSuspendOverride() throws Exception {
-        runTest("compiler/testData/codegen/dumpDeclarations/suspendOverride.kt");
-    }
-
-    @TestMetadata("topLevelMembers.kt")
-    public void testTopLevelMembers() throws Exception {
-        runTest("compiler/testData/codegen/dumpDeclarations/topLevelMembers.kt");
-    }
-}
diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
index 5dcad83ea43..ebe97fedf6e 100644
--- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
+++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
@@ -237,7 +237,6 @@ fun CommonCompilerArguments.convertPathsToSystemIndependent() {
             jdkHome = jdkHome?.let(FileUtilRt::toSystemIndependentName)
             kotlinHome = kotlinHome?.let(FileUtilRt::toSystemIndependentName)
             friendPaths?.forEachIndexed { index, s -> friendPaths!![index] = FileUtilRt.toSystemIndependentName(s) }
-            declarationsOutputPath = declarationsOutputPath?.let(FileUtilRt::toSystemIndependentName)
         }
 
         is K2JSCompilerArguments -> {
diff --git a/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt b/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt
index ca8a1144728..266bf3c581f 100644
--- a/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt
+++ b/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt
@@ -180,7 +180,6 @@ class CompilerArgumentsContentProspectorTest {
             K2JVMCompilerArguments::javaModulePath,
             K2JVMCompilerArguments::assertionsMode,
             K2JVMCompilerArguments::buildFile,
-            K2JVMCompilerArguments::declarationsOutputPath,
             K2JVMCompilerArguments::javaPackagePrefix,
             K2JVMCompilerArguments::supportCompatqualCheckerFrameworkAnnotations,
             K2JVMCompilerArguments::jspecifyAnnotations,