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

Change keys in static maps of enums and objects from String to IrSymbol

Browse Source
This commit is contained in:
Ivan Kylchik
2020-06-10 23:38:49 +03:00
parent 224d56ec15
commit 848ca70de1
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/IrInterpreter.kt
+9 -10
View File
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyFunction
import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
import org.jetbrains.kotlin.ir.expressions.impl.IrErrorExpressionImpl import org.jetbrains.kotlin.ir.expressions.impl.IrErrorExpressionImpl
import org.jetbrains.kotlin.ir.symbols.IrSymbol
import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
@@ -41,8 +42,8 @@ class IrInterpreter(irModule: IrModuleFragment, private val bodyMap: Map<IdSigna
private var commandCount = 0 private var commandCount = 0
companion object { companion object {
private val mapOfEnums = mutableMapOf<String, Complex>() private val mapOfEnums = mutableMapOf<IrSymbol, Complex>()
private val mapOfObjects = mutableMapOf<String, Complex>() private val mapOfObjects = mutableMapOf<IrSymbol, Complex>()
} }
private fun Any?.getType(defaultType: IrType): IrType { private fun Any?.getType(defaultType: IrType): IrType {
@@ -545,23 +546,21 @@ class IrInterpreter(irModule: IrModuleFragment, private val bodyMap: Map<IdSigna
} }
private fun getOrCreateObjectValue(objectClass: IrClass): ExecutionResult { private fun getOrCreateObjectValue(objectClass: IrClass): ExecutionResult {
val objectSignature = objectClass.fqNameWhenAvailable.toString() mapOfObjects[objectClass.symbol]?.let { return Next.apply { stack.pushReturnValue(it) } }
mapOfObjects[objectSignature]?.let { return Next.apply { stack.pushReturnValue(it) } }
val objectState = when { val objectState = when {
objectClass.hasAnnotation(evaluateIntrinsicAnnotation) -> Wrapper.getCompanionObject(objectClass) objectClass.hasAnnotation(evaluateIntrinsicAnnotation) -> Wrapper.getCompanionObject(objectClass)
else -> Common(objectClass).apply { setSuperClassRecursive() } // TODO test type arguments else -> Common(objectClass).apply { setSuperClassRecursive() } // TODO test type arguments
} }
mapOfObjects[objectSignature] = objectState mapOfObjects[objectClass.symbol] = objectState
stack.pushReturnValue(objectState) stack.pushReturnValue(objectState)
return Next return Next
} }
private suspend fun interpretGetEnumValue(expression: IrGetEnumValue): ExecutionResult { private suspend fun interpretGetEnumValue(expression: IrGetEnumValue): ExecutionResult {
val enumEntry = expression.symbol.owner mapOfEnums[expression.symbol]?.let { return Next.apply { stack.pushReturnValue(it) } }
val enumSignature = enumEntry.fqNameWhenAvailable.toString()
mapOfEnums[enumSignature]?.let { return Next.apply { stack.pushReturnValue(it) } }
val enumEntry = expression.symbol.owner
val enumClass = enumEntry.symbol.owner.parentAsClass val enumClass = enumEntry.symbol.owner.parentAsClass
val valueOfFun = enumClass.declarations.single { it.nameForIrSerialization.asString() == "valueOf" } as IrFunction val valueOfFun = enumClass.declarations.single { it.nameForIrSerialization.asString() == "valueOf" } as IrFunction
enumClass.declarations.filterIsInstance<IrEnumEntry>().forEach { enumClass.declarations.filterIsInstance<IrEnumEntry>().forEach {
@@ -574,10 +573,10 @@ class IrInterpreter(irModule: IrModuleFragment, private val bodyMap: Map<IdSigna
else -> interpretEnumEntry(it) else -> interpretEnumEntry(it)
} }
executionResult.check { result -> return result } executionResult.check { result -> return result }
mapOfEnums[it.fqNameWhenAvailable.toString()] = stack.popReturnValue() as Complex mapOfEnums[it.symbol] = stack.popReturnValue() as Complex
} }
stack.pushReturnValue(mapOfEnums[enumSignature]!!) stack.pushReturnValue(mapOfEnums[expression.symbol]!!)
return Next return Next
} }