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

Check for common klibs builtins_platform properly

Browse Source 
Actually, common klibs don't have a corresponding record (and abscence
of that record should be treated as platform COMMON).

^KT-38769 Fixed
This commit is contained in:
Dmitry Savvinov
2020-05-15 18:12:01 +03:00
parent c6f38ebfbf
commit 3793e485b6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/utils.kt
+6 -3
View File
@@ -62,10 +62,13 @@ private fun checkKlibComponent(componentFile: VirtualFile, requestedBuiltInsPlat
if (!manifestProperties.containsKey(KLIB_PROPERTY_UNIQUE_NAME)) return false if (!manifestProperties.containsKey(KLIB_PROPERTY_UNIQUE_NAME)) return false
// No builtins_platform property => either a new common klib (we don't write builtins_platform for common) or old Native klib
val builtInsPlatformProperty = manifestProperties.getProperty(KLIB_PROPERTY_BUILTINS_PLATFORM) val builtInsPlatformProperty = manifestProperties.getProperty(KLIB_PROPERTY_BUILTINS_PLATFORM)
// TODO(dsavvinov): drop additional legacy check after 1.4 // No builtins_platform property => either a new common klib (we don't write builtins_platform for common) or old Native klib
?: return requestedBuiltInsPlatform == BuiltInsPlatform.NATIVE && componentFile.isLegacyNativeKlibComponent ?: return when (requestedBuiltInsPlatform) {
BuiltInsPlatform.NATIVE -> componentFile.isLegacyNativeKlibComponent // TODO(dsavvinov): drop additional legacy check after 1.4
BuiltInsPlatform.COMMON -> !componentFile.isLegacyNativeKlibComponent
else -> false
}
val builtInsPlatform = BuiltInsPlatform.parseFromString(builtInsPlatformProperty) ?: return false val builtInsPlatform = BuiltInsPlatform.parseFromString(builtInsPlatformProperty) ?: return false