JS: add TranslationContext.cacheExpressionIfNeeded and use it where possible

js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt

@@ -83,13 +83,7 @@ fun TranslationContext.getCallInfo(
     val argumentsInfo = CallArgumentTranslator.translate(resolvedCall, explicitReceivers.extensionOrDispatchReceiver, this, argsBlock)
     val explicitReceiversCorrected =
         if (!argsBlock.isEmpty && explicitReceivers.extensionOrDispatchReceiver != null) {
-            val receiverOrThisRef =
+            val receiverOrThisRef = cacheExpressionIfNeeded(explicitReceivers.extensionOrDispatchReceiver)
-                if (TranslationUtils.isCacheNeeded(explicitReceivers.extensionOrDispatchReceiver)) {
-                    defineTemporary(explicitReceivers.extensionOrDispatchReceiver)
-                }
-                else {
-                    explicitReceivers.extensionOrDispatchReceiver
-                }
             var receiverRef = explicitReceivers.extensionReceiver
             if (receiverRef != null) {
                 receiverRef = defineTemporary(explicitReceivers.extensionReceiver!!)

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java

@@ -246,6 +246,11 @@ public class TranslationContext {
         return var.reference();
     }
 
+    @NotNull
+    public JsExpression cacheExpressionIfNeeded(@NotNull JsExpression expression) {
+        return TranslationUtils.isCacheNeeded(expression) ? defineTemporary(expression) : expression;
+    }
+
     @NotNull
     public TemporaryConstVariable getOrDeclareTemporaryConstVariable(@NotNull JsExpression expression) {
         TemporaryConstVariable tempVar = expressionToTempConstVariableCache.get(expression);

js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt

@@ -140,13 +140,7 @@ fun translateForExpression(expression: KtForExpression, context: TranslationCont
         val leftExpression = TranslationUtils.translateLeftExpression(context, loopRange, startBlock)
         val endBlock = JsBlock()
         val rightExpression = TranslationUtils.translateRightExpression(context, loopRange, endBlock)
-        val rangeStart =
+        val rangeStart = context.cacheExpressionIfNeeded(leftExpression)
-            if (TranslationUtils.isCacheNeeded(leftExpression)) {
-                context.defineTemporary(leftExpression)
-            }
-            else {
-                leftExpression
-            }
         context.addStatementsToCurrentBlockFrom(startBlock)
         context.addStatementsToCurrentBlockFrom(endBlock)
         val rangeEnd = context.defineTemporary(rightExpression)

js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java

@@ -134,12 +134,7 @@ public final class BinaryOperationTranslator extends AbstractTranslator {
         JsExpression result;
         JsIf ifStatement;
         if (BindingContextUtilsKt.isUsedAsExpression(expression, context().bindingContext())) {
-            if (TranslationUtils.isCacheNeeded(leftExpression)) {
+            result = context().cacheExpressionIfNeeded(leftExpression);
-                result = context().defineTemporary(leftExpression);
-            }
-            else {
-                result = leftExpression;
-            }
             JsExpression testExpression = TranslationUtils.isNullCheck(result);
             rightBlock.getStatements().add(JsAstUtils.assignment(result, rightExpression).makeStmt());
             ifStatement = JsAstUtils.newJsIf(testExpression, rightBlock);
@@ -169,9 +164,7 @@ public final class BinaryOperationTranslator extends AbstractTranslator {
             return intrinsic.apply(expression, leftExpression, rightExpression, context());
         }
 
-        if (TranslationUtils.isCacheNeeded(leftExpression)) {
+        leftExpression = context().cacheExpressionIfNeeded(leftExpression);
-            leftExpression = context().defineTemporary(leftExpression);
-        }
         context().addStatementsToCurrentBlockFrom(rightBlock);
 
         return intrinsic.apply(expression, leftExpression, rightExpression, context());

js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.java

@@ -61,10 +61,8 @@ public final class AccessTranslationUtils {
         if (forceOrderOfEvaluation) {
             Map<KtExpression, JsExpression> indexesMap = new LinkedHashMap<KtExpression, JsExpression>();
             for(KtExpression indexExpression : expression.getIndexExpressions()) {
-                JsExpression jsIndexExpression = Translation.translateAsExpression(indexExpression, context);
+                JsExpression jsIndexExpression = context.cacheExpressionIfNeeded(
-                if (TranslationUtils.isCacheNeeded(jsIndexExpression)) {
+                        Translation.translateAsExpression(indexExpression, context));
-                    jsIndexExpression = context.defineTemporary(jsIndexExpression);
-                }
                 indexesMap.put(indexExpression, jsIndexExpression);
             }
             accessArrayContext = context.innerContextWithAliasesForExpressions(indexesMap);