CLI: remove obsolete -Xbuiltins-from-sources
Looks like it has no effect anymore after 3f2e996803.
This commit is contained in:
committed by
Space Team
parent
2d308e7c27
commit
77dba281a3
-1
@@ -15,7 +15,6 @@ fun copyCommonCompilerArguments(from: CommonCompilerArguments, to: CommonCompile
|
|||||||
to.apiVersion = from.apiVersion
|
to.apiVersion = from.apiVersion
|
||||||
to.autoAdvanceApiVersion = from.autoAdvanceApiVersion
|
to.autoAdvanceApiVersion = from.autoAdvanceApiVersion
|
||||||
to.autoAdvanceLanguageVersion = from.autoAdvanceLanguageVersion
|
to.autoAdvanceLanguageVersion = from.autoAdvanceLanguageVersion
|
||||||
to.builtInsFromSources = from.builtInsFromSources
|
|
||||||
to.checkPhaseConditions = from.checkPhaseConditions
|
to.checkPhaseConditions = from.checkPhaseConditions
|
||||||
to.checkStickyPhaseConditions = from.checkStickyPhaseConditions
|
to.checkStickyPhaseConditions = from.checkStickyPhaseConditions
|
||||||
to.commonSources = from.commonSources?.copyOf()
|
to.commonSources = from.commonSources?.copyOf()
|
||||||
|
|||||||
-11
@@ -573,16 +573,6 @@ Warning: This mode is not backward compatible and might cause compilation errors
|
|||||||
field = value
|
field = value
|
||||||
}
|
}
|
||||||
|
|
||||||
@Argument(
|
|
||||||
value = "-Xbuiltins-from-sources",
|
|
||||||
description = "Compile built-ins from sources."
|
|
||||||
)
|
|
||||||
var builtInsFromSources = false
|
|
||||||
set(value) {
|
|
||||||
checkFrozen()
|
|
||||||
field = value
|
|
||||||
}
|
|
||||||
|
|
||||||
@Argument(
|
@Argument(
|
||||||
value = "-Xexpect-actual-classes",
|
value = "-Xexpect-actual-classes",
|
||||||
description = """'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta.
|
description = """'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta.
|
||||||
@@ -756,7 +746,6 @@ The corresponding calls' declarations may not be marked with @BuilderInference."
|
|||||||
)
|
)
|
||||||
put(AnalysisFlags.extendedCompilerChecks, extendedCompilerChecks)
|
put(AnalysisFlags.extendedCompilerChecks, extendedCompilerChecks)
|
||||||
put(AnalysisFlags.allowKotlinPackage, allowKotlinPackage)
|
put(AnalysisFlags.allowKotlinPackage, allowKotlinPackage)
|
||||||
put(AnalysisFlags.builtInsFromSources, builtInsFromSources)
|
|
||||||
put(AnalysisFlags.muteExpectActualClassesWarning, expectActualClasses)
|
put(AnalysisFlags.muteExpectActualClassesWarning, expectActualClasses)
|
||||||
put(AnalysisFlags.allowFullyQualifiedNameInKClass, true)
|
put(AnalysisFlags.allowFullyQualifiedNameInKClass, true)
|
||||||
put(AnalysisFlags.dontWarnOnErrorSuppression, dontWarnOnErrorSuppression)
|
put(AnalysisFlags.dontWarnOnErrorSuppression, dontWarnOnErrorSuppression)
|
||||||
|
|||||||
@@ -48,9 +48,6 @@ object AnalysisFlags {
|
|||||||
@JvmStatic
|
@JvmStatic
|
||||||
val allowKotlinPackage by AnalysisFlag.Delegates.Boolean
|
val allowKotlinPackage by AnalysisFlag.Delegates.Boolean
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
val builtInsFromSources by AnalysisFlag.Delegates.Boolean
|
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
val muteExpectActualClassesWarning by AnalysisFlag.Delegates.Boolean
|
val muteExpectActualClassesWarning by AnalysisFlag.Delegates.Boolean
|
||||||
|
|
||||||
|
|||||||
-1
@@ -68,7 +68,6 @@ where advanced options include:
|
|||||||
-Xallow-any-scripts-in-source-roots
|
-Xallow-any-scripts-in-source-roots
|
||||||
Allow compiling scripts along with regular Kotlin sources.
|
Allow compiling scripts along with regular Kotlin sources.
|
||||||
-Xallow-kotlin-package Allow compiling code in the 'kotlin' package, and allow not requiring 'kotlin.stdlib' in 'module-info'.
|
-Xallow-kotlin-package Allow compiling code in the 'kotlin' package, and allow not requiring 'kotlin.stdlib' in 'module-info'.
|
||||||
-Xbuiltins-from-sources Compile built-ins from sources.
|
|
||||||
-Xcheck-phase-conditions Check pre- and postconditions of IR lowering phases.
|
-Xcheck-phase-conditions Check pre- and postconditions of IR lowering phases.
|
||||||
-Xcheck-sticky-phase-conditions
|
-Xcheck-sticky-phase-conditions
|
||||||
Run sticky condition checks on subsequent phases. Implicitly enables '-Xcheck-phase-conditions'.
|
Run sticky condition checks on subsequent phases. Implicitly enables '-Xcheck-phase-conditions'.
|
||||||
|
|||||||
-1
@@ -155,7 +155,6 @@ where advanced options include:
|
|||||||
-Xallow-any-scripts-in-source-roots
|
-Xallow-any-scripts-in-source-roots
|
||||||
Allow compiling scripts along with regular Kotlin sources.
|
Allow compiling scripts along with regular Kotlin sources.
|
||||||
-Xallow-kotlin-package Allow compiling code in the 'kotlin' package, and allow not requiring 'kotlin.stdlib' in 'module-info'.
|
-Xallow-kotlin-package Allow compiling code in the 'kotlin' package, and allow not requiring 'kotlin.stdlib' in 'module-info'.
|
||||||
-Xbuiltins-from-sources Compile built-ins from sources.
|
|
||||||
-Xcheck-phase-conditions Check pre- and postconditions of IR lowering phases.
|
-Xcheck-phase-conditions Check pre- and postconditions of IR lowering phases.
|
||||||
-Xcheck-sticky-phase-conditions
|
-Xcheck-sticky-phase-conditions
|
||||||
Run sticky condition checks on subsequent phases. Implicitly enables '-Xcheck-phase-conditions'.
|
Run sticky condition checks on subsequent phases. Implicitly enables '-Xcheck-phase-conditions'.
|
||||||
|
|||||||
+4
-16
@@ -5,8 +5,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.test.runners.ir.interpreter
|
package org.jetbrains.kotlin.test.runners.ir.interpreter
|
||||||
|
|
||||||
import org.jetbrains.kotlin.config.*
|
|
||||||
import org.jetbrains.kotlin.constant.EvaluatedConstTracker
|
|
||||||
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
|
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
|
||||||
import org.jetbrains.kotlin.test.FirParser
|
import org.jetbrains.kotlin.test.FirParser
|
||||||
import org.jetbrains.kotlin.test.TargetBackend
|
import org.jetbrains.kotlin.test.TargetBackend
|
||||||
@@ -16,12 +14,12 @@ import org.jetbrains.kotlin.test.builders.*
|
|||||||
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
|
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
|
||||||
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
|
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
|
||||||
import org.jetbrains.kotlin.test.directives.configureFirParser
|
import org.jetbrains.kotlin.test.directives.configureFirParser
|
||||||
import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
|
import org.jetbrains.kotlin.test.model.BinaryKind
|
||||||
import org.jetbrains.kotlin.test.model.*
|
import org.jetbrains.kotlin.test.model.DependencyKind
|
||||||
|
import org.jetbrains.kotlin.test.model.FrontendKind
|
||||||
|
import org.jetbrains.kotlin.test.model.FrontendKinds
|
||||||
import org.jetbrains.kotlin.test.preprocessors.IrInterpreterImplicitKotlinImports
|
import org.jetbrains.kotlin.test.preprocessors.IrInterpreterImplicitKotlinImports
|
||||||
import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest
|
import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest
|
||||||
import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
|
|
||||||
import org.jetbrains.kotlin.test.services.TestServices
|
|
||||||
import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator
|
import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator
|
||||||
import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurator
|
import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurator
|
||||||
import org.jetbrains.kotlin.test.services.sourceProviders.IrInterpreterHelpersSourceFilesProvider
|
import org.jetbrains.kotlin.test.services.sourceProviders.IrInterpreterHelpersSourceFilesProvider
|
||||||
@@ -38,7 +36,6 @@ open class AbstractIrInterpreterTest(
|
|||||||
|
|
||||||
useConfigurators(
|
useConfigurators(
|
||||||
::CommonEnvironmentConfigurator,
|
::CommonEnvironmentConfigurator,
|
||||||
::IrInterpreterEnvironmentConfigurator,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
firFrontendStep()
|
firFrontendStep()
|
||||||
@@ -89,12 +86,3 @@ abstract class AbstractJvmIrInterpreterAfterFir2IrTestBase(val parser: FirParser
|
|||||||
open class AbstractJvmIrInterpreterAfterFirPsi2IrTest : AbstractJvmIrInterpreterAfterFir2IrTestBase(FirParser.Psi)
|
open class AbstractJvmIrInterpreterAfterFirPsi2IrTest : AbstractJvmIrInterpreterAfterFir2IrTestBase(FirParser.Psi)
|
||||||
|
|
||||||
open class AbstractJvmIrInterpreterAfterPsi2IrTest : AbstractJvmIrInterpreterTest(FrontendKinds.ClassicFrontend)
|
open class AbstractJvmIrInterpreterAfterPsi2IrTest : AbstractJvmIrInterpreterTest(FrontendKinds.ClassicFrontend)
|
||||||
|
|
||||||
class IrInterpreterEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) {
|
|
||||||
override fun provideAdditionalAnalysisFlags(
|
|
||||||
directives: RegisteredDirectives,
|
|
||||||
languageVersion: LanguageVersion
|
|
||||||
): Map<AnalysisFlag<*>, Any?> {
|
|
||||||
return mapOf(AnalysisFlags.builtInsFromSources to true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user