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

[CHERRY PICKED FROM IJ] Fix JPS compilation

Browse Source 
GitOrigin-RevId: a799879de2add4ca719307ddf9a143605468e731
Original commit: https://github.com/JetBrains/intellij-community/commit/9746206871853f44205b31dd8757ed2a4ad586ca
This commit is contained in:
Aleksei.Cherepanov
2021-10-22 16:30:30 +03:00
committed by Nikita Bobko
parent 2ea089f0d2
commit a4bf7c9772
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
+3 -3
View File
@@ -367,7 +367,7 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
// process inlineConstTracker // process inlineConstTracker
for (sourceFile: File in sourceFiles) { for (sourceFile: File in sourceFiles) {
val cRefs = inlineConstTracker.inlineConstMap[sourceFile.path]?.map { cRef: ConstantRef -> val cRefs = inlineConstTracker.inlineConstMap[sourceFile.path]?.mapNotNull { cRef: ConstantRef ->
val descriptor = when (cRef.constType) { val descriptor = when (cRef.constType) {
"Byte" -> "B" "Byte" -> "B"
"Short" -> "S" "Short" -> "S"
@@ -378,8 +378,8 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
"Boolean" -> "Z" "Boolean" -> "Z"
"Char" -> "C" "Char" -> "C"
"String" -> "Ljava/lang/String;" "String" -> "Ljava/lang/String;"
else -> "" else -> null
} } ?: return@mapNotNull null
Callbacks.createConstantReference(cRef.owner, cRef.name, descriptor) Callbacks.createConstantReference(cRef.owner, cRef.name, descriptor)
} ?: continue } ?: continue