Remove -Xexclude-from-dumping
Apparently the underlying logic was removed in b07690fccf and no one
noticed.
This commit is contained in:
committed by
Space Team
parent
6db0aaef35
commit
3f2b51151f
@@ -109,7 +109,6 @@ abstract class BuildMetaInfo {
|
||||
"intellijPluginRoot",
|
||||
"kotlinHome",
|
||||
"listPhases",
|
||||
"namesExcludedFromDumping",
|
||||
"phasesToDump",
|
||||
"phasesToDumpAfter",
|
||||
"phasesToDumpBefore",
|
||||
|
||||
-6
@@ -248,12 +248,6 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
|
||||
)
|
||||
var phasesToDump: Array<String>? by FreezableVar(null)
|
||||
|
||||
@Argument(
|
||||
value = "-Xexclude-from-dumping",
|
||||
description = "Names of elements that should not be dumped"
|
||||
)
|
||||
var namesExcludedFromDumping: Array<String>? by FreezableVar(null)
|
||||
|
||||
@Argument(
|
||||
value = "-Xdump-directory",
|
||||
description = "Dump backend state into directory"
|
||||
|
||||
@@ -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
|
||||
|
||||
-4
@@ -21,7 +21,6 @@ class PhaseConfigBuilder(private val compoundPhase: CompilerPhase<*, *, *>) {
|
||||
var dumpOnlyFqName: String? = null
|
||||
val toValidateStateBefore = mutableSetOf<AnyNamedPhase>()
|
||||
val toValidateStateAfter = mutableSetOf<AnyNamedPhase>()
|
||||
val namesOfElementsExcludedFromDumping = mutableSetOf<String>()
|
||||
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<AnyNamedPhase> = emptySet(),
|
||||
private val toValidateStateAfter: Set<AnyNamedPhase> = emptySet(),
|
||||
private val namesOfElementsExcludedFromDumping: Set<String> = 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
|
||||
|
||||
-1
@@ -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
|
||||
|
||||
-1
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user