azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS: fix KT-37386

Browse Source 
Anonymous object constructor parameters should not reuse JsName's
of the super class. Otherwise the temporary name renamer gets
confused.
This commit is contained in:
Anton Bannykh
2020-03-10 23:31:53 +03:00
parent 182c1cee05
commit 63a909dee6
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java
Generated
+5
View File
@@ -6243,6 +6243,11 @@ public class IrBoxJsTestGenerated extends AbstractIrBoxJsTest {
runTest("js/js.translator/testData/box/objectDeclaration/kt3684.kt");
}
@TestMetadata("kt37386.kt")
public void testKt37386() throws Exception {
runTest("js/js.translator/testData/box/objectDeclaration/kt37386.kt");
}
@TestMetadata("lambdaInObjectInsideObject.kt")
public void testLambdaInObjectInsideObject() throws Exception {
runTest("js/js.translator/testData/box/objectDeclaration/lambdaInObjectInsideObject.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java
Generated
+5
View File
@@ -6263,6 +6263,11 @@ public class BoxJsTestGenerated extends AbstractBoxJsTest {
runTest("js/js.translator/testData/box/objectDeclaration/kt3684.kt");
}
@TestMetadata("kt37386.kt")
public void testKt37386() throws Exception {
runTest("js/js.translator/testData/box/objectDeclaration/kt37386.kt");
}
@TestMetadata("lambdaInObjectInsideObject.kt")
public void testLambdaInObjectInsideObject() throws Exception {
runTest("js/js.translator/testData/box/objectDeclaration/lambdaInObjectInsideObject.kt");
js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java
+2 -5
View File
@@ -49,10 +49,7 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument;
import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.*;
import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.*;
import static org.jetbrains.kotlin.js.translate.utils.FunctionBodyTranslator.setDefaultValueForArguments;
@@ -232,7 +229,7 @@ public final class ClassInitializerTranslator extends AbstractTranslator {
}
else {
for (ValueParameterDescriptor parameter : superDescriptor.getValueParameters()) {
JsName parameterName = context.getNameForDescriptor(parameter);
JsName parameterName = JsScope.declareTemporaryName(parameter.getName().asString());
arguments.add(parameterName.makeRef());
initializer.getParameters().add(new JsParameter(parameterName));
}
js/js.translator/testData/box/objectDeclaration/kt37386.kt
Vendored
+11
View File
@@ -0,0 +1,11 @@
// EXPECTED_REACHABLE_NODES: 1315
fun foo() = "OK"
open class A(val foo: Boolean = true) {
val ok = foo()
}
val q = object : A() {}
fun box() = q.ok