azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Workaround an inliner problem upon which the compiler code itself stumbled ^KT-35856 Fixed"

Browse Source 
This reverts commit 59175912
This commit is contained in:
Victor Petukhov
2020-01-24 16:40:44 +03:00
parent 90b250d241
commit 5c6e710013
7 changed files with 3 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java
Generated
-5
View File
@@ -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");
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt
+3 -3
View File
@@ -418,8 +418,8 @@ inline fun <T> 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 }
inline fun KtFile.safeScript() = runReadAction { this.script }
compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.fir.kt
Vendored
-12
View File
@@ -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
compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.kt
Vendored
-12
View File
@@ -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
compiler/testData/diagnostics/tests/annotations/kotlinAnnotationOnJavaInterface.txt
Vendored
-21
View File
@@ -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
}
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
Generated
-5
View File
@@ -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");
compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
Generated
-5
View File
@@ -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");