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

Introduce BLACK_LIST_CONSTRUCTOR_SIGNATURES

Browse Source 
To prevent loading senseless constructors to built-in classes from JDK
This commit is contained in:
Denis Zharkov
2016-04-21 11:48:32 +03:00
parent 1efed64014
commit 2819c69bc1
3 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BuiltInClassesAreSerializableOnJvm.kt
+23 -3
View File
@@ -196,7 +196,8 @@ open class BuiltInClassesAreSerializableOnJvm(
javaConstructor.visibility.isPublicAPI &&
defaultKotlinVersion.constructors.none { it.isEffectivelyTheSameAs(javaConstructor) } &&
!javaConstructor.isTrivialCopyConstructorFor(classDescriptor) &&
!KotlinBuiltIns.isDeprecated(javaConstructor)
!KotlinBuiltIns.isDeprecated(javaConstructor) &&
signature(javaAnalogueDescriptor, javaConstructor.computeJvmDescriptor()) !in BLACK_LIST_CONSTRUCTOR_SIGNATURES
}.map {
javaConstructor ->
javaConstructor.newCopyBuilder().apply {
@@ -261,6 +262,10 @@ open class BuiltInClassesAreSerializableOnJvm(
inJavaUtil("Collection", "toArray([$objectType)[$objectType", "toArray()[$objectType")
private fun buildPrimitiveValueMethodsSet(): Set<String> =
JvmPrimitiveType.values().flatMapTo(LinkedHashSet()) {
inJavaLang(it.wrapperFqName.shortName().asString(), "${it.javaKeywordName}Value()${it.desc}")
}
private val MUTABLE_METHOD_SIGNATURES: Set<String> =
inJavaUtil("Collection", "removeIf(Ljava/util/function/Predicate;)Z") +
@@ -278,9 +283,22 @@ open class BuiltInClassesAreSerializableOnJvm(
"replace($objectType$objectType)$objectType",
"replace($objectType$objectType$objectType)Z")
private fun buildPrimitiveValueMethodsSet(): Set<String> =
private val BLACK_LIST_CONSTRUCTOR_SIGNATURES: Set<String> =
buildPrimitiveStringConstructorsSet() +
inJavaLang("Float", *constructors("D")) +
inJavaLang("String", *constructors(
"[C", "[CII", "[III", "[BIILjava/lang/String;",
"[BIILjava/nio/charset/Charset;",
"[BLjava/lang/String;",
"[BLjava/nio/charset/Charset;",
"[BII", "[B",
"Ljava/lang/StringBuffer;",
"Ljava/lang/StringBuilder;"
))
private fun buildPrimitiveStringConstructorsSet(): Set<String> =
JvmPrimitiveType.values().flatMapTo(LinkedHashSet()) {
inJavaLang(it.wrapperFqName.shortName().asString(), "${it.javaKeywordName}Value()${it.desc}")
inJavaLang(it.wrapperFqName.shortName().asString(), *constructors(stringType))
}
}
}
@@ -296,6 +314,8 @@ private val objectType = javaLang("Object").t
private fun javaLang(name: String) = "java/lang/$name"
private fun javaUtil(name: String) = "java/util/$name"
private fun constructors(vararg signatures: String) = signatures.map { "<init>($it)V" }.toTypedArray()
private fun inJavaLang(name: String, vararg signatures: String) = inClass(javaLang(name), *signatures)
private fun inJavaUtil(name: String, vararg signatures: String) = inClass(javaUtil(name), *signatures)