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

[K/N] Fixed resolve order of compiler caches

Browse Source 
#KT-56611 Fixed
This commit is contained in:
Igor Chevdar
2023-02-14 15:19:14 +02:00
committed by Space Team
parent 951ebf4082
commit 564b40f05d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CachedLibraries.kt
+7 -7
View File
@@ -175,16 +175,16 @@ class CachedLibraries(
?: error("No cache found for library ${library.libraryName} at $explicitPath") ?: error("No cache found for library ${library.libraryName} at $explicitPath")
} else { } else {
val libraryPath = library.libraryFile.absolutePath val libraryPath = library.libraryFile.absolutePath
if (autoCacheableFrom.any { libraryPath.startsWith(it.absolutePath) }) { implicitCacheDirectories.firstNotNullOfOrNull { dir ->
val dir = computeVersionedCacheDirectory(autoCacheDirectory, library, uniqueNameToLibrary)
selectCache(library, dir.child(getPerFileCachedLibraryName(library))) selectCache(library, dir.child(getPerFileCachedLibraryName(library)))
?: selectCache(library, dir.child(getCachedLibraryName(library))) ?: selectCache(library, dir.child(getCachedLibraryName(library)))
} else {
implicitCacheDirectories.firstNotNullOfOrNull { dir ->
selectCache(library, dir.child(getPerFileCachedLibraryName(library)))
?: selectCache(library, dir.child(getCachedLibraryName(library)))
}
} }
?: autoCacheDirectory.takeIf { autoCacheableFrom.any { libraryPath.startsWith(it.absolutePath) } }
?.let {
val dir = computeVersionedCacheDirectory(it, library, uniqueNameToLibrary)
selectCache(library, dir.child(getPerFileCachedLibraryName(library)))
?: selectCache(library, dir.child(getCachedLibraryName(library)))
}
} }
cache?.let { library to it } cache?.let { library to it }