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

Get correct irClass from class reference in case of reified parameter

Browse Source
This commit is contained in:
Ivan Kylchik
2021-03-12 15:41:27 +03:00
committed by TeamCityServer
parent fe99b235d3
commit 3294af5e49
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt
+8 -1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.ir.interpreter.stack.Variable
import org.jetbrains.kotlin.ir.interpreter.state.* import org.jetbrains.kotlin.ir.interpreter.state.*
import org.jetbrains.kotlin.ir.interpreter.state.reflection.* import org.jetbrains.kotlin.ir.interpreter.state.reflection.*
import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.symbols.IrSymbol
import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.types.impl.originalKotlinType import org.jetbrains.kotlin.ir.types.impl.originalKotlinType
import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.util.*
@@ -905,7 +906,13 @@ class IrInterpreter(val irBuiltIns: IrBuiltIns, private val bodyMap: Map<IdSigna
} }
private fun interpretClassReference(classReference: IrClassReference): ExecutionResult { private fun interpretClassReference(classReference: IrClassReference): ExecutionResult {
stack.pushReturnValue(KClassState(classReference)) when (classReference.symbol) {
is IrTypeParameterSymbol -> { // reified
val kTypeState = stack.getVariable(classReference.symbol).state as KTypeState
stack.pushReturnValue(KClassState(kTypeState.irType.classOrNull!!.owner, classReference.type.classOrNull!!.owner))
}
else -> stack.pushReturnValue(KClassState(classReference))
}
return Next return Next
} }
} }