diff --git a/build-common/src/org/jetbrains/kotlin/build/BuildMetaInfo.kt b/build-common/src/org/jetbrains/kotlin/build/BuildMetaInfo.kt index 5514684b4e6..8d051eb39f7 100644 --- a/build-common/src/org/jetbrains/kotlin/build/BuildMetaInfo.kt +++ b/build-common/src/org/jetbrains/kotlin/build/BuildMetaInfo.kt @@ -109,7 +109,6 @@ abstract class BuildMetaInfo { "intellijPluginRoot", "kotlinHome", "listPhases", - "namesExcludedFromDumping", "phasesToDump", "phasesToDumpAfter", "phasesToDumpBefore", diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt index b98dcd5d9de..fbbdcef1d73 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt @@ -248,12 +248,6 @@ abstract class CommonCompilerArguments : CommonToolArguments() { ) var phasesToDump: Array? by FreezableVar(null) - @Argument( - value = "-Xexclude-from-dumping", - description = "Names of elements that should not be dumped" - ) - var namesExcludedFromDumping: Array? by FreezableVar(null) - @Argument( value = "-Xdump-directory", description = "Dump backend state into directory" diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/createPhaseConfig.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/createPhaseConfig.kt index df6d01d3947..0d818f370b8 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/createPhaseConfig.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/createPhaseConfig.kt @@ -37,8 +37,6 @@ fun createPhaseConfig( val toValidateStateBefore = beforeValidateSet + bothValidateSet val toValidateStateAfter = afterValidateSet + bothValidateSet - val namesOfElementsExcludedFromDumping = arguments.namesExcludedFromDumping?.toSet() ?: emptySet() - val needProfiling = arguments.profilePhases val checkConditions = arguments.checkPhaseConditions val checkStickyConditions = arguments.checkStickyPhaseConditions @@ -54,7 +52,6 @@ fun createPhaseConfig( dumpOnlyFqName, toValidateStateBefore, toValidateStateAfter, - namesOfElementsExcludedFromDumping, needProfiling, checkConditions, checkStickyConditions diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/PhaseConfig.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/PhaseConfig.kt index a4518384cc0..6f1b7a64968 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/PhaseConfig.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/PhaseConfig.kt @@ -21,7 +21,6 @@ class PhaseConfigBuilder(private val compoundPhase: CompilerPhase<*, *, *>) { var dumpOnlyFqName: String? = null val toValidateStateBefore = mutableSetOf() val toValidateStateAfter = mutableSetOf() - val namesOfElementsExcludedFromDumping = mutableSetOf() var needProfiling = false var checkConditions = false var checkStickyConditions = false @@ -30,7 +29,6 @@ class PhaseConfigBuilder(private val compoundPhase: CompilerPhase<*, *, *>) { compoundPhase, compoundPhase.toPhaseMap(), enabled, verbose, toDumpStateBefore, toDumpStateAfter, dumpToDirectory, dumpOnlyFqName, toValidateStateBefore, toValidateStateAfter, - namesOfElementsExcludedFromDumping, needProfiling, checkConditions, checkStickyConditions ) } @@ -46,7 +44,6 @@ class PhaseConfig( override val dumpOnlyFqName: String? = null, private val toValidateStateBefore: Set = emptySet(), private val toValidateStateAfter: Set = emptySet(), - private val namesOfElementsExcludedFromDumping: Set = emptySet(), override val needProfiling: Boolean = false, override val checkConditions: Boolean = false, override val checkStickyConditions: Boolean = false @@ -60,7 +57,6 @@ class PhaseConfig( it.dumpOnlyFqName = dumpOnlyFqName it.toValidateStateBefore.addAll(toValidateStateBefore) it.toValidateStateAfter.addAll(toValidateStateAfter) - it.namesOfElementsExcludedFromDumping.addAll(namesOfElementsExcludedFromDumping) it.needProfiling = needProfiling it.checkConditions = checkConditions it.checkStickyConditions = checkStickyConditions diff --git a/compiler/testData/cli/js/jsExtraHelp.out b/compiler/testData/cli/js/jsExtraHelp.out index ba3c2819192..60e01ecd86f 100644 --- a/compiler/testData/cli/js/jsExtraHelp.out +++ b/compiler/testData/cli/js/jsExtraHelp.out @@ -90,7 +90,6 @@ where advanced options include: -Xlist-phases List backend phases -Xmetadata-version Change metadata version of the generated binary files -Xmulti-platform Enable experimental language support for multi-platform projects - -Xexclude-from-dumping Names of elements that should not be dumped -Xnew-inference Enable new experimental generic type inference algorithm -Xno-check-actual Do not check presence of 'actual' modifier in multi-platform projects -Xno-inline Disable method inlining diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out index 6c78ff26338..f4f0f6d47db 100644 --- a/compiler/testData/cli/jvm/extraHelp.out +++ b/compiler/testData/cli/jvm/extraHelp.out @@ -196,7 +196,6 @@ where advanced options include: -Xlist-phases List backend phases -Xmetadata-version Change metadata version of the generated binary files -Xmulti-platform Enable experimental language support for multi-platform projects - -Xexclude-from-dumping Names of elements that should not be dumped -Xnew-inference Enable new experimental generic type inference algorithm -Xno-check-actual Do not check presence of 'actual' modifier in multi-platform projects -Xno-inline Disable method inlining diff --git a/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt b/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt index 42546d51900..009c5cd57cc 100644 --- a/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt +++ b/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt @@ -1,12 +1,15 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +/* + * Copyright 2010-2022 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.arguments import org.jetbrains.kotlin.cli.common.arguments.* +import org.junit.Assert.assertEquals import org.junit.Test -import org.junit.Assert.* import kotlin.reflect.KProperty - class CompilerArgumentsContentProspectorTest { @Test @@ -127,7 +130,6 @@ class CompilerArgumentsContentProspectorTest { CommonCompilerArguments::phasesToDumpBefore, CommonCompilerArguments::phasesToDumpAfter, CommonCompilerArguments::phasesToDump, - CommonCompilerArguments::namesExcludedFromDumping, CommonCompilerArguments::phasesToValidateBefore, CommonCompilerArguments::phasesToValidateAfter, CommonCompilerArguments::phasesToValidate,