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

Remove -Xnormalize-constructor-calls

Browse Source 
Constructor call normalization is enabled by default since 1.3.
This commit is contained in:
Alexander Udalov
2021-09-02 02:09:18 +02:00
parent cc3ad73436
commit 1864716c83
36 changed files with 83 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/extraHelp.out
Vendored
-4
View File
@@ -18,10 +18,6 @@ where advanced options include:
default: legacy
-Xbuild-file=<path> Path to the .xml build file to compile
-Xcompile-java Reuse javac analysis and compile Java source files
-Xnormalize-constructor-calls={disable|enable}
Normalize constructor calls (disable: don't normalize; enable: normalize),
default is 'disable' in language version 1.2 and below,
'enable' since language version 1.3
-Xdump-declarations-to=<path> Path to JSON file to dump Java to Kotlin declaration mappings
-Xdefault-script-extension=<script filename extension>
Compile expressions and unrecognized scripts passed with the -script argument as scripts with given filename extension
compiler/testData/codegen/box/constructorCall/breakInConstructorArguments.kt
Vendored
+2 -3
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: -NormalizeConstructorCalls
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// FILE: test.kt
@@ -13,7 +12,7 @@ fun box(): String {
}
val result = log.toString()
if (result != "<clinit>ij<init>") return "Fail: '$result'"
if (result != "ij<clinit><init>") return "Fail: '$result'"
return "OK"
}
@@ -37,4 +36,4 @@ class Foo(i: Int, j: Int) {
log.append("<clinit>")
}
}
}
}
compiler/testData/codegen/box/constructorCall/continueInConstructorArguments.kt
Vendored
+2 -3
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: -NormalizeConstructorCalls
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// FILE: test.kt
@@ -14,7 +13,7 @@ fun box(): String {
}
val result = log.toString()
if (result != "<clinit>ij<init>") return "Fail: '$result'"
if (result != "ij<clinit><init>") return "Fail: '$result'"
return "OK"
}
@@ -38,4 +37,4 @@ class Foo(i: Int, j: Int) {
log.append("<clinit>")
}
}
}
}
compiler/testData/codegen/box/constructorCall/earlyReturnInConstructorArguments.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: -NormalizeConstructorCalls
// TARGET_BACKEND: JVM
// WITH_RUNTIME
inline fun ok(): String {
@@ -10,7 +9,7 @@ fun box(): String {
if (ok != "OK") return "Fail: $ok"
val r = log.toString()
if (r != "<clinit>;bar;<init>;foo;") return "Fail: '$r'"
if (r != "bar;<clinit>;<init>;foo;") return "Fail: '$r'"
return "OK"
}
compiler/testData/codegen/box/constructorCall/inlineFunInConstructorCallWithEnabledNormalization.kt → compiler/testData/codegen/box/constructorCall/inlineFunInConstructorCall.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// CONSTRUCTOR_CALL_NORMALIZATION_MODE: enable
// FILE: test.kt
fun box(): String {
Foo(
compiler/testData/codegen/box/constructorCall/inlineFunInConstructorCallEvaluationOrder.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: -NormalizeConstructorCalls
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// FILE: test.kt
@@ -14,7 +13,7 @@ fun box(): String {
)
val result = log.toString()
if (result != "<clinit>ik<init>j<init>") return "Fail: '$result'"
if (result != "ik<clinit><init>j<init>") return "Fail: '$result'"
return "OK"
}
compiler/testData/codegen/box/constructorCall/inlineFunInConstructorCallWithDisabledNormalization.kt
Vendored
-41
View File
@@ -1,41 +0,0 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// CONSTRUCTOR_CALL_NORMALIZATION_MODE: disable
// FILE: test.kt
fun box(): String {
Foo(
logged("i", 1.let { it }),
logged("j",
Foo(
logged("k", 2.let { it }),
null
)
)
)
val result = log.toString()
if (result != "<clinit>ik<init>j<init>") return "Fail: '$result'"
return "OK"
}
// FILE: util.kt
val log = StringBuilder()
fun <T> logged(msg: String, value: T): T {
log.append(msg)
return value
}
// FILE: Foo.kt
class Foo(i: Int, j: Foo?) {
init {
log.append("<init>")
}
companion object {
init {
log.append("<clinit>")
}
}
}
compiler/testData/codegen/box/constructorCall/inlineFunInConstructorCallWithStrictNormalization.kt
Vendored
-41
View File
@@ -1,41 +0,0 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// CONSTRUCTOR_CALL_NORMALIZATION_MODE: preserve-class-initialization
// FILE: test.kt
fun box(): String {
Foo(
logged("i", 1.let { it }),
logged("j",
Foo(
logged("k", 2.let { it }),
null
)
)
)
val result = log.toString()
if (result != "<clinit>ik<init>j<init>") return "Fail: '$result'"
return "OK"
}
// FILE: util.kt
val log = StringBuilder()
fun <T> logged(msg: String, value: T): T {
log.append(msg)
return value
}
// FILE: Foo.kt
class Foo(i: Int, j: Foo?) {
init {
log.append("<init>")
}
companion object {
init {
log.append("<clinit>")
}
}
}
compiler/testData/codegen/box/constructorCall/inlineFunInInnerClassConstructorCall.kt
Vendored
+2 -3
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: -NormalizeConstructorCalls
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// FILE: test.kt
@@ -9,7 +8,7 @@ fun box(): String {
)
val result = log.toString()
if (result != "Foo.<clinit>;i;j;Foo.<init>;Inner.<init>;") return "Fail: '$result'"
if (result != "i;j;Foo.<clinit>;Foo.<init>;Inner.<init>;") return "Fail: '$result'"
return "OK"
}
@@ -41,4 +40,4 @@ class Outer {
log.append("Inner.<init>;")
}
}
}
}
compiler/testData/codegen/box/constructorCall/inlineFunInLocalClassConstructorCall.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: -NormalizeConstructorCalls
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// FILE: test.kt
@@ -15,7 +14,7 @@ fun box(): String {
)
val result = log.toString()
if (result != "Foo.<clinit>;i;j;Foo.<init>;Local.<init>;") return "Fail: '$result'"
if (result != "i;j;Foo.<clinit>;Foo.<init>;Local.<init>;") return "Fail: '$result'"
return "OK"
}
compiler/testData/codegen/box/constructorCall/loopInInlineFunWithEnabledNormalization.kt → compiler/testData/codegen/box/constructorCall/loopInInlineFun.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// CONSTRUCTOR_CALL_NORMALIZATION_MODE: enable
// FILE: test.kt
fun box(): String {
Foo(
compiler/testData/codegen/box/constructorCall/loopInInlineFunInSuperConstructorCallWithEnabledNormalizationSince13.kt → compiler/testData/codegen/box/constructorCall/loopInInlineFunInSuperConstructorCall.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: +NormalizeConstructorCalls
// TARGET_BACKEND: JVM
// WITH_RUNTIME
open class A(val s: String)
@@ -11,4 +10,4 @@ inline fun test(crossinline z: () -> String): String {
fun box(): String {
return test { "OK" }
}
}
compiler/testData/codegen/box/constructorCall/loopInInlineFunInSuperConstructorCallWithEnabledNormalization.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// CONSTRUCTOR_CALL_NORMALIZATION_MODE: enable
open class A(val s: String)
inline fun test(crossinline z: () -> String): String {
return object : A(listOf(1).map { it.toString() }.joinToString()) {
val value = z()
}.value
}
fun box(): String {
return test { "OK" }
}
compiler/testData/codegen/box/constructorCall/nonLocalReturnInConstructorArguments.kt
Vendored
+2 -3
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: -NormalizeConstructorCalls
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// FILE: test.kt
@@ -17,7 +16,7 @@ fun box(): String {
}
val result = log.toString()
if (result != "<clinit>ij<init>") return "Fail: '$result'"
if (result != "ij<clinit><init>") return "Fail: '$result'"
return "OK"
}
@@ -41,4 +40,4 @@ class Foo(i: Int, j: Int) {
log.append("<clinit>")
}
}
}
}
compiler/testData/codegen/box/constructorCall/tryCatchInConstructorCallEvaluationOrder.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: -NormalizeConstructorCalls
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// FILE: test.kt
@@ -9,7 +8,7 @@ fun box(): String {
)
val result = log.toString()
if (result != "<clinit>ij<init>") return "Fail: '$result'"
if (result != "ij<clinit><init>") return "Fail: '$result'"
return "OK"
}