From 41bbd4d2d6c32d9ee3185b75007f17713553464d Mon Sep 17 00:00:00 2001
From: Svyatoslav Kuzmich <svyatoslav.kuzmich@jetbrains.com>
Date: Thu, 28 Feb 2019 22:00:23 +0300
Subject: [PATCH] [JS IR BE] Support property accessors with @JsName

---
 .../transformers/irToJs/IrElementToJsExpressionTransformer.kt | 4 +++-
 .../testData/box/jsName/jsNamePropertyAccessors.kt            | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
index 70ac4f2c652..144a2e4750d 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.ir.backend.js.utils.JsGenerationContext
 import org.jetbrains.kotlin.ir.backend.js.utils.Namer
+import org.jetbrains.kotlin.ir.backend.js.utils.getJsName
 import org.jetbrains.kotlin.ir.backend.js.utils.realOverrideTarget
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrConstructor
@@ -136,7 +137,8 @@ class IrElementToJsExpressionTransformer : BaseIrElementToJsNodeTransformer<JsEx
         val arguments = translateCallArguments(expression, context)
 
         // Transform external property accessor call
-        if (function is IrSimpleFunction) {
+        // @JsName-annotated external property accessors are translated as function calls
+        if (function is IrSimpleFunction && function.getJsName() == null) {
             val property = function.correspondingProperty
             if (property != null && property.isEffectivelyExternal()) {
                 val nameRef = JsNameRef(context.getNameForDeclaration(property), jsDispatchReceiver)
diff --git a/js/js.translator/testData/box/jsName/jsNamePropertyAccessors.kt b/js/js.translator/testData/box/jsName/jsNamePropertyAccessors.kt
index 946f265d2d7..c39b36e0501 100644
--- a/js/js.translator/testData/box/jsName/jsNamePropertyAccessors.kt
+++ b/js/js.translator/testData/box/jsName/jsNamePropertyAccessors.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1285
 package foo