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

Avoid uses of plain "kotlin" in metadata deserialization.

Browse Source 
KT-35587 Fixed
This commit is contained in:
Jinseong Jeon
2020-02-02 23:34:10 -08:00
committed by Alexander Udalov
parent 744c4c545e
commit 79790ca227
4 changed files with 114 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/ClassMapperLite.kt
+9 -7
View File
@@ -13,6 +13,8 @@ package org.jetbrains.kotlin.metadata.jvm.deserialization
// WARNING: improving the behavior of this class MAY BREAK BINARY COMPATIBILITY of code compiled by Kotlin, because it may make
// the new compiler skip writing the signatures it now thinks are trivial, and the old compiler would recreate them incorrectly.
object ClassMapperLite {
// Simply "kotlin", but to avoid being renamed by namespace relocation (e.g., Shadow.relocate gradle plugin)
private val kotlin = listOf('k', 'o', 't', 'l', 'i', 'n').joinToString(separator = "")
// Kotlin ClassId -> JVM desc
// e.g. "kotlin.IntArray" -> "[I"
// "kotlin.String.Companion" -> "Lkotlin/jvm/internal/StringCompanionObject"
@@ -30,14 +32,14 @@ object ClassMapperLite {
)
for (i in primitives.indices step 2) {
put("kotlin/${primitives[i]}", primitives[i + 1])
put("kotlin/${primitives[i]}Array", "[${primitives[i + 1]}")
put("$kotlin/${primitives[i]}", primitives[i + 1])
put("$kotlin/${primitives[i]}Array", "[${primitives[i + 1]}")
}
put("kotlin/Unit", "V")
put("$kotlin/Unit", "V")
fun add(kotlinSimpleName: String, javaInternalName: String) {
put("kotlin/$kotlinSimpleName", "L$javaInternalName;")
put("$kotlin/$kotlinSimpleName", "L$javaInternalName;")
}
add("Any", "java/lang/Object")
@@ -59,14 +61,14 @@ object ClassMapperLite {
add("collections/MutableMap.MutableEntry", "java/util/Map\$Entry")
for (i in 0..22) {
add("Function$i", "kotlin/jvm/functions/Function$i")
add("reflect/KFunction$i", "kotlin/reflect/KFunction")
add("Function$i", "$kotlin/jvm/functions/Function$i")
add("reflect/KFunction$i", "$kotlin/reflect/KFunction")
}
//Boolean is purposefully omitted from this list, even though it has a Companion Object.
//This assures that an older compiler won't get confused by the new signature, preventing a bug in compatibility.
for (klass in listOf("Char", "Byte", "Short", "Int", "Float", "Long", "Double", "String", "Enum")) {
add("$klass.Companion", "kotlin/jvm/internal/${klass}CompanionObject")
add("$klass.Companion", "$kotlin/jvm/internal/${klass}CompanionObject")
}
}
core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmNameResolver.kt
+27 -24
View File
@@ -75,37 +75,40 @@ class JvmNameResolver(
index in localNameIndices
companion object {
// Simply "kotlin", but to avoid being renamed by namespace relocation (e.g., Shadow.relocate gradle plugin)
private val kotlin = listOf('k', 'o', 't', 'l', 'i', 'n').joinToString(separator = "")
val PREDEFINED_STRINGS = listOf(
"kotlin/Any",
"kotlin/Nothing",
"kotlin/Unit",
"kotlin/Throwable",
"kotlin/Number",
"$kotlin/Any",
"$kotlin/Nothing",
"$kotlin/Unit",
"$kotlin/Throwable",
"$kotlin/Number",
"kotlin/Byte", "kotlin/Double", "kotlin/Float", "kotlin/Int",
"kotlin/Long", "kotlin/Short", "kotlin/Boolean", "kotlin/Char",
"$kotlin/Byte", "$kotlin/Double", "$kotlin/Float", "$kotlin/Int",
"$kotlin/Long", "$kotlin/Short", "$kotlin/Boolean", "$kotlin/Char",
"kotlin/CharSequence",
"kotlin/String",
"kotlin/Comparable",
"kotlin/Enum",
"$kotlin/CharSequence",
"$kotlin/String",
"$kotlin/Comparable",
"$kotlin/Enum",
"kotlin/Array",
"kotlin/ByteArray", "kotlin/DoubleArray", "kotlin/FloatArray", "kotlin/IntArray",
"kotlin/LongArray", "kotlin/ShortArray", "kotlin/BooleanArray", "kotlin/CharArray",
"$kotlin/Array",
"$kotlin/ByteArray", "$kotlin/DoubleArray", "$kotlin/FloatArray", "$kotlin/IntArray",
"$kotlin/LongArray", "$kotlin/ShortArray", "$kotlin/BooleanArray", "$kotlin/CharArray",
"kotlin/Cloneable",
"kotlin/Annotation",
"$kotlin/Cloneable",
"$kotlin/Annotation",
"kotlin/collections/Iterable", "kotlin/collections/MutableIterable",
"kotlin/collections/Collection", "kotlin/collections/MutableCollection",
"kotlin/collections/List", "kotlin/collections/MutableList",
"kotlin/collections/Set", "kotlin/collections/MutableSet",
"kotlin/collections/Map", "kotlin/collections/MutableMap",
"kotlin/collections/Map.Entry", "kotlin/collections/MutableMap.MutableEntry",
"$kotlin/collections/Iterable", "$kotlin/collections/MutableIterable",
"$kotlin/collections/Collection", "$kotlin/collections/MutableCollection",
"$kotlin/collections/List", "$kotlin/collections/MutableList",
"$kotlin/collections/Set", "$kotlin/collections/MutableSet",
"$kotlin/collections/Map", "$kotlin/collections/MutableMap",
"$kotlin/collections/Map.Entry", "$kotlin/collections/MutableMap.MutableEntry",
"kotlin/collections/Iterator", "kotlin/collections/MutableIterator",
"kotlin/collections/ListIterator", "kotlin/collections/MutableListIterator"
"$kotlin/collections/Iterator", "$kotlin/collections/MutableIterator",
"$kotlin/collections/ListIterator", "$kotlin/collections/MutableListIterator"
)
private val PREDEFINED_STRINGS_MAP = PREDEFINED_STRINGS.withIndex().associateBy({ it.value }, { it.index })