diff --git a/compiler/testData/codegen/box/when/enumOptimization/manyWhensWithinClass.kt b/compiler/testData/codegen/box/when/enumOptimization/manyWhensWithinClass.kt index ee6b7063db0..34582394454 100644 --- a/compiler/testData/codegen/box/when/enumOptimization/manyWhensWithinClass.kt +++ b/compiler/testData/codegen/box/when/enumOptimization/manyWhensWithinClass.kt @@ -1,8 +1,6 @@ // WITH_RUNTIME // CHECK_CASES_COUNT: function=bar1_u51tkt$ count=3 TARGET_BACKENDS=JS -// CHECK_CASES_COUNT: function=bar1_eni42q_k$ count=0 IGNORED_BACKENDS=JS // CHECK_IF_COUNT: function=bar1_u51tkt$ count=0 TARGET_BACKENDS=JS -// CHECK_IF_COUNT: function=bar1_eni42q_k$ count=3 IGNORED_BACKENDS=JS // CHECK_CASES_COUNT: function=A$bar2$lambda count=3 TARGET_BACKENDS=JS // CHECK_CASES_COUNT: function=A$bar2$lambda count=0 IGNORED_BACKENDS=JS // CHECK_IF_COUNT: function=A$bar2$lambda count=0 diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/instanceCapturedInInterface.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/instanceCapturedInInterface.kt index 3e0b6541a9d..8909e5dc078 100644 --- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/instanceCapturedInInterface.kt +++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/instanceCapturedInInterface.kt @@ -1,7 +1,6 @@ // SKIP_INLINE_CHECK_IN: inlineFun$default // FILE: 1.kt // CHECK_CONTAINS_NO_CALLS: test TARGET_BACKENDS=JS -// CHECK_CONTAINS_NO_CALLS: test_0_k$ except=_get_value__0_k$ IGNORED_BACKENDS=JS package test //problem in test framework diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simpleGeneric.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simpleGeneric.kt index 585f0515753..826b00bc0db 100644 --- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simpleGeneric.kt +++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simpleGeneric.kt @@ -12,7 +12,6 @@ inline fun inlineFun(capturedParam: T, lambda: () -> T = { capturedParam // FILE: 2.kt // CHECK_CONTAINS_NO_CALLS: box TARGET_BACKENDS=JS -// CHECK_CONTAINS_NO_CALLS: box except=_get_value__0_k$ IGNORED_BACKENDS=JS import test.* diff --git a/js/js.translator/testData/box/closure/closureThisByUsingMethodFromParentClass.kt b/js/js.translator/testData/box/closure/closureThisByUsingMethodFromParentClass.kt index 5112d22b05c..c2aa6d8b1cb 100644 --- a/js/js.translator/testData/box/closure/closureThisByUsingMethodFromParentClass.kt +++ b/js/js.translator/testData/box/closure/closureThisByUsingMethodFromParentClass.kt @@ -1,4 +1,5 @@ // IGNORE_BACKEND: JS_IR_ES6 +// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1299 package foo diff --git a/js/js.translator/testData/box/coroutines/debugStatement.kt b/js/js.translator/testData/box/coroutines/debugStatement.kt index 7085f45aeec..138966fffbd 100644 --- a/js/js.translator/testData/box/coroutines/debugStatement.kt +++ b/js/js.translator/testData/box/coroutines/debugStatement.kt @@ -1,7 +1,6 @@ // KJS_WITH_FULL_RUNTIME // EXPECTED_REACHABLE_NODES: 1292 // CHECK_DEBUGGER_COUNT: function=doResume count=1 TARGET_BACKENDS=JS -// CHECK_DEBUGGER_COUNT: function=doResume_0_k$ count=1 IGNORED_BACKENDS=JS fun foo(f: suspend () -> Unit) { } diff --git a/js/js.translator/testData/box/coroutines/localVarOptimization.kt b/js/js.translator/testData/box/coroutines/localVarOptimization.kt index 386477c3bbe..b4b81efd3aa 100644 --- a/js/js.translator/testData/box/coroutines/localVarOptimization.kt +++ b/js/js.translator/testData/box/coroutines/localVarOptimization.kt @@ -1,10 +1,7 @@ // EXPECTED_REACHABLE_NODES: 1401 // DECLARES_VARIABLE: function=doResume name=k TARGET_BACKENDS=JS -// DECLARES_VARIABLE: function=doResume_0_k$ name=k IGNORED_BACKENDS=JS // PROPERTY_READ_COUNT: name=local$o count=1 TARGET_BACKENDS=JS -// PROPERTY_READ_COUNT: name=_o0 count=1 IGNORED_BACKENDS=JS // PROPERTY_WRITE_COUNT: name=local$o count=2 TARGET_BACKENDS=JS -// PROPERTY_WRITE_COUNT: name=_o0 count=1 IGNORED_BACKENDS=JS import kotlin.coroutines.* diff --git a/js/js.translator/testData/box/expression/for/overCollectionWithIndex.kt b/js/js.translator/testData/box/expression/for/overCollectionWithIndex.kt index 621113bbde3..d336e5b1ea9 100644 --- a/js/js.translator/testData/box/expression/for/overCollectionWithIndex.kt +++ b/js/js.translator/testData/box/expression/for/overCollectionWithIndex.kt @@ -4,7 +4,6 @@ // CHECK_NOT_CALLED_IN_SCOPE: function=component1 scope=test2 // CHECK_NOT_CALLED_IN_SCOPE: function=component1 scope=test3 // CHECK_CONTAINS_NO_CALLS: test4 except=toString TARGET_BACKENDS=JS -// CHECK_CONTAINS_NO_CALLS: test4 except=_get_size__0_k$ IGNORED_BACKENDS=JS fun test1(a: Sequence): String { var s = "" diff --git a/js/js.translator/testData/box/expression/for/rangeOptimization.kt b/js/js.translator/testData/box/expression/for/rangeOptimization.kt index bf776c354ed..64012fc5973 100644 --- a/js/js.translator/testData/box/expression/for/rangeOptimization.kt +++ b/js/js.translator/testData/box/expression/for/rangeOptimization.kt @@ -5,7 +5,7 @@ // CHECK_CONTAINS_NO_CALLS: testDownTo // CHECK_CONTAINS_NO_CALLS: testStep TARGET_BACKENDS=JS // CHECK_CONTAINS_NO_CALLS: testEmptyRange -// CHECK_CONTAINS_NO_CALLS: testRangeToParams except=from;to +// CHECK_CONTAINS_NO_CALLS: testRangeToParams except=from;to TARGET_BACKENDS=JS fun testRangeTo(): String { var result = "" diff --git a/js/js.translator/testData/box/inline/inlineCapturingThis.kt b/js/js.translator/testData/box/inline/inlineCapturingThis.kt index 74cdf595514..8cf4cb3f865 100644 --- a/js/js.translator/testData/box/inline/inlineCapturingThis.kt +++ b/js/js.translator/testData/box/inline/inlineCapturingThis.kt @@ -2,7 +2,6 @@ package foo // CHECK_CONTAINS_NO_CALLS: test TARGET_BACKENDS=JS -// CHECK_CONTAINS_NO_CALLS: test_0_k$ except=Unit_getInstance IGNORED_BACKENDS=JS inline fun block(p: () -> Unit) = p() diff --git a/js/js.translator/testData/box/inline/metadataForPublicFunction.kt b/js/js.translator/testData/box/inline/metadataForPublicFunction.kt index fad21ca4d09..7e86562d2a9 100644 --- a/js/js.translator/testData/box/inline/metadataForPublicFunction.kt +++ b/js/js.translator/testData/box/inline/metadataForPublicFunction.kt @@ -5,7 +5,6 @@ package foo // CHECK_CONTAINS_NO_CALLS: test2 except=imul // CHECK_CONTAINS_NO_CALLS: test3 except=imul // CHECK_CONTAINS_NO_CALLS: test4_buocd8$ except=imul TARGET_BACKENDS=JS -// CHECK_CONTAINS_NO_CALLS: test4_o4gm63_k$ except=imul IGNORED_BACKENDS=JS // CHECK_CONTAINS_NO_CALLS: test5 except=imul;OInner_getInstance // CHECK_HAS_INLINE_METADATA: apply TARGET_BACKENDS=JS // CHECK_HAS_INLINE_METADATA: applyL_h43q6c$ TARGET_BACKENDS=JS diff --git a/js/js.translator/testData/box/inline/operators.kt b/js/js.translator/testData/box/inline/operators.kt index a843a3ec6ad..93636adfd3e 100644 --- a/js/js.translator/testData/box/inline/operators.kt +++ b/js/js.translator/testData/box/inline/operators.kt @@ -2,8 +2,6 @@ // CHECK_FUNCTION_EXISTS: plus_za3lpa$ TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=plus_za3lpa$ scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: plus_ha5a7z_k$ IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=plus_ha5a7z_k$ scope=box IGNORED_BACKENDS=JS // CHECK_FUNCTION_EXISTS: plus TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=plus scope=box TARGET_BACKENDS=JS @@ -12,33 +10,21 @@ // CHECK_FUNCTION_EXISTS: invoke TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=invoke scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: invoke_0_k$ IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=invoke_0_k$ scope=box IGNORED_BACKENDS=JS // CHECK_FUNCTION_EXISTS: get_za3lpa$ TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=get_za3lpa$ scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: get_ha5a7z_k$ IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=get_ha5a7z_k$ scope=box IGNORED_BACKENDS=JS // CHECK_FUNCTION_EXISTS: set_vux9f0$ TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=set_vux9f0$ scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: set_rvwcgf_k$ IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=set_rvwcgf_k$ scope=box IGNORED_BACKENDS=JS // CHECK_FUNCTION_EXISTS: dec TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=dec scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: dec_0_k$ IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=dec_0_k$ scope=box IGNORED_BACKENDS=JS // CHECK_FUNCTION_EXISTS: minus_za3lpa$ TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=minus_za3lpa$ scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: minus_ha5a7z_k$ IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=minus_ha5a7z_k$ scope=box IGNORED_BACKENDS=JS // CHECK_FUNCTION_EXISTS: invoke_dqglrj$ TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=invoke_dqglrj$ scope=test TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: invoke_tg9lle_k$ IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=invoke_tg9lle_k$ scope=test_0_k$ IGNORED_BACKENDS=JS class A { inline operator fun plus(a: Int) = a + 10 diff --git a/js/js.translator/testData/box/inline/privateProperty.kt b/js/js.translator/testData/box/inline/privateProperty.kt index 802e4f9ea45..0cdf20fd2c2 100644 --- a/js/js.translator/testData/box/inline/privateProperty.kt +++ b/js/js.translator/testData/box/inline/privateProperty.kt @@ -130,10 +130,7 @@ private class A { // CHECK_NOT_CALLED_IN_SCOPE: function=get_p12_s8ev3n$ scope=box TARGET_BACKENDS=JS // CHECK_FUNCTION_EXISTS: set_p12_dqglrj$ TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=set_p12_dqglrj$ scope=box TARGET_BACKENDS=JS - // CHECK_FUNCTION_EXISTS: _get_p12__quadv7_k$ IGNORED_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=_get_p12__quadv7_k$ scope=box IGNORED_BACKENDS=JS - // CHECK_FUNCTION_EXISTS: _set_p12__e5dl2b_k$ IGNORED_BACKENDS=JS - // CHECK_NOT_CALLED_IN_SCOPE: function=_set_p12__e5dl2b_k$ scope=box IGNORED_BACKENDS=JS inline var Int.p12: Int get() = this * 100 + a + 120000 set(v) { @@ -143,9 +140,6 @@ private class A { // CHECK_FUNCTION_EXISTS: get_p13_s8ev3n$ TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=get_p13_s8ev3n$ scope=box TARGET_BACKENDS=JS // CHECK_CALLED_IN_SCOPE: function=set_p13_dqglrj$ scope=box TARGET_BACKENDS=JS - // CHECK_FUNCTION_EXISTS: _get_p13__quadv7_k$ IGNORED_BACKENDS=JS - // CHECK_NOT_CALLED_IN_SCOPE: function=_get_p13__quadv7_k$ scope=box IGNORED_BACKENDS=JS - // CHECK_CALLED_IN_SCOPE: function=_set_p13__e5dl2b_k$ scope=box IGNORED_BACKENDS=JS var Int.p13: Int inline get() = this * 100 + a + 130000 set(v) { @@ -155,9 +149,6 @@ private class A { // CHECK_CALLED_IN_SCOPE: function=get_p14_s8ev3n$ scope=box TARGET_BACKENDS=JS // CHECK_FUNCTION_EXISTS: set_p14_dqglrj$ TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=set_p14_dqglrj$ scope=box TARGET_BACKENDS=JS - // CHECK_CALLED_IN_SCOPE: function=_get_p14__quadv7_k$ scope=box IGNORED_BACKENDS=JS - // CHECK_FUNCTION_EXISTS: _set_p14__e5dl2b_k$ IGNORED_BACKENDS=JS - // CHECK_NOT_CALLED_IN_SCOPE: function=_set_p14__e5dl2b_k$ scope=box IGNORED_BACKENDS=JS var Int.p14: Int get() = this * 100 + a + 140000 inline set(v) { diff --git a/js/js.translator/testData/box/inlineMultiModule/importObjectInstance.kt b/js/js.translator/testData/box/inlineMultiModule/importObjectInstance.kt index df602fb156d..41e8d0bfb28 100644 --- a/js/js.translator/testData/box/inlineMultiModule/importObjectInstance.kt +++ b/js/js.translator/testData/box/inlineMultiModule/importObjectInstance.kt @@ -11,6 +11,5 @@ inline fun foo() = O.bar() // MODULE: main(lib) // FILE: main.kt // CHECK_CONTAINS_NO_CALLS: box except=bar TARGET_BACKENDS=JS -// CHECK_CONTAINS_NO_CALLS: box except=bar_0_k$;O_getInstance; IGNORED_BACKENDS=JS fun box() = foo() diff --git a/js/js.translator/testData/box/inlineMultiModule/operators.kt b/js/js.translator/testData/box/inlineMultiModule/operators.kt index 143a0ad8b5a..7c8236d22a8 100644 --- a/js/js.translator/testData/box/inlineMultiModule/operators.kt +++ b/js/js.translator/testData/box/inlineMultiModule/operators.kt @@ -16,11 +16,6 @@ inline operator fun B.plus(b: Int) = b + 20 // CHECK_NOT_CALLED_IN_SCOPE: function=plus_za3lpa$ scope=box TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=plus scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: plus_ha5a7z_k$ IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=plus_ha5a7z_k$ scope=box IGNORED_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: plus_0 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=plus_0 scope=box IGNORED_BACKENDS=JS - fun box(): String { var result = A() + 1 if (result != 11) return "fail: member operator" diff --git a/js/js.translator/testData/box/multiModule/publishedApiMangling.kt b/js/js.translator/testData/box/multiModule/publishedApiMangling.kt index 3377fa174fa..83452bb6e2b 100644 --- a/js/js.translator/testData/box/multiModule/publishedApiMangling.kt +++ b/js/js.translator/testData/box/multiModule/publishedApiMangling.kt @@ -2,7 +2,6 @@ // EXPECTED_REACHABLE_NODES: 1280 // PROPERTY_WRITE_COUNT: name=publishedTopLevel_61zpoe$ count=1 TARGET_BACKENDS=JS // PROPERTY_WRITE_COUNT: name=published_61zpoe$ count=1 TARGET_BACKENDS=JS -// PROPERTY_WRITE_COUNT: name=published_6wfw3l_k$ count=1 IGNORED_BACKENDS=JS // PROPERTY_WRITE_COUNT: name=B count=1 TARGET_BACKENDS=JS class A { @PublishedApi diff --git a/js/js.translator/testData/typescript-export/constructors/constructors.d.ts b/js/js.translator/testData/typescript-export/constructors/constructors.d.ts index ba056a916fb..5c712041e5e 100644 --- a/js/js.translator/testData/typescript-export/constructors/constructors.d.ts +++ b/js/js.translator/testData/typescript-export/constructors/constructors.d.ts @@ -19,17 +19,17 @@ declare namespace JS_TESTS { static createFromString(y: string): ClassWithMultipleSecondaryCtors; static createFromInts(y: number, z: number): ClassWithMultipleSecondaryCtors; } - class DerivedClassWithSecondaryCtor extends OpenClassWithMixedConstructors { - private constructor(); - static delegateToPrimary(y: string): DerivedClassWithSecondaryCtor; - static delegateToCreateFromInts(y: number, z: number): DerivedClassWithSecondaryCtor; - } class OpenClassWithMixedConstructors { constructor(x: string); readonly x: string; static createFromStrings(y: string, z: string): OpenClassWithMixedConstructors; static createFromInts(y: number, z: number): OpenClassWithMixedConstructors; } + class DerivedClassWithSecondaryCtor extends OpenClassWithMixedConstructors { + private constructor(); + static delegateToPrimary(y: string): DerivedClassWithSecondaryCtor; + static delegateToCreateFromInts(y: number, z: number): DerivedClassWithSecondaryCtor; + } class KotlinGreeter { constructor(greeting: string); readonly greeting: string;