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

[CHERRY PICKED FROM IJ] [kotlin] optimisation: make argument modification for each chunk lazy

Browse Source 
GitOrigin-RevId: 0f8b66d14f0816a108afa749548420489e875f3b
Original commit: https://github.com/JetBrains/intellij-community/commit/1f23948ddbce1069b4deadec64d9c53272d95ae3
This commit is contained in:
Roman Ivanov
2021-10-18 11:23:35 +02:00
committed by Nikita Bobko
parent dfdbfb70dc
commit 983f487f6c
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt
+14 -8
View File
@@ -45,24 +45,30 @@ class KotlinChunk internal constructor(val context: KotlinCompileContext, val ta
private val defaultLanguageVersion = VersionView.RELEASED_VERSION private val defaultLanguageVersion = VersionView.RELEASED_VERSION
val compilerArguments = representativeTarget.jpsModuleBuildTarget.module.kotlinCompilerArguments.also { val compilerArguments by lazy {
it.reportOutputFiles = true representativeTarget.jpsModuleBuildTarget.module.kotlinCompilerArguments.also {
it.reportOutputFiles = true
// Always report the version to help diagnosing user issues if they submit the compiler output // Always report the version to help diagnosing user issues if they submit the compiler output
it.version = true it.version = true
if (it.languageVersion == null) it.languageVersion = defaultLanguageVersion.versionString if (it.languageVersion == null) it.languageVersion = defaultLanguageVersion.versionString
}
} }
val langVersion = val langVersion by lazy {
compilerArguments.languageVersion?.let { LanguageVersion.fromVersionString(it) } compilerArguments.languageVersion?.let { LanguageVersion.fromVersionString(it) }
?: defaultLanguageVersion // use default language version when version string is invalid (todo: report warning?) ?: defaultLanguageVersion // use default language version when version string is invalid (todo: report warning?)
}
val apiVersion = val apiVersion by lazy {
compilerArguments.apiVersion?.let { ApiVersion.parse(it) } compilerArguments.apiVersion?.let { ApiVersion.parse(it) }
?: ApiVersion.createByLanguageVersion(langVersion) // todo: report version parse error? ?: ApiVersion.createByLanguageVersion(langVersion) // todo: report version parse error?
}
val isEnabled: Boolean = representativeTarget.isEnabled(compilerArguments) val isEnabled: Boolean by lazy {
representativeTarget.isEnabled(compilerArguments)
}
fun shouldRebuild(): Boolean { fun shouldRebuild(): Boolean {
val buildMetaInfo = representativeTarget.buildMetaInfoFactory.create(compilerArguments) val buildMetaInfo = representativeTarget.buildMetaInfoFactory.create(compilerArguments)