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

KT-11960 Fix case of instantiation of local class via its inner class or via nested lambda. Move tests to more appropriate location. Fix bug in blackbox codegen generator for JVM, which does not allow to suppress tests.

Browse Source
This commit is contained in:
Alexey Andreev
2016-05-23 12:17:56 +03:00
parent bb8a3aa262
commit acc5303731
9 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/secondaryConstructors/localClassesWithSelfInstantiation.kt → compiler/testData/codegen/box/localClasses/closureWithSelfInstantiation.kt
Vendored
+17 -11
View File
@@ -4,17 +4,20 @@
fun box(): String {
val capturedInConstructor = 1
val capturedInBody = 10
var log = ""
class A(var x: Int) {
var y = 0
fun copy(): A {
log += "A.copy;"
val result = A(x)
result.y += capturedInBody
return result
}
init {
log += "A.<init>;"
y += x + capturedInConstructor
}
}
@@ -23,35 +26,36 @@ fun box(): String {
if (a.y != 111) return "fail1a: ${a.y}"
if (a.x != 100) return "fail1b: ${a.x}"
// This does not work in JS backend due to some unrelated issue with lambdas
/*
class B(var x: Int) {
var y = 0
fun copier(): () -> B = {
val result = B(x)
result.y += capturedInBody
result
fun copier(): () -> B {
log += "B.copier;"
return {
log += "B.copy;"
val result = B(x)
result.y += capturedInBody
result
}
}
init {
y += x + capturedInConstructor
log += "B.<init>;"
}
}
val b = B(100).copier()()
if (b.y != 111) return "fail2a: ${b.y}"
if (b.x != 100) return "fail2b: ${b.x}"
*/
// It's pretty hard to implement this properly for now. Presumably, one needs to inject closure fields into local classes
// after the entire code gets generated (which is possible, but not easy, in JS and, I believe, nearly impossible in JVM).
/*
class C(var x: Int) {
var y = 0
inner class D() {
fun copyOuter(): C {
log += "D.copyOuter;"
val result = C(x)
result.y += capturedInBody
return result
@@ -59,6 +63,7 @@ fun box(): String {
}
init {
log += "C.<init>;"
y += x + capturedInConstructor
}
}
@@ -66,7 +71,8 @@ fun box(): String {
val c = C(100).D().copyOuter()
if (c.y != 111) return "fail3a: ${c.y}"
if (c.x != 100) return "fail3b: ${c.x}"
*/
if (log != "A.<init>;A.copy;A.<init>;B.<init>;B.copier;B.copy;B.<init>;C.<init>;D.copyOuter;C.<init>;") return "fail_log: $log"
return "OK"
}
compiler/testData/codegen/box/secondaryConstructors/localDataClass.kt → compiler/testData/codegen/box/localClasses/localDataClass.kt
Vendored
-3
View File
@@ -1,6 +1,3 @@
// Enable for JVM backend when KT-8120 gets fixed
// TARGET_BACKEND: JS
fun box(): String {
val capturedInConstructor = 1
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+12 -12
View File
@@ -7863,6 +7863,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class LocalClasses extends AbstractBlackBoxCodegenTest {
@TestMetadata("closureWithSelfInstantiation.kt")
public void ignoredClosureWithSelfInstantiation() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/closureWithSelfInstantiation.kt");
doTest(fileName);
}
public void testAllFilesPresentInLocalClasses() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/localClasses"), Pattern.compile("^(.+)\\.kt$"), true);
}
@@ -7975,6 +7981,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest(fileName);
}
@TestMetadata("localDataClass.kt")
public void testLocalDataClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localDataClass.kt");
doTest(fileName);
}
@TestMetadata("localExtendsInnerAndReferencesOuterMember.kt")
public void testLocalExtendsInnerAndReferencesOuterMember() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localExtendsInnerAndReferencesOuterMember.kt");
@@ -13009,18 +13021,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest(fileName);
}
@TestMetadata("localClassesWithSelfInstantiation.kt")
public void testLocalClassesWithSelfInstantiation() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/localClassesWithSelfInstantiation.kt");
doTest(fileName);
}
@TestMetadata("localDataClass.kt")
public void testLocalDataClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/localDataClass.kt");
doTest(fileName);
}
@TestMetadata("superCallPrimary.kt")
public void testSuperCallPrimary() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/superCallPrimary.kt");
generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+1 -1
View File
@@ -202,7 +202,7 @@ fun main(args: Array<String>) {
GenerateRangesCodegenTestData.main(arrayOf<String>())
testClass<AbstractBlackBoxCodegenTest>() {
model("codegen/box")
model("codegen/box", targetBackend = TargetBackend.JVM)
}
testClass<AbstractBlackBoxInlineCodegenTest>("BlackBoxInlineCodegenTestGenerated") {
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LocalClassesTestGenerated.java
+12
View File
@@ -47,6 +47,12 @@ public class LocalClassesTestGenerated extends AbstractLocalClassesTest {
doTest(fileName);
}
@TestMetadata("closureWithSelfInstantiation.kt")
public void testClosureWithSelfInstantiation() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/closureWithSelfInstantiation.kt");
doTest(fileName);
}
@TestMetadata("inExtensionFunction.kt")
public void testInExtensionFunction() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inExtensionFunction.kt");
@@ -143,6 +149,12 @@ public class LocalClassesTestGenerated extends AbstractLocalClassesTest {
doTest(fileName);
}
@TestMetadata("localDataClass.kt")
public void testLocalDataClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localDataClass.kt");
doTest(fileName);
}
@TestMetadata("localExtendsInnerAndReferencesOuterMember.kt")
public void testLocalExtendsInnerAndReferencesOuterMember() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localExtendsInnerAndReferencesOuterMember.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SecondaryConstructorTestGenerated.java
-12
View File
@@ -161,18 +161,6 @@ public class SecondaryConstructorTestGenerated extends AbstractSecondaryConstruc
doTest(fileName);
}
@TestMetadata("localClassesWithSelfInstantiation.kt")
public void testLocalClassesWithSelfInstantiation() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/localClassesWithSelfInstantiation.kt");
doTest(fileName);
}
@TestMetadata("localDataClass.kt")
public void testLocalDataClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/localDataClass.kt");
doTest(fileName);
}
@TestMetadata("superCallPrimary.kt")
public void testSuperCallPrimary() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/superCallPrimary.kt");
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeferredCallSite.kt
+5 -1
View File
@@ -35,4 +35,8 @@ package org.jetbrains.kotlin.js.translate.context
import com.google.dart.compiler.backend.js.ast.JsExpression
import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
class DeferredCallSite(val constructor: ConstructorDescriptor, val invocationArgs: MutableList<JsExpression>)
class DeferredCallSite(
val constructor: ConstructorDescriptor,
val invocationArgs: MutableList<JsExpression>,
val context: TranslationContext
)
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java
+1 -1
View File
@@ -537,6 +537,6 @@ public class TranslationContext {
List<DeferredCallSite> callSites = staticContext.getDeferredCallSites().get(classDescriptor);
if (callSites == null) throw new IllegalStateException("This method should be call only when `shouldBeDeferred` method " +
"reports true for given constructor: " + constructor);
callSites.add(new DeferredCallSite(constructor, invocationArgs));
callSites.add(new DeferredCallSite(constructor, invocationArgs, this));
}
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
+8 -4
View File
@@ -276,15 +276,19 @@ class ClassTranslator private constructor(
val capturedVars = (nonConstructorCapturedVars + constructorCapturedVars).distinct()
val descriptor = constructor.descriptor
val classDescriptor = DescriptorUtils.getParentOfType(descriptor, ClassDescriptor::class.java, false)!!
nonConstructorContext.putClassOrConstructorClosure(descriptor, capturedVars)
val constructorCallSites = callSiteMap[constructor.descriptor].orEmpty()
for (callSite in constructorCallSites) {
val closureQualifier = callSite.context.getArgumentForClosureConstructor(classDescriptor.thisAsReceiverParameter)
capturedVars.forEach { nonConstructorUsageTracker.used(it) }
val closureArgs = capturedVars
.map { nonConstructorUsageTracker.capturedDescriptorToJsName[it]!! }
.map { JsAstUtils.fqnWithoutSideEffects(it, JsLiteral.THIS) }
callSite.invocationArgs.addAll(0, closureArgs)
val closureArgs = capturedVars.map {
val name = nonConstructorUsageTracker.getNameForCapturedDescriptor(it)!!
JsAstUtils.fqnWithoutSideEffects(name, closureQualifier)
}
callSite.invocationArgs.addAll(0, closureArgs.toList())
}
}
}