JS: fix translation of try statements with multiple catches

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

@@ -17,6 +17,8 @@
 package org.jetbrains.kotlin.js.translate.expression
 
 import com.google.dart.compiler.backend.js.ast.*
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+import org.jetbrains.kotlin.js.descriptorUtils.getJetTypeFqName
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.js.translate.context.TranslationContext
 import org.jetbrains.kotlin.js.translate.general.AbstractTranslator
@@ -76,42 +78,48 @@ class CatchTranslator(
         val parameterRef = jsCatch.parameter.name.makeRef()
         val catchContext = context().innerContextWithAliased(parameterDescriptor, parameterRef)
 
-        jsCatch.body = JsBlock(translateCatches(catchContext, parameterDescriptor, parameterRef, catches.iterator()))
+        jsCatch.body = JsBlock(translateCatches(catchContext, parameterRef, catches.iterator()))
 
         return jsCatch
     }
 
     private fun translateCatches(
             context: TranslationContext,
-            parameterDescriptor: DeclarationDescriptor,
+            initialCatchParameterRef: JsNameRef,
-            parameterRef: JsNameRef,
             catches: Iterator<KtCatchClause>
     ): JsStatement {
-        if (!catches.hasNext()) return JsThrow(parameterRef)
+        if (!catches.hasNext()) return JsThrow(initialCatchParameterRef)
 
         var nextContext = context
 
         val catch = catches.next()
         val param = catch.catchParameter!!
-        val paramName = context.getNameForElement(param)
+        val parameterDescriptor = BindingUtils.getDescriptorForElement(bindingContext(), catch.catchParameter!!)
+        val parameterName = context().getNameForDescriptor(parameterDescriptor)
         val paramType = param.typeReference!!
 
         val additionalStatements = mutableListOf<JsStatement>()
-        if (paramName.ident != parameterRef.ident) {
+        val parameterRef = if (parameterName.ident != initialCatchParameterRef.ident) {
-            additionalStatements += JsAstUtils.newVar(paramName, parameterRef)
+            val parameterAlias = context.scope().declareTemporaryName(parameterName.ident)
-            nextContext = nextContext.innerContextWithAliased(parameterDescriptor, paramName.makeRef())
+            additionalStatements += JsAstUtils.newVar(parameterAlias, initialCatchParameterRef)
+            val ref = JsAstUtils.pureFqn(parameterAlias, null)
+            ref
         }
-        val thenBlock = translateCatchBody(context, catch)
+        else {
+            initialCatchParameterRef
+        }
+        nextContext = nextContext.innerContextWithAliased(parameterDescriptor, parameterRef)
+        val thenBlock = translateCatchBody(nextContext, catch)
         thenBlock.statements.addAll(0, additionalStatements)
 
         if (paramType.isDynamic) return thenBlock
 
         // translateIsCheck won't ever return `null` if its second argument is `null`
         val typeCheck = with (patternTranslator(nextContext)) {
-            translateIsCheck(parameterRef, paramType)
+            translateIsCheck(initialCatchParameterRef, paramType)
         }!!
 
-        val elseBlock = translateCatches(nextContext, parameterDescriptor, parameterRef, catches)
+        val elseBlock = translateCatches(context, initialCatchParameterRef, catches)
         return JsIf(typeCheck, thenBlock, elseBlock)
     }
 

js/js.translator/testData/box/expression/try/multipleCatchBlocks.kt

@@ -17,9 +17,9 @@ fun bar(e: Exception): String {
         s = "IllegalArgumentException"
         exceptionObject = e
     }
-    catch (e: IllegalStateException) {
+    catch (f: IllegalStateException) {
         s = "IllegalStateException"
-        exceptionObject = e
+        exceptionObject = f
     }
     catch (e: Exception) {
         s = "Exception"