From 631a09e54123a38610644c8d2a9bd7069eba402c Mon Sep 17 00:00:00 2001
From: Svyatoslav Kuzmich <svyatoslav.kuzmich@jetbrains.com>
Date: Wed, 3 Jul 2019 15:34:15 +0300
Subject: [PATCH] [JS IR BE] ThrowableLowering: Use dynamic operators instead
 of jsSetJSField intrinsic

---
 .../kotlin/ir/backend/js/JsIntrinsics.kt      |  4 +--
 .../ir/backend/js/lower/ThrowableLowering.kt  | 35 ++++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt
index 85cc44d4ec9..dc6f37109b8 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt
@@ -145,8 +145,8 @@ class JsIntrinsics(private val irBuiltIns: IrBuiltIns, val context: JsIrBackendC
     // Other:
 
     val jsObjectCreate = defineObjectCreateIntrinsic() // Object.create
-    val jsGetJSField = defineGetJSPropertyIntrinsic() // till we don't have dynamic type we use intrinsic which sets a field with any name
-    val jsSetJSField = defineSetJSPropertyIntrinsic() // till we don't have dynamic type we use intrinsic which sets a field with any name
+    val jsGetJSField = defineGetJSPropertyIntrinsic() // TODO: Replace with dynamic operators
+    val jsSetJSField = defineSetJSPropertyIntrinsic() // TODO: Replace with dynamic operators
     val jsCode = getInternalFunction("js") // js("<code>")
     val jsHashCode = getInternalFunction("hashCode")
     val jsGetObjectHashCode = getInternalFunction("getObjectHashCode")
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ThrowableLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ThrowableLowering.kt
index 7cc390b9b60..62d89244938 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ThrowableLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ThrowableLowering.kt
@@ -16,9 +16,9 @@ import org.jetbrains.kotlin.ir.declarations.IrConstructor
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.expressions.*
-import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
+import org.jetbrains.kotlin.ir.expressions.impl.*
+import org.jetbrains.kotlin.ir.types.isNullableString
+import org.jetbrains.kotlin.ir.types.isString
 import org.jetbrains.kotlin.ir.types.makeNotNull
 import org.jetbrains.kotlin.ir.util.defaultType
 import org.jetbrains.kotlin.ir.util.isThrowable
@@ -30,8 +30,6 @@ class ThrowableLowering(val context: JsIrBackendContext) : FileLoweringPass {
     private val unitType get() = context.irBuiltIns.unitType
     private val nothingNType get() = context.irBuiltIns.nothingNType
     private val stringType get() = context.irBuiltIns.stringType
-    private val propertySetter get() = context.intrinsics.jsSetJSField.symbol
-    private val nameName get() = JsIrBuilder.buildString(stringType, "name")
 
     private val throwableConstructors = context.throwableConstructors
 
@@ -58,9 +56,13 @@ class ThrowableLowering(val context: JsIrBackendContext) : FileLoweringPass {
             )
             else -> {
                 val arg = getValueArgument(0)!!
+                val parameter = symbol.owner.valueParameters[0]
                 when {
-                    arg.type.makeNotNull().isThrowable() -> ThrowableArguments(message = nullValue(), cause = arg)
-                    else -> ThrowableArguments(message = arg, cause = nullValue())
+                    parameter.type.isNullableString() -> ThrowableArguments(message = arg, cause = nullValue())
+                    else -> {
+                        assert(parameter.type.makeNotNull().isThrowable())
+                        ThrowableArguments(message = nullValue(), cause = arg)
+                    }
                 }
             }
         }
@@ -85,12 +87,19 @@ class ThrowableLowering(val context: JsIrBackendContext) : FileLoweringPass {
         override fun visitConstructor(declaration: IrConstructor, data: IrDeclarationParent): IrStatement {
             val klass = data as IrClass
             if (klass.defaultType.isThrowableTypeOrSubtype() && declaration.callsSuper(context.irBuiltIns)) {
-                (declaration.body as? IrBlockBody)?.let {
-                    it.statements += JsIrBuilder.buildCall(propertySetter, unitType).apply {
-                        putValueArgument(0, JsIrBuilder.buildGetValue(klass.thisReceiver!!.symbol))
-                        putValueArgument(1, nameName)
-                        putValueArgument(2, JsIrBuilder.buildString(stringType, klass.name.asString()))
-                    }
+                val body = declaration.body as IrBlockBody
+                body.statements += IrDynamicOperatorExpressionImpl(
+                    UNDEFINED_OFFSET, UNDEFINED_OFFSET,
+                    unitType,
+                    IrDynamicOperator.EQ
+                ).also {
+                    it.receiver = IrDynamicMemberExpressionImpl(
+                        UNDEFINED_OFFSET, UNDEFINED_OFFSET,
+                        context.dynamicType,
+                        "name",
+                        JsIrBuilder.buildGetValue(klass.thisReceiver!!.symbol)
+                    )
+                    it.arguments.add(JsIrBuilder.buildString(stringType, klass.name.asString()))
                 }
             }