From 5c6e71001393dc42611e03d7a133b00eb86e794a Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Fri, 24 Jan 2020 16:40:44 +0300 Subject: [PATCH] Revert "Workaround an inliner problem upon which the compiler code itself stumbled ^KT-35856 Fixed" This reverts commit 59175912 --- ...irOldFrontendDiagnosticsTestGenerated.java | 5 ----- .../kotlin/asJava/classes/ultraLightUtils.kt | 6 +++--- .../kotlinAnnotationOnJavaInterface.fir.kt | 12 ----------- .../kotlinAnnotationOnJavaInterface.kt | 12 ----------- .../kotlinAnnotationOnJavaInterface.txt | 21 ------------------- .../checkers/DiagnosticsTestGenerated.java | 5 ----- .../DiagnosticsUsingJavacTestGenerated.java | 5 ----- 7 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.fir.kt delete mode 100644 compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.kt delete mode 100644 compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.txt diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java index c602b88b0df..ff323aca818 100644 --- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java @@ -970,11 +970,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte runTest("compiler/testData/diagnostics/tests/annotations/javaUnrepeatable.kt"); } - @TestMetadata("kotlinAnnotationOnJavaInterface.kt") - public void testKotlinAnnotationOnJavaInterface() throws Exception { - runTest("compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.kt"); - } - @TestMetadata("kt1860-negative.kt") public void testKt1860_negative() throws Exception { runTest("compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt"); diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt index b1d5353ef53..3253b70738c 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt @@ -418,8 +418,8 @@ inline fun runReadAction(crossinline runnable: () -> T): T { return ApplicationManager.getApplication().runReadAction(Computable { runnable() }) } -fun KtClassOrObject.safeIsLocal(): Boolean = runReadAction { this.isLocal } +inline fun KtClassOrObject.safeIsLocal(): Boolean = runReadAction { this.isLocal } -fun KtFile.safeIsScript() = runReadAction { this.isScript() } +inline fun KtFile.safeIsScript() = runReadAction { this.isScript() } -fun KtFile.safeScript() = runReadAction { this.script } \ No newline at end of file +inline fun KtFile.safeScript() = runReadAction { this.script } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.fir.kt b/compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.fir.kt deleted file mode 100644 index 0e0be7ef09d..00000000000 --- a/compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.fir.kt +++ /dev/null @@ -1,12 +0,0 @@ -// Issue: KT-35856 - -// FILE: Bar.java -@Anno -public interface Bar {} - -// FILE: Foo.kt -@Target(AnnotationTarget.FILE, AnnotationTarget.CLASS) -@Retention(AnnotationRetention.BINARY) -annotation class Anno - -class Foo : Bar diff --git a/compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.kt b/compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.kt deleted file mode 100644 index 0e0be7ef09d..00000000000 --- a/compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.kt +++ /dev/null @@ -1,12 +0,0 @@ -// Issue: KT-35856 - -// FILE: Bar.java -@Anno -public interface Bar {} - -// FILE: Foo.kt -@Target(AnnotationTarget.FILE, AnnotationTarget.CLASS) -@Retention(AnnotationRetention.BINARY) -annotation class Anno - -class Foo : Bar diff --git a/compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.txt b/compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.txt deleted file mode 100644 index 2751e4c13ef..00000000000 --- a/compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.txt +++ /dev/null @@ -1,21 +0,0 @@ -package - -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE, AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class Anno : kotlin.Annotation { - public constructor Anno() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -@Anno public interface Bar { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class Foo : Bar { - public constructor Foo() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java index 80597fd899b..e185e423abb 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java @@ -977,11 +977,6 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { runTest("compiler/testData/diagnostics/tests/annotations/javaUnrepeatable.kt"); } - @TestMetadata("kotlinAnnotationOnJavaInterface.kt") - public void testKotlinAnnotationOnJavaInterface() throws Exception { - runTest("compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.kt"); - } - @TestMetadata("kt1860-negative.kt") public void testKt1860_negative() throws Exception { runTest("compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java index a4ebee489ea..f24d86f3444 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java @@ -972,11 +972,6 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing runTest("compiler/testData/diagnostics/tests/annotations/javaUnrepeatable.kt"); } - @TestMetadata("kotlinAnnotationOnJavaInterface.kt") - public void testKotlinAnnotationOnJavaInterface() throws Exception { - runTest("compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.kt"); - } - @TestMetadata("kt1860-negative.kt") public void testKt1860_negative() throws Exception { runTest("compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt");