diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsAstHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsAstHandler.kt index 1fac85a75b9..642fe44c9a3 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsAstHandler.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsAstHandler.kt @@ -33,10 +33,11 @@ class JsAstHandler(testServices: TestServices) : JsBinaryArtifactHandler(testSer } private fun processJsProgram(program: JsProgram, psiFiles: List, targetBackend: TargetBackend) { + psiFiles.forEach { DirectiveTestUtils.processDirectives(program, it, targetBackend) } + // TODO: For now the IR backend generates JS code that doesn't pass verification, // TODO: so we temporarily disabled AST verification. if (targetBackend == TargetBackend.JS) { - psiFiles.forEach { DirectiveTestUtils.processDirectives(program, it, targetBackend) } program.verifyAst() } } diff --git a/js/js.translator/testData/box/inline/privateProperty.kt b/js/js.translator/testData/box/inline/privateProperty.kt index 80b3ecbfa4f..51074b3869d 100644 --- a/js/js.translator/testData/box/inline/privateProperty.kt +++ b/js/js.translator/testData/box/inline/privateProperty.kt @@ -7,10 +7,10 @@ var a = 0 // CHECK_NOT_CALLED_IN_SCOPE: function=get_p1 scope=box TARGET_BACKENDS=JS // CHECK_FUNCTION_EXISTS: set_p1 TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=set_p1 scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _get_p1__59117 IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _get_p1__1413126122 IGNORED_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=_get_p1_ scope=box IGNORED_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _set_p1__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p1__59117 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _set_p1__3473235702 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p1__3473235702 scope=box IGNORED_BACKENDS=JS private inline var p1: Int get() = a + 10000 set(v) { @@ -20,9 +20,9 @@ private inline var p1: Int // CHECK_FUNCTION_EXISTS: get_p2 TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=get_p2 scope=box TARGET_BACKENDS=JS // CHECK_CALLED_IN_SCOPE: function=set_p2 scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _get_p2__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_get_p2__59117 scope=box IGNORED_BACKENDS=JS -// CHECK_CALLED_IN_SCOPE: function=_set_p2__59117 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _get_p2__1413126153 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_get_p2__1413126153 scope=box IGNORED_BACKENDS=JS +// CHECK_CALLED_IN_SCOPE: function=_set_p2__3473235733 scope=box IGNORED_BACKENDS=JS private var p2: Int inline get() = a + 20000 set(v) { @@ -32,9 +32,9 @@ private var p2: Int // CHECK_CALLED_IN_SCOPE: function=get_p3 scope=box TARGET_BACKENDS=JS // CHECK_FUNCTION_EXISTS: set_p3 TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=set_p3 scope=box TARGET_BACKENDS=JS -// CHECK_CALLED_IN_SCOPE: function=_get_p3__59117 scope=box IGNORED_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _set_p3__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p3__59117 scope=box IGNORED_BACKENDS=JS +// CHECK_CALLED_IN_SCOPE: function=_get_p3__1413126184 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _set_p3__3473235764 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p3__3473235764 scope=box IGNORED_BACKENDS=JS var p3: Int get() = a + 30000 private inline set(v) { @@ -44,9 +44,9 @@ var p3: Int // CHECK_CALLED_IN_SCOPE: function=get_p4 scope=box TARGET_BACKENDS=JS // CHECK_FUNCTION_EXISTS: set_p4 TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=set_p4 scope=box TARGET_BACKENDS=JS -// CHECK_CALLED_IN_SCOPE: function=_get_p4__59117 scope=box IGNORED_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _set_p4__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p4__59117 scope=box IGNORED_BACKENDS=JS +// CHECK_CALLED_IN_SCOPE: function=_get_p4__1413126215 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _set_p4__3473235795 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p4__3473235795 scope=box IGNORED_BACKENDS=JS private var p4: Int get() = a + 40000 inline set(v) { @@ -57,10 +57,10 @@ private var p4: Int // CHECK_NOT_CALLED_IN_SCOPE: function=get_p5 scope=box TARGET_BACKENDS=JS // CHECK_FUNCTION_EXISTS: set_p5 TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=set_p5 scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _get_p5__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_get_p5__59117 scope=box IGNORED_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _set_p5__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p5__59117 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _get_p5__1413126246 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_get_p5__1413126246 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _set_p5__3473235826 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p5__3473235826 scope=box IGNORED_BACKENDS=JS private inline var Int.p5: Int get() = this * 100 + a + 50000 set(v) { @@ -70,9 +70,9 @@ private inline var Int.p5: Int // CHECK_FUNCTION_EXISTS: get_p6 TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=get_p6 scope=box TARGET_BACKENDS=JS // CHECK_CALLED_IN_SCOPE: function=set_p6 scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _get_p6__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_get_p6__59117 scope=box IGNORED_BACKENDS=JS -// CHECK_CALLED_IN_SCOPE: function=_set_p6__59117 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _get_p6__1413126277 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_get_p6__1413126277 scope=box IGNORED_BACKENDS=JS +// CHECK_CALLED_IN_SCOPE: function=_set_p6__3473235857 scope=box IGNORED_BACKENDS=JS private var Int.p6: Int inline get() = this * 100 + a + 60000 set(v) { @@ -82,9 +82,9 @@ private var Int.p6: Int // CHECK_CALLED_IN_SCOPE: function=get_p7 scope=box TARGET_BACKENDS=JS // CHECK_FUNCTION_EXISTS: set_p7 TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=set_p7 scope=box TARGET_BACKENDS=JS -// CHECK_CALLED_IN_SCOPE: function=_get_p7__59117 scope=box IGNORED_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _set_p7__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p7__59117 scope=box IGNORED_BACKENDS=JS +// CHECK_CALLED_IN_SCOPE: function=_get_p7__1413126308 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _set_p7__3473235888 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p7__3473235888 scope=box IGNORED_BACKENDS=JS var Int.p7: Int get() = this * 100 + a + 70000 private inline set(v) { @@ -94,9 +94,9 @@ var Int.p7: Int // CHECK_CALLED_IN_SCOPE: function=get_p8 scope=box TARGET_BACKENDS=JS // CHECK_FUNCTION_EXISTS: set_p8 TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=set_p8 scope=box TARGET_BACKENDS=JS -// CHECK_CALLED_IN_SCOPE: function=_get_p8__59117 scope=box IGNORED_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _set_p8__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p8__59117 scope=box IGNORED_BACKENDS=JS +// CHECK_CALLED_IN_SCOPE: function=_get_p8__1413126339 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _set_p8__3473235919 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p8__3473235919 scope=box IGNORED_BACKENDS=JS private var Int.p8: Int get() = this * 100 + a + 80000 inline set(v) { @@ -160,10 +160,10 @@ private class A { // CHECK_NOT_CALLED_IN_SCOPE: function=get_p15 scope=box TARGET_BACKENDS=JS // CHECK_FUNCTION_EXISTS: set_p15 TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=set_p15 scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _get_p15__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_get_p15__59117 scope=box IGNORED_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _set_p15__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p15__59117 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _get_p15__857236605 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_get_p15__857236605 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _set_p15__296124145 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p15__296124145 scope=box IGNORED_BACKENDS=JS private inline var A.p15: Int get() = a + 150000 set(v) { @@ -173,9 +173,9 @@ private inline var A.p15: Int // CHECK_FUNCTION_EXISTS: get_p16 TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=get_p16 scope=box TARGET_BACKENDS=JS // CHECK_CALLED_IN_SCOPE: function=set_p16 scope=box TARGET_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _get_p16__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_get_p16__59117 scope=box IGNORED_BACKENDS=JS -// CHECK_CALLED_IN_SCOPE: function=_set_p16__59117 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _get_p16__857236636 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_get_p16__857236636 scope=box IGNORED_BACKENDS=JS +// CHECK_CALLED_IN_SCOPE: function=_set_p16__296124176 scope=box IGNORED_BACKENDS=JS private var A.p16: Int inline get() = a + 160000 set(v) { @@ -185,9 +185,9 @@ private var A.p16: Int // CHECK_CALLED_IN_SCOPE: function=get_p17 scope=box TARGET_BACKENDS=JS // CHECK_FUNCTION_EXISTS: set_p17 TARGET_BACKENDS=JS // CHECK_NOT_CALLED_IN_SCOPE: function=set_p17 scope=box TARGET_BACKENDS=JS -// CHECK_CALLED_IN_SCOPE: function=_get_p17__59117 scope=box IGNORED_BACKENDS=JS -// CHECK_FUNCTION_EXISTS: _set_p17__59117 IGNORED_BACKENDS=JS -// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p17__59117 scope=box IGNORED_BACKENDS=JS +// CHECK_CALLED_IN_SCOPE: function=_get_p17__857236667 scope=box IGNORED_BACKENDS=JS +// CHECK_FUNCTION_EXISTS: _set_p17__296124207 IGNORED_BACKENDS=JS +// CHECK_NOT_CALLED_IN_SCOPE: function=_set_p17__296124207 scope=box IGNORED_BACKENDS=JS private var A.p17: Int get() = a + 170000 inline set(v) {