azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, invert analysis flag that allows unstable dependencies

Browse Source
This commit is contained in:
Alexander Udalov
2020-12-07 21:13:18 +01:00
parent 7d37030095
commit b7d32a8754
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+1 -1
View File
@@ -446,7 +446,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
result[JvmAnalysisFlags.suppressMissingBuiltinsError] = suppressMissingBuiltinsError result[JvmAnalysisFlags.suppressMissingBuiltinsError] = suppressMissingBuiltinsError
result[JvmAnalysisFlags.irCheckLocalNames] = irCheckLocalNames result[JvmAnalysisFlags.irCheckLocalNames] = irCheckLocalNames
result[JvmAnalysisFlags.enableJvmPreview] = enableJvmPreview result[JvmAnalysisFlags.enableJvmPreview] = enableJvmPreview
result[AnalysisFlags.reportErrorsOnIrDependencies] = !useIR && !useFir && !allowJvmIrDependencies result[AnalysisFlags.allowUnstableDependencies] = allowJvmIrDependencies || useIR || useFir
result[JvmAnalysisFlags.disableUltraLightClasses] = disableUltraLightClasses result[JvmAnalysisFlags.disableUltraLightClasses] = disableUltraLightClasses
return result return result
} }
compiler/config/src/org/jetbrains/kotlin/config/AnalysisFlags.kt
+1 -1
View File
@@ -46,7 +46,7 @@ object AnalysisFlags {
val ideMode by AnalysisFlag.Delegates.Boolean val ideMode by AnalysisFlag.Delegates.Boolean
@JvmStatic @JvmStatic
val reportErrorsOnIrDependencies by AnalysisFlag.Delegates.Boolean val allowUnstableDependencies by AnalysisFlag.Delegates.Boolean
@JvmStatic @JvmStatic
val libraryToSourceAnalysis by AnalysisFlag.Delegates.Boolean val libraryToSourceAnalysis by AnalysisFlag.Delegates.Boolean
compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerDeserializationConfiguration.kt
+1 -1
View File
@@ -19,7 +19,7 @@ class CompilerDeserializationConfiguration(languageVersionSettings: LanguageVers
override val reportErrorsOnPreReleaseDependencies = override val reportErrorsOnPreReleaseDependencies =
!skipPrereleaseCheck && !languageVersionSettings.isPreRelease() && !KotlinCompilerVersion.isPreRelease() !skipPrereleaseCheck && !languageVersionSettings.isPreRelease() && !KotlinCompilerVersion.isPreRelease()
override val reportErrorsOnIrDependencies = languageVersionSettings.getFlag(AnalysisFlags.reportErrorsOnIrDependencies) override val allowUnstableDependencies = languageVersionSettings.getFlag(AnalysisFlags.allowUnstableDependencies)
override val typeAliasesAllowed = languageVersionSettings.supportsFeature(LanguageFeature.TypeAliases) override val typeAliasesAllowed = languageVersionSettings.supportsFeature(LanguageFeature.TypeAliases)
core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt
+1 -1
View File
@@ -98,7 +98,7 @@ class DeserializedDescriptorResolver {
classHeader.isPreRelease && classHeader.metadataVersion == KOTLIN_1_3_M1_METADATA_VERSION classHeader.isPreRelease && classHeader.metadataVersion == KOTLIN_1_3_M1_METADATA_VERSION
private val KotlinJvmBinaryClass.isInvisibleJvmIrDependency: Boolean private val KotlinJvmBinaryClass.isInvisibleJvmIrDependency: Boolean
get() = components.configuration.reportErrorsOnIrDependencies && classHeader.isUnstableJvmIrBinary get() = !components.configuration.allowUnstableDependencies && classHeader.isUnstableJvmIrBinary
private fun readData(kotlinClass: KotlinJvmBinaryClass, expectedKinds: Set<KotlinClassHeader.Kind>): Array<String>? { private fun readData(kotlinClass: KotlinJvmBinaryClass, expectedKinds: Set<KotlinClassHeader.Kind>): Array<String>? {
val header = kotlinClass.classHeader val header = kotlinClass.classHeader
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializationConfiguration.kt
+1 -1
View File
@@ -15,7 +15,7 @@ interface DeserializationConfiguration {
val reportErrorsOnPreReleaseDependencies: Boolean val reportErrorsOnPreReleaseDependencies: Boolean
get() = false get() = false
val reportErrorsOnIrDependencies: Boolean val allowUnstableDependencies: Boolean
get() = false get() = false
val typeAliasesAllowed: Boolean val typeAliasesAllowed: Boolean