From a19f8ffe6a6450b6caee55bdfab9e26ec2ee88c6 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 13 Dec 2019 12:14:58 +0900 Subject: [PATCH] Revert "Debugger: Add IR-powered ranking tests" This reverts commit ce21a559 Because of the erroneous behavior in 'BuilderFactoryForDuplicateSignatureDiagnostics.groupMembersDescriptorsBySignature', two functions with arguments of different inline class types are considered to have the same JVM signature. Before the error wasn't reported, as classes didn't have proper source elements. This issue has to be fixed before enabling ranking tests. --- .../backend/jvm/codegen/ClassCodegen.kt | 2 +- .../kotlin/generators/tests/GenerateTests.kt | 5 +- .../generators/tests/GenerateTests.kt.183 | 5 +- .../generators/tests/GenerateTests.kt.as34 | 5 +- .../generators/tests/GenerateTests.kt.as35 | 5 +- .../generators/tests/GenerateTests.kt.as36 | 5 +- .../test/AbstractIrFileRankingTest.kt | 12 --- .../test/IrFileRankingTestGenerated.java | 91 ------------------- .../testData/fileRanking/lambdas.kt | 4 +- .../testData/fileRanking/propertyDelegates.kt | 4 +- 10 files changed, 8 insertions(+), 130 deletions(-) delete mode 100644 idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractIrFileRankingTest.kt delete mode 100644 idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrFileRankingTestGenerated.java diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt index dbeb527a23b..c339ff1d0c3 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt @@ -75,7 +75,7 @@ open class ClassCodegen protected constructor( val descriptor = WrappedClassDescriptor() descriptor.bind(irClass) return state.factory.newVisitor( - irClass.OtherOrigin, + OtherOrigin(descriptor.psiElement, descriptor), type, irClass.fileParent.loadSourceFilesInfo() ) diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index d7014cb6bd4..547af9a4ba9 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -58,6 +58,7 @@ import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest import org.jetbrains.kotlin.idea.debugger.evaluate.* import org.jetbrains.kotlin.idea.debugger.test.sequence.exec.AbstractSequenceTraceTestCase import org.jetbrains.kotlin.idea.debugger.test.* +import org.jetbrains.kotlin.idea.debugger.test.AbstractFileRankingTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToDecompiledLibraryTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTestWithJS @@ -220,10 +221,6 @@ fun main(args: Array) { model("fileRanking") } - testClass { - model("fileRanking", targetBackend = TargetBackend.JVM_IR) - } - testClass { model("asyncStackTrace") } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183 index e31b4cddf16..f998a0873c3 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183 @@ -69,6 +69,7 @@ import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest import org.jetbrains.kotlin.idea.debugger.evaluate.* import org.jetbrains.kotlin.idea.debugger.test.sequence.exec.AbstractSequenceTraceTestCase import org.jetbrains.kotlin.idea.debugger.test.* +import org.jetbrains.kotlin.idea.debugger.test.AbstractFileRankingTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToDecompiledLibraryTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTestWithJS @@ -227,10 +228,6 @@ fun main(args: Array) { model("fileRanking") } - testClass { - model("fileRanking", targetBackend = TargetBackend.JVM_IR) - } - testClass { model("asyncStackTrace") } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34 index a1905718cbb..7d922ef244c 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34 @@ -66,6 +66,7 @@ import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest import org.jetbrains.kotlin.idea.debugger.evaluate.* import org.jetbrains.kotlin.idea.debugger.test.sequence.exec.AbstractSequenceTraceTestCase import org.jetbrains.kotlin.idea.debugger.test.* +import org.jetbrains.kotlin.idea.debugger.test.AbstractFileRankingTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToDecompiledLibraryTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTestWithJS @@ -217,10 +218,6 @@ fun main(args: Array) { model("fileRanking") } - testClass { - model("fileRanking", targetBackend = TargetBackend.JVM_IR) - } - testClass { model("asyncStackTrace") } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 index a1905718cbb..7d922ef244c 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 @@ -66,6 +66,7 @@ import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest import org.jetbrains.kotlin.idea.debugger.evaluate.* import org.jetbrains.kotlin.idea.debugger.test.sequence.exec.AbstractSequenceTraceTestCase import org.jetbrains.kotlin.idea.debugger.test.* +import org.jetbrains.kotlin.idea.debugger.test.AbstractFileRankingTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToDecompiledLibraryTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTestWithJS @@ -217,10 +218,6 @@ fun main(args: Array) { model("fileRanking") } - testClass { - model("fileRanking", targetBackend = TargetBackend.JVM_IR) - } - testClass { model("asyncStackTrace") } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 index a1905718cbb..7d922ef244c 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 @@ -66,6 +66,7 @@ import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest import org.jetbrains.kotlin.idea.debugger.evaluate.* import org.jetbrains.kotlin.idea.debugger.test.sequence.exec.AbstractSequenceTraceTestCase import org.jetbrains.kotlin.idea.debugger.test.* +import org.jetbrains.kotlin.idea.debugger.test.AbstractFileRankingTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToDecompiledLibraryTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTest import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTestWithJS @@ -217,10 +218,6 @@ fun main(args: Array) { model("fileRanking") } - testClass { - model("fileRanking", targetBackend = TargetBackend.JVM_IR) - } - testClass { model("asyncStackTrace") } diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractIrFileRankingTest.kt b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractIrFileRankingTest.kt deleted file mode 100644 index 62935e2f170..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractIrFileRankingTest.kt +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.debugger.test - -import org.jetbrains.kotlin.test.TargetBackend - -abstract class AbstractIrFileRankingTest : AbstractFileRankingTest() { - override fun getBackend() = TargetBackend.JVM_IR -} \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrFileRankingTestGenerated.java b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrFileRankingTestGenerated.java deleted file mode 100644 index 9f66c48baed..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrFileRankingTestGenerated.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.debugger.test; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class IrFileRankingTestGenerated extends AbstractIrFileRankingTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); - } - - public void testAllFilesPresentInFileRanking() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @TestMetadata("anonymousClasses.kt") - public void testAnonymousClasses() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/anonymousClasses.kt"); - } - - @TestMetadata("differentFlags.kt") - public void testDifferentFlags() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/differentFlags.kt"); - } - - @TestMetadata("init.kt") - public void testInit() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/init.kt"); - } - - @TestMetadata("lambdas.kt") - public void testLambdas() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/lambdas.kt"); - } - - @TestMetadata("multilinePrimaryConstructor.kt") - public void testMultilinePrimaryConstructor() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/multilinePrimaryConstructor.kt"); - } - - @TestMetadata("multilinePrimaryConstructorWithBody.kt") - public void testMultilinePrimaryConstructorWithBody() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/multilinePrimaryConstructorWithBody.kt"); - } - - @TestMetadata("parametersWithUnloadedClass.kt") - public void testParametersWithUnloadedClass() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/parametersWithUnloadedClass.kt"); - } - - @TestMetadata("propertyDelegates.kt") - public void testPropertyDelegates() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/propertyDelegates.kt"); - } - - @TestMetadata("sameClassName.kt") - public void testSameClassName() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/sameClassName.kt"); - } - - @TestMetadata("sameClassNameDifferentMethodNames.kt") - public void testSameClassNameDifferentMethodNames() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/sameClassNameDifferentMethodNames.kt"); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/simple.kt"); - } - - @TestMetadata("topLevel.kt") - public void testTopLevel() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/topLevel.kt"); - } -} diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/lambdas.kt b/idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/lambdas.kt index af610ef77d4..e49a637fe3a 100644 --- a/idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/lambdas.kt +++ b/idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/lambdas.kt @@ -33,6 +33,4 @@ class A { block { block { val x = 4 }} } } -} - -// IGNORE_BACKEND: JVM_IR \ No newline at end of file +} \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/propertyDelegates.kt b/idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/propertyDelegates.kt index 86037e9c931..6d60b7ceb61 100644 --- a/idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/propertyDelegates.kt +++ b/idea/jvm-debugger/jvm-debugger-test/testData/fileRanking/propertyDelegates.kt @@ -18,6 +18,4 @@ class B { val a by lazy { val b = 0 } -} - -// IGNORE_BACKEND: JVM_IR \ No newline at end of file +} \ No newline at end of file