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

Add assertion for overwriting common sources flag

Browse Source 
Wrong flag state causes compilation errors for optional expectation
(this flag is used to pass -Xcommon-sources)
This commit is contained in:
Sergey Rostov
2018-11-14 10:24:24 +03:00
parent 5a25d3ef58
commit 84d6c1df5a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinDirtySourceFilesHolder.kt
+8 -1
View File
@@ -49,7 +49,14 @@ class KotlinDirtySourceFilesHolder(
* and during KotlinDirtySourceFilesHolder initialization. * and during KotlinDirtySourceFilesHolder initialization.
*/ */
internal fun _markDirty(file: File, root: JavaSourceRootDescriptor) { internal fun _markDirty(file: File, root: JavaSourceRootDescriptor) {
_dirty[file.canonicalFile] = KotlinModuleBuildTarget.Source(file, root is KotlinIncludedModuleSourceRoot) val isCrossCompiled = root is KotlinIncludedModuleSourceRoot
val old = _dirty.put(file.canonicalFile, KotlinModuleBuildTarget.Source(file, isCrossCompiled))
check(old == null || old.isCrossCompiled == isCrossCompiled) {
"`${file.canonicalFile}` already marked as dirty: " +
"old is cross compiled: ${old!!.isCrossCompiled}, " +
"new is cross compiled: $isCrossCompiled"
}
} }
} }