From 338789664c8ab3f89bd9650f909fab2177161bd3 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Wed, 13 Aug 2014 15:56:27 +0400
Subject: [PATCH] JS inline: use inlined function name for inline labels

---
 .../k2js/inline/FunctionInlineMutator.java    | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/js/js.inliner/src/org/jetbrains/k2js/inline/FunctionInlineMutator.java b/js/js.inliner/src/org/jetbrains/k2js/inline/FunctionInlineMutator.java
index e841f95325c..beb451cb155 100644
--- a/js/js.inliner/src/org/jetbrains/k2js/inline/FunctionInlineMutator.java
+++ b/js/js.inliner/src/org/jetbrains/k2js/inline/FunctionInlineMutator.java
@@ -26,9 +26,6 @@ import java.util.Collection;
 import java.util.List;
 
 class FunctionInlineMutator {
-    private static final String BREAK_LABEL = "break_inlined";
-    private static final String RESULT_LABEL = "result_inlined";
-    private static final String THIS_ALIAS = "self";
 
     private final JsInvocation call;
     private final InliningContext inliningContext;
@@ -102,7 +99,7 @@ class FunctionInlineMutator {
         }
 
         if (needToAlias(thisReplacement)) {
-            JsName thisName = renamingContext.getFreshName(THIS_ALIAS);
+            JsName thisName = renamingContext.getFreshName(getThisAlias());
             renamingContext.newVar(thisName, thisReplacement);
             thisReplacement = thisName.makeRef();
         }
@@ -165,6 +162,34 @@ class FunctionInlineMutator {
         return invokedFunction.getParameters();
     }
 
+    @NotNull
+    private String getResultLabel() {
+        return getLabelPrefix() + "result";
+    }
+
+    @NotNull
+    private String getBreakLabel() {
+        return getLabelPrefix() + "break";
+    }
+
+    @SuppressWarnings("MethodMayBeStatic")
+    @NotNull
+    private String getThisAlias() {
+        return "$this";
+    }
+
+    @NotNull
+    String getLabelPrefix() {
+        String ident = getSimpleIdent(call);
+        String labelPrefix = ident != null ? ident : "inline$";
+
+        if (labelPrefix.endsWith("$")) {
+            return labelPrefix;
+        }
+
+        return labelPrefix + "$";
+    }
+
     private static boolean canBeExpression(JsBlock body) {
         List<JsStatement> statements = body.getStatements();
         return statements.size() == 1 && statements.get(0) instanceof JsReturn;