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

Implement interpretation of Char and Long classes from js stdlib

Browse Source
This commit is contained in:
Ivan Kylchik
2020-06-10 21:55:05 +03:00
parent 2310a04e4e
commit b175f46315
2 changed files with 15 additions and 2 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
+14 -1
View File
@@ -458,7 +458,20 @@ class IrInterpreter(irModule: IrModuleFragment) {
val owner = constructorCall.symbol.owner val owner = constructorCall.symbol.owner
val parent = owner.parent as IrClass val parent = owner.parent as IrClass
if (parent.hasAnnotation(evaluateIntrinsicAnnotation)) { if (parent.hasAnnotation(evaluateIntrinsicAnnotation)) {
return Wrapper.getConstructorMethod(owner).invokeMethod(owner, newFrame).apply { data.pushReturnValue(newFrame) } return when (constructorCall.symbol.owner.parentAsClass.getEvaluateIntrinsicValue()) {
"kotlin.Long" -> {
val low = (valueParameters[0].state as Primitive<*>).value as Int
val high = (valueParameters[1].state as Primitive<*>).value as Int
data.pushReturnValue((high.toLong().shl(32) + low).toState(irBuiltIns.longType))
Code.NEXT
}
"kotlin.Char" -> {
val value = (valueParameters.single().state as Primitive<*>).value as Int
data.pushReturnValue(value.toChar().toState(irBuiltIns.longType))
Code.NEXT
}
else -> Wrapper.getConstructorMethod(owner).invokeMethod(owner, newFrame).apply { data.pushReturnValue(newFrame) }
}
} }
if (parent.defaultType.isArray() || parent.defaultType.isPrimitiveArray()) { if (parent.defaultType.isArray() || parent.defaultType.isPrimitiveArray()) {
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/stack/State.kt
+1 -1
View File
@@ -228,9 +228,9 @@ class Wrapper(val value: Any, override val irClass: IrClass) : Complex(irClass,
val fqName = this.getFqName() val fqName = this.getFqName()
val owner = this.classOrNull?.owner val owner = this.classOrNull?.owner
return when { return when {
owner.hasAnnotation(evaluateIntrinsicAnnotation) -> Class.forName(owner!!.getEvaluateIntrinsicValue())
this.isPrimitiveType() -> getPrimitiveClass(fqName!!, asObject) this.isPrimitiveType() -> getPrimitiveClass(fqName!!, asObject)
this.isArray() -> if (asObject) Array<Any?>::class.javaObjectType else Array<Any?>::class.java this.isArray() -> if (asObject) Array<Any?>::class.javaObjectType else Array<Any?>::class.java
owner.hasAnnotation(evaluateIntrinsicAnnotation) -> Class.forName(owner!!.getEvaluateIntrinsicValue())
//TODO primitive array //TODO primitive array
this.isTypeParameter() -> Any::class.java this.isTypeParameter() -> Any::class.java
else -> JavaToKotlinClassMap.mapKotlinToJava(FqNameUnsafe(fqName!!))?.let { Class.forName(it.asSingleFqName().toString()) } else -> JavaToKotlinClassMap.mapKotlinToJava(FqNameUnsafe(fqName!!))?.let { Class.forName(it.asSingleFqName().toString()) }