From ebc64da52a99b6542605289d45edc8fa5adb650f Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 15 Aug 2018 17:15:30 +0300 Subject: [PATCH] Update EXPECTED_REACHABLE_NODES after introducing top-level comparator #KT-18067 --- js/js.translator/testData/box/dataClass/hashcode.kt | 2 +- js/js.translator/testData/box/dynamic/iterator.kt | 2 +- js/js.translator/testData/box/enum/standardMethods.kt | 2 +- js/js.translator/testData/box/examples/basicmethod.kt | 2 +- js/js.translator/testData/box/expression/function/KT-921.kt | 2 +- .../testData/box/expression/misc/toGeneratorInStdlib.kt | 2 +- js/js.translator/testData/box/inline/arrayLiteralAliasing.kt | 2 +- .../box/inlineEvaluationOrder/arrayAccessLhsDecomposed.kt | 2 +- js/js.translator/testData/box/inlineSizeReduction/lastBreak.kt | 2 +- .../box/inlineStdlib/callableRefToFunInCurrentModule.kt | 2 +- js/js.translator/testData/box/java/arrayList/indexOf.kt | 2 +- js/js.translator/testData/box/java/arrayList/misc.kt | 2 +- js/js.translator/testData/box/java/arrayList/removeAll.kt | 2 +- js/js.translator/testData/box/java/arrayList/retainAll.kt | 2 +- js/js.translator/testData/box/jsCode/referenceToKotlin.kt | 2 +- .../testData/box/nameClashes/extensionFunctionAndProperty.kt | 2 +- js/js.translator/testData/box/number/mulInt32.kt | 2 +- .../testData/box/objectDeclaration/dontPolluteObject.kt | 2 +- js/js.translator/testData/box/operatorOverloading/lambdaRhs.kt | 2 +- js/js.translator/testData/box/range/creatingProgressions.kt | 2 +- js/js.translator/testData/box/range/intDownTo.kt | 2 +- js/js.translator/testData/box/range/reverse.kt | 2 +- js/js.translator/testData/box/reflection/primitives-12.kt | 2 +- js/js.translator/testData/box/reified/lambda.kt | 2 +- js/js.translator/testData/box/reified/vararg.kt | 2 +- js/js.translator/testData/box/rtti/collectionClassesIsCheck.kt | 2 +- js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/js/js.translator/testData/box/dataClass/hashcode.kt b/js/js.translator/testData/box/dataClass/hashcode.kt index bba8e71de98..048c0bf2184 100644 --- a/js/js.translator/testData/box/dataClass/hashcode.kt +++ b/js/js.translator/testData/box/dataClass/hashcode.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1404 +// EXPECTED_REACHABLE_NODES: 1550 package foo diff --git a/js/js.translator/testData/box/dynamic/iterator.kt b/js/js.translator/testData/box/dynamic/iterator.kt index 0e616cd6723..e9a80b1ffd1 100644 --- a/js/js.translator/testData/box/dynamic/iterator.kt +++ b/js/js.translator/testData/box/dynamic/iterator.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1414 +// EXPECTED_REACHABLE_NODES: 1560 package foo fun testFor(expected: Int, d: dynamic, case: String) { diff --git a/js/js.translator/testData/box/enum/standardMethods.kt b/js/js.translator/testData/box/enum/standardMethods.kt index 83350b62422..372a07ee31e 100644 --- a/js/js.translator/testData/box/enum/standardMethods.kt +++ b/js/js.translator/testData/box/enum/standardMethods.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1413 +// EXPECTED_REACHABLE_NODES: 1560 package foo enum class EmptyEnum diff --git a/js/js.translator/testData/box/examples/basicmethod.kt b/js/js.translator/testData/box/examples/basicmethod.kt index 7c568415fa3..d2d40ffbbc0 100644 --- a/js/js.translator/testData/box/examples/basicmethod.kt +++ b/js/js.translator/testData/box/examples/basicmethod.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1393 +// EXPECTED_REACHABLE_NODES: 1540 interface Tr { fun extra(): String = "_" diff --git a/js/js.translator/testData/box/expression/function/KT-921.kt b/js/js.translator/testData/box/expression/function/KT-921.kt index 87454859276..7e44e200340 100644 --- a/js/js.translator/testData/box/expression/function/KT-921.kt +++ b/js/js.translator/testData/box/expression/function/KT-921.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1393 +// EXPECTED_REACHABLE_NODES: 1540 var log = "" diff --git a/js/js.translator/testData/box/expression/misc/toGeneratorInStdlib.kt b/js/js.translator/testData/box/expression/misc/toGeneratorInStdlib.kt index c4349220bcb..e601d021079 100644 --- a/js/js.translator/testData/box/expression/misc/toGeneratorInStdlib.kt +++ b/js/js.translator/testData/box/expression/misc/toGeneratorInStdlib.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1407 +// EXPECTED_REACHABLE_NODES: 1552 package foo fun sequenceFromFunctionWithInitialValue() { diff --git a/js/js.translator/testData/box/inline/arrayLiteralAliasing.kt b/js/js.translator/testData/box/inline/arrayLiteralAliasing.kt index 15d28c1877f..e3bfa899d78 100644 --- a/js/js.translator/testData/box/inline/arrayLiteralAliasing.kt +++ b/js/js.translator/testData/box/inline/arrayLiteralAliasing.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1391 +// EXPECTED_REACHABLE_NODES: 1534 /* This tests that variables (aliases) are created for array literals. diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccessLhsDecomposed.kt b/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccessLhsDecomposed.kt index 6fea16ae688..e888982cb3e 100644 --- a/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccessLhsDecomposed.kt +++ b/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccessLhsDecomposed.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1384 +// EXPECTED_REACHABLE_NODES: 1528 package foo var global = "" diff --git a/js/js.translator/testData/box/inlineSizeReduction/lastBreak.kt b/js/js.translator/testData/box/inlineSizeReduction/lastBreak.kt index 58e3b9653f4..357655eebbb 100644 --- a/js/js.translator/testData/box/inlineSizeReduction/lastBreak.kt +++ b/js/js.translator/testData/box/inlineSizeReduction/lastBreak.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1385 +// EXPECTED_REACHABLE_NODES: 1530 package foo // CHECK_NOT_CALLED: f1 diff --git a/js/js.translator/testData/box/inlineStdlib/callableRefToFunInCurrentModule.kt b/js/js.translator/testData/box/inlineStdlib/callableRefToFunInCurrentModule.kt index cb332b91f0f..c7fb9420fa2 100644 --- a/js/js.translator/testData/box/inlineStdlib/callableRefToFunInCurrentModule.kt +++ b/js/js.translator/testData/box/inlineStdlib/callableRefToFunInCurrentModule.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1383 +// EXPECTED_REACHABLE_NODES: 1525 package foo // CHECK_NOT_CALLED_IN_SCOPE: scope=test function=even diff --git a/js/js.translator/testData/box/java/arrayList/indexOf.kt b/js/js.translator/testData/box/java/arrayList/indexOf.kt index b4c1823ae87..45f29ad0aa3 100644 --- a/js/js.translator/testData/box/java/arrayList/indexOf.kt +++ b/js/js.translator/testData/box/java/arrayList/indexOf.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1381 +// EXPECTED_REACHABLE_NODES: 1525 package foo diff --git a/js/js.translator/testData/box/java/arrayList/misc.kt b/js/js.translator/testData/box/java/arrayList/misc.kt index 0216eb43870..7decae197a2 100644 --- a/js/js.translator/testData/box/java/arrayList/misc.kt +++ b/js/js.translator/testData/box/java/arrayList/misc.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1384 +// EXPECTED_REACHABLE_NODES: 1528 package foo diff --git a/js/js.translator/testData/box/java/arrayList/removeAll.kt b/js/js.translator/testData/box/java/arrayList/removeAll.kt index 0699c2de378..cc2253a5ec0 100644 --- a/js/js.translator/testData/box/java/arrayList/removeAll.kt +++ b/js/js.translator/testData/box/java/arrayList/removeAll.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1379 +// EXPECTED_REACHABLE_NODES: 1524 package foo diff --git a/js/js.translator/testData/box/java/arrayList/retainAll.kt b/js/js.translator/testData/box/java/arrayList/retainAll.kt index aedb53a90ad..ac75b21160d 100644 --- a/js/js.translator/testData/box/java/arrayList/retainAll.kt +++ b/js/js.translator/testData/box/java/arrayList/retainAll.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1379 +// EXPECTED_REACHABLE_NODES: 1524 package foo diff --git a/js/js.translator/testData/box/jsCode/referenceToKotlin.kt b/js/js.translator/testData/box/jsCode/referenceToKotlin.kt index e791d2eeac8..c584fe7191a 100644 --- a/js/js.translator/testData/box/jsCode/referenceToKotlin.kt +++ b/js/js.translator/testData/box/jsCode/referenceToKotlin.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1389 +// EXPECTED_REACHABLE_NODES: 1535 external fun p(m: String): String var log = "" diff --git a/js/js.translator/testData/box/nameClashes/extensionFunctionAndProperty.kt b/js/js.translator/testData/box/nameClashes/extensionFunctionAndProperty.kt index b5154c2fd55..bb857de1286 100644 --- a/js/js.translator/testData/box/nameClashes/extensionFunctionAndProperty.kt +++ b/js/js.translator/testData/box/nameClashes/extensionFunctionAndProperty.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1384 +// EXPECTED_REACHABLE_NODES: 1528 package foo public fun List.some(): T = this[0] diff --git a/js/js.translator/testData/box/number/mulInt32.kt b/js/js.translator/testData/box/number/mulInt32.kt index 409c2d24354..8ddab12c427 100644 --- a/js/js.translator/testData/box/number/mulInt32.kt +++ b/js/js.translator/testData/box/number/mulInt32.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1384 +// EXPECTED_REACHABLE_NODES: 1528 fun imul32(a: Int, b: Int): Int = js("Kotlin").imulEmulated(a, b) fun imul64(a: Int, b: Int): Int = (a.toLong() * b.toLong()).toInt() diff --git a/js/js.translator/testData/box/objectDeclaration/dontPolluteObject.kt b/js/js.translator/testData/box/objectDeclaration/dontPolluteObject.kt index c521aeda95d..d1691872666 100644 --- a/js/js.translator/testData/box/objectDeclaration/dontPolluteObject.kt +++ b/js/js.translator/testData/box/objectDeclaration/dontPolluteObject.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1404 +// EXPECTED_REACHABLE_NODES: 1549 package foo object EmptyObject {} diff --git a/js/js.translator/testData/box/operatorOverloading/lambdaRhs.kt b/js/js.translator/testData/box/operatorOverloading/lambdaRhs.kt index d0a1578df1f..8eb821452df 100644 --- a/js/js.translator/testData/box/operatorOverloading/lambdaRhs.kt +++ b/js/js.translator/testData/box/operatorOverloading/lambdaRhs.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1384 +// EXPECTED_REACHABLE_NODES: 1529 package foo var global = "" diff --git a/js/js.translator/testData/box/range/creatingProgressions.kt b/js/js.translator/testData/box/range/creatingProgressions.kt index b12a8727ced..e4a4d091077 100644 --- a/js/js.translator/testData/box/range/creatingProgressions.kt +++ b/js/js.translator/testData/box/range/creatingProgressions.kt @@ -1,4 +1,4 @@ -// EXPECTED_REACHABLE_NODES: 1143 +// EXPECTED_REACHABLE_NODES: 1262 package foo fun box(): String { diff --git a/js/js.translator/testData/box/range/intDownTo.kt b/js/js.translator/testData/box/range/intDownTo.kt index 400384c30ec..fc8b6ecdcfa 100644 --- a/js/js.translator/testData/box/range/intDownTo.kt +++ b/js/js.translator/testData/box/range/intDownTo.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1382 +// EXPECTED_REACHABLE_NODES: 1526 package foo diff --git a/js/js.translator/testData/box/range/reverse.kt b/js/js.translator/testData/box/range/reverse.kt index 78976270c5a..03d74410ae7 100644 --- a/js/js.translator/testData/box/range/reverse.kt +++ b/js/js.translator/testData/box/range/reverse.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1381 +// EXPECTED_REACHABLE_NODES: 1526 package foo fun box(): String { diff --git a/js/js.translator/testData/box/reflection/primitives-12.kt b/js/js.translator/testData/box/reflection/primitives-12.kt index 88e28f9a9a2..5bb0d7099dc 100644 --- a/js/js.translator/testData/box/reflection/primitives-12.kt +++ b/js/js.translator/testData/box/reflection/primitives-12.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1119 +// EXPECTED_REACHABLE_NODES: 1233 // LANGUAGE_VERSION: 1.2 import kotlin.reflect.KClass diff --git a/js/js.translator/testData/box/reified/lambda.kt b/js/js.translator/testData/box/reified/lambda.kt index d5b808c5b47..a0b7aa4f829 100644 --- a/js/js.translator/testData/box/reified/lambda.kt +++ b/js/js.translator/testData/box/reified/lambda.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1401 +// EXPECTED_REACHABLE_NODES: 1545 package foo // CHECK_CALLED: doFilter diff --git a/js/js.translator/testData/box/reified/vararg.kt b/js/js.translator/testData/box/reified/vararg.kt index e2640d64d2b..054b81139d8 100644 --- a/js/js.translator/testData/box/reified/vararg.kt +++ b/js/js.translator/testData/box/reified/vararg.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1384 +// EXPECTED_REACHABLE_NODES: 1529 package foo // CHECK_NOT_CALLED: test diff --git a/js/js.translator/testData/box/rtti/collectionClassesIsCheck.kt b/js/js.translator/testData/box/rtti/collectionClassesIsCheck.kt index f0c10adf16c..a30809e5ef9 100644 --- a/js/js.translator/testData/box/rtti/collectionClassesIsCheck.kt +++ b/js/js.translator/testData/box/rtti/collectionClassesIsCheck.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1415 +// EXPECTED_REACHABLE_NODES: 1561 // KT-2468 ArrayList is List or HashSet is Set fails in generated JS code package foo diff --git a/js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt b/js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt index 5630908b7f2..03b565a2831 100644 --- a/js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt +++ b/js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JS_IR -// EXPECTED_REACHABLE_NODES: 1394 +// EXPECTED_REACHABLE_NODES: 1538 // KT-5192 JS compiler fails to generate correct code for List implementation package foo