From dc821a720b2ef55fc7dbc5487d9b6173031d0341 Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Thu, 18 Apr 2019 01:10:45 +0300 Subject: [PATCH] Fix test data --- .../suspensionPointInMonitor/library/a.kt | 9 --------- .../suspensionPointInMonitor/output.txt | 5 ++++- .../suspensionPointInMonitor/source.kt | 10 ++++++++++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/library/a.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/library/a.kt index a36ae8c5452..679dbcdab3c 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/library/a.kt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/library/a.kt @@ -14,13 +14,4 @@ inline fun monitorInFinally(a: () -> Unit, b: () -> Unit) { b() } } -} - -inline fun withCrossinline(crossinline a: suspend () -> Unit): suspend () -> Unit { - val c : suspend () -> Unit = { - inlineMe { - a() - } - } - return c } \ No newline at end of file diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/output.txt index 56dac12fc18..996d7a58f1a 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/output.txt @@ -4,7 +4,10 @@ compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/so compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/source.kt:14:13: error: a suspension point at SourceKt$test$2.invokeSuspend(source.kt:17) is inside a critical section builder { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/source.kt:24:25: error: a suspension point at SourceKt$test$3$invokeSuspend$$inlined$withCrossinline$2.invokeSuspend(source.kt:31) is inside a critical section +compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/source.kt:24:25: error: a suspension point at SourceKt$test$3$invokeSuspend$$inlined$withCrossinline$2.invokeSuspend(source.kt:62) is inside a critical section withCrossinline { ^ +compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/source.kt:50:34: error: a suspension point at SourceKt$withCrossinline$c$1.invokeSuspend(source.kt:52) is inside a critical section + val c : suspend () -> Unit = { + ^ COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/source.kt index e9e61b85f91..fb1be9a9e0c 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/source.kt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/suspensionPointInMonitor/source.kt @@ -44,3 +44,13 @@ fun test() { interface SuspendRunnable { suspend fun run() } + + +inline fun withCrossinline(crossinline a: suspend () -> Unit): suspend () -> Unit { + val c : suspend () -> Unit = { + inlineMe { + a() + } + } + return c +}