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

Use StandardNames whenever it is possible in Wrapper

Browse Source
This commit is contained in:
Ivan Kylchik
2021-07-28 19:47:49 +03:00
committed by TeamCityServer
parent 3cf4b8b108
commit 1002d076b3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/state/Wrapper.kt
+6 -3
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.ir.interpreter.state
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.builtins.functions.BuiltInFunctionArity
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.IrCall
@@ -34,12 +35,14 @@ internal class Wrapper(val value: Any, override val irClass: IrClass) : Complex
when {
javaClass == HashMap::class.java -> {
val nodeClass = javaClass.declaredClasses.single { it.name.contains("\$Node") }
val mutableMap = irClass.superTypes.mapNotNull { it.classOrNull?.owner }.single { it.name.asString() == "MutableMap" }
val mutableMap = irClass.superTypes.mapNotNull { it.classOrNull?.owner }
.single { it.name == StandardNames.FqNames.mutableMap.shortName() }
javaClassToIrClass += nodeClass to mutableMap.declarations.filterIsInstance<IrClass>().single()
}
javaClass == LinkedHashMap::class.java -> {
val entryClass = javaClass.declaredClasses.single { it.name.contains("\$Entry") }
val mutableMap = irClass.superTypes.mapNotNull { it.classOrNull?.owner }.single { it.name.asString() == "MutableMap" }
val mutableMap = irClass.superTypes.mapNotNull { it.classOrNull?.owner }
.single { it.name == StandardNames.FqNames.mutableMap.shortName() }
javaClassToIrClass += entryClass to mutableMap.declarations.filterIsInstance<IrClass>().single()
}
javaClass.canonicalName == "java.util.Collections.SingletonMap" -> {
@@ -185,7 +188,7 @@ internal class Wrapper(val value: Any, override val irClass: IrClass) : Complex
val jvmEnumClass = Class.forName(intrinsicName)
val methodType = MethodType.methodType(jvmEnumClass, String::class.java)
return MethodHandles.lookup().findStatic(jvmEnumClass, "valueOf", methodType)
return MethodHandles.lookup().findStatic(jvmEnumClass, StandardNames.ENUM_VALUE_OF.identifier, methodType)
}
private fun IrFunction.getMethodType(): MethodType {