[K/JS] Fix private constructor delegating inside single class with ES6 mode ^KT-59335 Fixed

Author: JSMonk

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/ir/IrBuilder.kt

@@ -189,12 +189,13 @@ object JsIrBuilder {
         isVar: Boolean = false,
         isConst: Boolean = false,
         isLateinit: Boolean = false,
-        initializer: IrExpression? = null
+        initializer: IrExpression? = null,
+        origin: IrDeclarationOrigin = SYNTHESIZED_DECLARATION
     ): IrVariable = buildVariable(
         parent,
         UNDEFINED_OFFSET,
         UNDEFINED_OFFSET,
-        SYNTHESIZED_DECLARATION,
+        origin,
         Name.identifier(name),
         type,
         isVar,

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ES6ConstructorCallLowering.kt

@@ -44,12 +44,10 @@ class ES6ConstructorCallLowering(val context: JsIrBackendContext) : BodyLowering
                     }
                 }
 
-                val isDelegatingCall =
-                    expression.isSyntheticDelegatingReplacement && currentFunction != null && currentFunction.parentAsClass != irClass
+                val isDelegatingCall = expression.isSyntheticDelegatingReplacement && currentFunction != null
 
                 val factoryFunctionCall = JsIrBuilder.buildCall(
                     factoryFunction.symbol,
-                    superQualifierSymbol = irClass.symbol.takeIf { isDelegatingCall },
                     origin = if (isDelegatingCall) ES6_DELEGATING_CONSTRUCTOR_REPLACEMENT else JsStatementOrigins.SYNTHESIZED_STATEMENT
                 ).apply {
                     copyValueArgumentsFrom(expression, factoryFunction)

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ES6ConstructorLowering.kt

@@ -155,7 +155,8 @@ class ES6ConstructorLowering(val context: JsIrBackendContext) : DeclarationTrans
             type = irClass.defaultType,
             parent = this,
             name = Namer.SYNTHETIC_RECEIVER_NAME,
-            initializer = initializer
+            initializer = initializer,
+            origin = IrDeclarationOrigin.IR_TEMPORARY_VARIABLE
         )
     }
 

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ES6PrimaryConstructorOptimizationLowering.kt

@@ -226,7 +226,9 @@ class ES6CollectPrimaryConstructorsWhichCouldBeOptimizedLowering(private val con
     }
 
     private fun IrClass.canBeOptimized(): Boolean {
-        return superClass?.symbol != context.throwableClass && !isSubclassOfExternalClassWithRequiredBoxParameter() && !hasPrimaryDelegatedToSecondaryOrSecondaryToPrimary()
+        return superClass?.symbol != context.throwableClass &&
+                !isSubclassOfExternalClassWithRequiredBoxParameter() &&
+                !hasPrimaryDelegatedToSecondaryOrSecondaryToPrimary()
     }
 
     private fun IrClass.hasPrimaryDelegatedToSecondaryOrSecondaryToPrimary(): Boolean {

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsStatementTransformer.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs
 
 import org.jetbrains.kotlin.backend.common.ir.inlineFunction
 import org.jetbrains.kotlin.backend.common.ir.innerInlinedBlockOrThis
+import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
 import org.jetbrains.kotlin.ir.backend.js.utils.JsGenerationContext
 import org.jetbrains.kotlin.ir.backend.js.utils.emptyScope
 import org.jetbrains.kotlin.ir.backend.js.utils.isTheLastReturnStatementIn

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/jsAstUtils.kt

@@ -205,7 +205,7 @@ fun translateCall(
             Pair(function, superQualifier.owner)
         }
 
-        if (expression.isSyntheticDelegatingReplacement || currentDispatchReceiver.canUseSuperRef(context, klass)) {
+        if (currentDispatchReceiver.canUseSuperRef(context, klass)) {
             return JsInvocation(JsNameRef(context.getNameForMemberFunction(target), JsSuperRef()), arguments)
         }
 

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/BoxJsTestGenerated.java

@@ -0,0 +1,16 @@
+// EXPECTED_REACHABLE_NODES: 1344
+open class MyClass1 private constructor(val value: String) {
+    constructor(i: Int): this(i.toString())
+}
+
+class MyClass2 : MyClass1 {
+    constructor(i: Int): super(i)
+}
+
+fun test(x: Any) = x is MyClass2
+
+fun box(): String {
+    val b = test(MyClass2(0))
+
+    return if (b) "OK" else "NOT OK"
+}