From 69a25ca92adb98e8c55d2055a25849a9bd70fc1f Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Fri, 5 Sep 2014 11:50:23 +0400
Subject: [PATCH] JS backend: minor: improve call translation for constant
 receiver

---
 .../k2js/translate/callTranslator/CallInfo.kt    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/CallInfo.kt b/js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/CallInfo.kt
index 9ddc1cf0346..155ec4ec01a 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/CallInfo.kt
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/CallInfo.kt
@@ -84,15 +84,21 @@ fun TranslationContext.getCallInfo(resolvedCall: ResolvedCall<out FunctionDescri
     val argumentsInfo = CallArgumentTranslator.translate(resolvedCall, explicitReceivers.receiverOrThisObject, this, argsBlock)
     val explicitReceiversCorrected =
         if (!argsBlock.isEmpty() && explicitReceivers.receiverOrThisObject != null) {
-            val receiverOrThisRefVar = this.declareTemporary(explicitReceivers.receiverOrThisObject)
-            this.addStatementToCurrentBlock(receiverOrThisRefVar.assignmentExpression().makeStmt()!!)
-
+            val receiverOrThisRef =
+                if (TranslationUtils.isCacheNeeded(explicitReceivers.receiverOrThisObject)) {
+                    val receiverOrThisRefVar = this.declareTemporary(explicitReceivers.receiverOrThisObject)
+                    this.addStatementToCurrentBlock(receiverOrThisRefVar.assignmentExpression().makeStmt())
+                    receiverOrThisRefVar.reference()
+                }
+                else {
+                    explicitReceivers.receiverOrThisObject
+                }
             var receiverRef = explicitReceivers.receiverObject
             if (receiverRef != null) {
                 receiverRef = this.declareTemporary(null).reference()
-                this.addStatementToCurrentBlock(JsAstUtils.assignment(receiverRef!!, explicitReceivers.receiverObject!!).makeStmt()!!)
+                this.addStatementToCurrentBlock(JsAstUtils.assignment(receiverRef!!, explicitReceivers.receiverObject!!).makeStmt())
             }
-            ExplicitReceivers(receiverOrThisRefVar.reference(), receiverRef)
+            ExplicitReceivers(receiverOrThisRef, receiverRef)
         }
         else {
             explicitReceivers