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

Split 'nothingTypedSuspendFunction' test into two separate tests (for old and new coroutines)

Browse Source
This commit is contained in:
victor.petukhov
2019-03-16 21:39:44 +03:00
parent 29493a4977
commit 9a2178d96b
6 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction_1_2.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
// !DIAGNOSTICS: -DEPRECATION
// Tail calls are not allowed to be Nothing typed. See KT-15051
import kotlin.coroutines.experimental.*
import kotlin.coroutines.experimental.intrinsics.*
suspend fun suspendLogAndThrow(exception: Throwable): Nothing = <!IMPLICIT_NOTHING_AS_TYPE_PARAMETER!>suspendCoroutineUninterceptedOrReturn<!> { c ->
c.resumeWithException(exception)
COROUTINE_SUSPENDED
}
compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.txt → compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction_1_2.txt
Vendored
View File
compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt → compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction_1_3.kt
Vendored
+2 -3
View File
@@ -1,7 +1,6 @@
// Tail calls are not allowed to be Nothing typed. See KT-15051 // Tail calls are not allowed to be Nothing typed. See KT-15051
// COMMON_COROUTINES_TEST import kotlin.coroutines.*
import COROUTINES_PACKAGE.* import kotlin.coroutines.intrinsics.*
import COROUTINES_PACKAGE.intrinsics.*
suspend fun suspendLogAndThrow(exception: Throwable): Nothing = <!IMPLICIT_NOTHING_AS_TYPE_PARAMETER!>suspendCoroutineUninterceptedOrReturn<!> { c -> suspend fun suspendLogAndThrow(exception: Throwable): Nothing = <!IMPLICIT_NOTHING_AS_TYPE_PARAMETER!>suspendCoroutineUninterceptedOrReturn<!> { c ->
c.<!IMPLICIT_NOTHING_AS_TYPE_PARAMETER!>resumeWithException<!>(exception) c.<!IMPLICIT_NOTHING_AS_TYPE_PARAMETER!>resumeWithException<!>(exception)
compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction_1_3.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package
public suspend fun suspendLogAndThrow(/*0*/ exception: kotlin.Throwable): kotlin.Nothing
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
Generated
+4 -4
View File
@@ -2294,14 +2294,14 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/localFunctions.kt"); runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/localFunctions.kt");
} }
@TestMetadata("nothingTypedSuspendFunction.kt") @TestMetadata("nothingTypedSuspendFunction_1_2.kt")
public void testNothingTypedSuspendFunction_1_2() throws Exception { public void testNothingTypedSuspendFunction_1_2() throws Exception {
runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt", "kotlin.coroutines.experimental"); runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction_1_2.kt");
} }
@TestMetadata("nothingTypedSuspendFunction.kt") @TestMetadata("nothingTypedSuspendFunction_1_3.kt")
public void testNothingTypedSuspendFunction_1_3() throws Exception { public void testNothingTypedSuspendFunction_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt", "kotlin.coroutines"); runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction_1_3.kt");
} }
@TestMetadata("recursive.kt") @TestMetadata("recursive.kt")
compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
Generated
+4 -4
View File
@@ -2294,14 +2294,14 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno
runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/localFunctions.kt"); runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/localFunctions.kt");
} }
@TestMetadata("nothingTypedSuspendFunction.kt") @TestMetadata("nothingTypedSuspendFunction_1_2.kt")
public void testNothingTypedSuspendFunction_1_2() throws Exception { public void testNothingTypedSuspendFunction_1_2() throws Exception {
runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt", "kotlin.coroutines.experimental"); runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction_1_2.kt");
} }
@TestMetadata("nothingTypedSuspendFunction.kt") @TestMetadata("nothingTypedSuspendFunction_1_3.kt")
public void testNothingTypedSuspendFunction_1_3() throws Exception { public void testNothingTypedSuspendFunction_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt", "kotlin.coroutines"); runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction_1_3.kt");
} }
@TestMetadata("recursive.kt") @TestMetadata("recursive.kt")