Cleanup FE analysis flag allowKotlinPackage
It was used to allow custom contracts when compiling stdlib with the Kotlin 1.2 compiler. Since 1.3 compiler is used now, this flag is no longer necessary.
This commit is contained in:
-1
@@ -314,7 +314,6 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
|
||||
return HashMap<AnalysisFlag<*>, Any>().apply {
|
||||
put(AnalysisFlags.skipMetadataVersionCheck, skipMetadataVersionCheck)
|
||||
put(AnalysisFlags.multiPlatformDoNotCheckActual, noCheckActual)
|
||||
put(AnalysisFlags.allowKotlinPackage, allowKotlinPackage)
|
||||
put(AnalysisFlags.experimental, experimental?.toList().orEmpty())
|
||||
put(AnalysisFlags.useExperimental, useExperimental?.toList().orEmpty())
|
||||
put(AnalysisFlags.explicitApiVersion, apiVersion != null)
|
||||
|
||||
@@ -12,9 +12,6 @@ object AnalysisFlags {
|
||||
@JvmStatic
|
||||
val multiPlatformDoNotCheckActual by AnalysisFlag.Delegates.Boolean
|
||||
|
||||
@JvmStatic
|
||||
val allowKotlinPackage by AnalysisFlag.Delegates.Boolean
|
||||
|
||||
@JvmStatic
|
||||
val experimental by AnalysisFlag.Delegates.ListOfStrings
|
||||
|
||||
|
||||
+1
-3
@@ -91,9 +91,7 @@ class ContractParsingServices(val languageVersionSettings: LanguageVersionSettin
|
||||
}
|
||||
|
||||
private fun checkFeatureEnabled(collector: ContractParsingDiagnosticsCollector) {
|
||||
val isFeatureTurnedOn = languageVersionSettings.supportsFeature(LanguageFeature.AllowContractsForCustomFunctions) ||
|
||||
// This condition is here for technical purposes of compiling 1.2-runtime with contracts
|
||||
languageVersionSettings.getFlag(AnalysisFlags.allowKotlinPackage)
|
||||
val isFeatureTurnedOn = languageVersionSettings.supportsFeature(LanguageFeature.AllowContractsForCustomFunctions)
|
||||
if (!isFeatureTurnedOn) {
|
||||
collector.unsupportedFeature(languageVersionSettings)
|
||||
}
|
||||
|
||||
@@ -258,9 +258,7 @@ class FunctionDescriptorResolver(
|
||||
): LazyContractProvider? {
|
||||
if (function !is KtNamedFunction) return null
|
||||
|
||||
val isContractsEnabled = languageVersionSettings.supportsFeature(LanguageFeature.AllowContractsForCustomFunctions) ||
|
||||
// We need to enable contracts if we're compiling "kotlin"-package to be able to ship contracts in stdlib in 1.2
|
||||
languageVersionSettings.getFlag(AnalysisFlags.allowKotlinPackage)
|
||||
val isContractsEnabled = languageVersionSettings.supportsFeature(LanguageFeature.AllowContractsForCustomFunctions)
|
||||
|
||||
if (!isContractsEnabled || !function.mayHaveContract()) return null
|
||||
|
||||
|
||||
Reference in New Issue
Block a user