From 7ffefb515f3ac166b7f28cf94cb6b12b0b2e5976 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Thu, 15 Dec 2016 10:23:47 +0300
Subject: [PATCH] Update test data for LightAnalysis/Coroutines

---
 .../light-analysis/coroutines/await.txt       | 15 +++++---
 .../coroutines/beginWithException.txt         | 19 ++++++----
 .../beginWithExceptionNoHandleException.txt   | 15 ++++++--
 .../coroutines/coercionToUnit.txt             | 19 ++++++----
 .../coroutines/controlFlow/breakFinally.txt   | 16 ++++++++-
 .../coroutines/controlFlow/breakStatement.txt | 16 ++++++++-
 .../controlFlow/doWhileStatement.txt          | 16 ++++++++-
 .../coroutines/controlFlow/forContinue.txt    | 16 ++++++++-
 .../coroutines/controlFlow/forStatement.txt   | 16 ++++++++-
 .../coroutines/controlFlow/ifStatement.txt    | 16 ++++++++-
 .../coroutines/controlFlow/switchLikeWhen.txt | 16 ++++++++-
 .../coroutines/controlFlow/throwFromCatch.txt | 17 +++++++--
 .../throwInTryWithHandleResult.txt            | 17 +++++++--
 .../coroutines/controlFlow/whileStatement.txt | 16 ++++++++-
 .../controllerAccessFromInnerLambda.txt       | 16 ++++++++-
 .../coroutines/defaultParametersInSuspend.txt | 16 ++++++++-
 .../coroutines/emptyClosure.txt               | 16 ++++++++-
 .../coroutines/falseUnitCoercion.txt          | 16 ++++++++-
 .../light-analysis/coroutines/generate.txt    | 36 +++++++++++++++----
 .../coroutines/handleException.txt            | 19 ++++++++--
 .../coroutines/handleResultCallEmptyBody.txt  | 17 +++++----
 .../handleResultNonUnitExpression.txt         | 19 ++++++----
 .../coroutines/handleResultSuspended.txt      | 17 +++++++--
 .../coroutines/illegalState.txt               | 15 ++++++--
 .../coroutines/inlineSuspendFunction.txt      | 16 ++++++++-
 .../coroutines/inlinedTryCatchFinally.txt     | 21 ++++++++---
 .../coroutines/innerSuspensionCalls.txt       | 16 ++++++++-
 .../coroutines/instanceOfContinuation.txt     | 16 ++++++++-
 .../intLikeVarSpilling/complicatedMerge.txt   | 16 ++++++++-
 .../intLikeVarSpilling/i2bResult.txt          | 16 ++++++++-
 .../loadFromBooleanArray.txt                  | 16 ++++++++-
 .../intLikeVarSpilling/loadFromByteArray.txt  | 16 ++++++++-
 .../intLikeVarSpilling/noVariableInTable.txt  | 16 ++++++++-
 .../sameIconst1ManyVars.txt                   | 16 ++++++++-
 .../intLikeVarSpilling/usedInArrayStore.txt   | 16 ++++++++-
 .../intLikeVarSpilling/usedInMethodCall.txt   | 16 ++++++++-
 .../intLikeVarSpilling/usedInPutfield.txt     | 16 ++++++++-
 .../intLikeVarSpilling/usedInVarStore.txt     | 16 ++++++++-
 .../coroutines/interceptResume.txt            | 17 +++++++--
 .../coroutines/iterateOverArray.txt           | 16 ++++++++-
 .../light-analysis/coroutines/kt12958.txt     | 19 ++++++----
 .../coroutines/lastExpressionIsLoop.txt       | 17 +++++++--
 .../coroutines/lastStatementInc.txt           | 19 ++++++----
 .../coroutines/lastStementAssignment.txt      | 19 ++++++----
 .../coroutines/lastUnitExpression.txt         | 17 +++++++--
 .../coroutines/multiModule/simple.txt         | 16 ++++++++-
 .../multiModule/suspendExtension.txt          | 16 ++++++++-
 .../coroutines/multipleInvokeCalls.txt        | 17 +++++++--
 ...multipleInvokeCallsInsideInlineLambda1.txt | 17 +++++++--
 ...multipleInvokeCallsInsideInlineLambda2.txt | 17 +++++++--
 ...multipleInvokeCallsInsideInlineLambda3.txt | 17 +++++++--
 .../coroutines/nestedTryCatch.txt             | 21 ++++++++---
 .../coroutines/noSuspensionPoints.txt         | 17 +++++----
 .../nonLocalReturnFromInlineLambda.txt        | 17 +++++++--
 .../nonLocalReturnFromInlineLambdaDeep.txt    | 17 +++++++--
 .../coroutines/returnByLabel.txt              | 19 ++++++----
 .../light-analysis/coroutines/simple.txt      | 15 ++++++--
 .../coroutines/simpleException.txt            | 16 ++++++++-
 .../coroutines/simpleWithHandleResult.txt     | 19 ++++++----
 .../coroutines/stackUnwinding/exception.txt   | 16 ++++++++-
 .../stackUnwinding/inlineSuspendFunction.txt  | 16 ++++++++-
 .../coroutines/stackUnwinding/simple.txt      | 16 ++++++++-
 .../stackUnwinding/suspendInCycle.txt         | 16 ++++++++-
 .../statementLikeLastExpression.txt           | 16 ++++++---
 .../coroutines/suspendDelegation.txt          | 16 ++++++++-
 .../coroutines/suspendExtension.txt           | 16 ++++++++-
 .../coroutines/suspendFromInlineLambda.txt    | 16 ++++++++-
 .../coroutines/suspendInCycle.txt             | 16 ++++++++-
 ...suspendInTheMiddleOfObjectConstruction.txt | 16 ++++++++-
 .../tryCatchFinallyWithHandleResult.txt       | 21 ++++++++---
 .../coroutines/tryCatchWithHandleResult.txt   | 21 ++++++++---
 .../tryFinallyInsideInlineLambda.txt          | 16 ++++++++-
 .../coroutines/tryFinallyWithHandleResult.txt | 21 ++++++++---
 .../coroutines/varValueConflictsWithTable.txt | 16 ++++++++-
 .../varValueConflictsWithTableSameSort.txt    | 16 ++++++++-
 75 files changed, 1103 insertions(+), 179 deletions(-)

diff --git a/compiler/testData/codegen/light-analysis/coroutines/await.txt b/compiler/testData/codegen/light-analysis/coroutines/await.txt
index 6190b7a18a7..bc6940c2d72 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/await.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/await.txt
@@ -9,10 +9,17 @@ public final class AwaitKt {
 }
 
 
-public final class Controller {
-    private final field resolve: kotlin.jvm.functions.Function1
-    public method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
-    public final method handleResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
 
 
diff --git a/compiler/testData/codegen/light-analysis/coroutines/beginWithException.txt b/compiler/testData/codegen/light-analysis/coroutines/beginWithException.txt
index 6ac39c3e9e9..e1fed45a476 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/beginWithException.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/beginWithException.txt
@@ -1,14 +1,19 @@
 public final class BeginWithExceptionKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
-public final class Controller {
-    private @org.jetbrains.annotations.Nullable field exception: java.lang.Throwable
-    public method <init>(): void
-    public final @org.jetbrains.annotations.Nullable method getException(): java.lang.Throwable
-    public final method handleException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method setException(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void
-    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/beginWithExceptionNoHandleException.txt b/compiler/testData/codegen/light-analysis/coroutines/beginWithExceptionNoHandleException.txt
index b542af87b65..9f7c37b02e1 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/beginWithExceptionNoHandleException.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/beginWithExceptionNoHandleException.txt
@@ -1,10 +1,19 @@
 public final class BeginWithExceptionNoHandleExceptionKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
-public final class Controller {
-    public method <init>(): void
-    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/coercionToUnit.txt b/compiler/testData/codegen/light-analysis/coroutines/coercionToUnit.txt
index 3327c0ca2fd..258c4299b98 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/coercionToUnit.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/coercionToUnit.txt
@@ -1,6 +1,7 @@
 public final class CoercionToUnitKt {
     private static field FALSE: boolean
     private static field TRUE: boolean
+    public final static @org.jetbrains.annotations.Nullable method await(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
     public final static method getFALSE(): boolean
@@ -10,11 +11,15 @@ public final class CoercionToUnitKt {
 }
 
 
-public final class Controller {
-    private @org.jetbrains.annotations.NotNull field result: java.lang.String
-    public method <init>(): void
-    public final @org.jetbrains.annotations.Nullable method await(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
-    public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakFinally.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakFinally.txt
index 838d3478211..db4c3075a6d 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakFinally.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakFinally.txt
@@ -1,6 +1,6 @@
 public final class BreakFinallyKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
 
 
@@ -11,3 +11,17 @@ public final class Controller {
     public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
     public final @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
+
+
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakStatement.txt
index 4354bb31da3..a2ad9fc66fc 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakStatement.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakStatement.txt
@@ -1,6 +1,6 @@
 public final class BreakStatementKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
 
 
@@ -11,3 +11,17 @@ public final class Controller {
     public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
     public final @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
+
+
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/doWhileStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/doWhileStatement.txt
index 7cf5fec7bfb..92db2b48cb1 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/doWhileStatement.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/doWhileStatement.txt
@@ -7,7 +7,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
 public final class DoWhileStatementKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forContinue.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forContinue.txt
index 4df9798360a..21825a8597a 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forContinue.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forContinue.txt
@@ -7,7 +7,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class ForContinueKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forStatement.txt
index fb0e74a4a0a..49f601f39af 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forStatement.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forStatement.txt
@@ -7,7 +7,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class ForStatementKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/ifStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/ifStatement.txt
index be0a842c780..40dd76c9936 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/ifStatement.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/ifStatement.txt
@@ -7,7 +7,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class IfStatementKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/switchLikeWhen.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/switchLikeWhen.txt
index 1ea18e4aa4e..bf0c9b0ae1c 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/switchLikeWhen.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/switchLikeWhen.txt
@@ -7,7 +7,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class SwitchLikeWhenKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwFromCatch.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwFromCatch.txt
index a187b00d09e..f6d2bca6fe0 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwFromCatch.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwFromCatch.txt
@@ -2,14 +2,27 @@ public final class Controller {
     private @org.jetbrains.annotations.NotNull field result: java.lang.String
     public method <init>(): void
     public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String
-    public final method handleException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
     public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
     public final @org.jetbrains.annotations.Nullable method suspendAndLog(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method suspendLogAndThrow(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class ThrowFromCatchKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwInTryWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwInTryWithHandleResult.txt
index 8fcb571be74..c62e08e0e1b 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwInTryWithHandleResult.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwInTryWithHandleResult.txt
@@ -2,13 +2,26 @@ public final class Controller {
     private @org.jetbrains.annotations.NotNull field result: java.lang.String
     public method <init>(): void
     public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String
-    public final method handleException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
     public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
     public final @org.jetbrains.annotations.Nullable method suspendAndLog(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class ThrowInTryWithHandleResultKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/whileStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/whileStatement.txt
index 8463fee479f..d32c20cdd51 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/whileStatement.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/whileStatement.txt
@@ -7,7 +7,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class WhileStatementKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/controllerAccessFromInnerLambda.txt b/compiler/testData/codegen/light-analysis/coroutines/controllerAccessFromInnerLambda.txt
index 68f1f4cc11f..4005fee469f 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/controllerAccessFromInnerLambda.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/controllerAccessFromInnerLambda.txt
@@ -10,6 +10,20 @@ public final class Controller {
 
 public final class ControllerAccessFromInnerLambdaKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method noinlineRun(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
 }
+
+
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
diff --git a/compiler/testData/codegen/light-analysis/coroutines/defaultParametersInSuspend.txt b/compiler/testData/codegen/light-analysis/coroutines/defaultParametersInSuspend.txt
index 267291491a4..5ec1fd94603 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/defaultParametersInSuspend.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/defaultParametersInSuspend.txt
@@ -5,7 +5,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
 public final class DefaultParametersInSuspendKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/emptyClosure.txt b/compiler/testData/codegen/light-analysis/coroutines/emptyClosure.txt
index 7ea4833c5ef..33eeeaf0de1 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/emptyClosure.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/emptyClosure.txt
@@ -4,10 +4,24 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
 public final class EmptyClosureKt {
     private static field result: int
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method getResult(): int
     public final static method setResult(p0: int): void
 }
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
diff --git a/compiler/testData/codegen/light-analysis/coroutines/falseUnitCoercion.txt b/compiler/testData/codegen/light-analysis/coroutines/falseUnitCoercion.txt
index 794c272acc6..8c6a9f82936 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/falseUnitCoercion.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/falseUnitCoercion.txt
@@ -4,10 +4,24 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class FalseUnitCoercionKt {
     private static @org.jetbrains.annotations.NotNull field result: java.lang.Object
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method foo(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void
     public final static @org.jetbrains.annotations.NotNull method getResult(): java.lang.Object
     public final static method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void
diff --git a/compiler/testData/codegen/light-analysis/coroutines/generate.txt b/compiler/testData/codegen/light-analysis/coroutines/generate.txt
index 79faf0a4cb9..bdbadbd84c1 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/generate.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/generate.txt
@@ -1,18 +1,42 @@
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class GenerateKt {
     private static field was: boolean
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public final static @org.jetbrains.annotations.NotNull method gen(): kotlin.sequences.Sequence
-    public final static @org.jetbrains.annotations.NotNull method generate(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.sequences.Sequence
+    public final static @org.jetbrains.annotations.NotNull method generate(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): kotlin.sequences.Sequence
     public final static method getWas(): boolean
     public final static method setWas(p0: boolean): void
 }
 
 
-public final class GeneratorController {
+public final class GeneratedIterator {
     private field nextStep: kotlin.coroutines.Continuation
-    public method <init>(): void
+    public method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     protected method computeNext(): void
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method setNextStep(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): void
-    public final @org.jetbrains.annotations.Nullable method yield(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
+    public @org.jetbrains.annotations.Nullable method yield(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
+}
+
+
+public final class GeneratedSequence {
+    private final field block: kotlin.jvm.functions.Function2
+    public method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
+    public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator
+}
+
+
+public interface Generator {
+    public abstract @org.jetbrains.annotations.Nullable method yield(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/handleException.txt b/compiler/testData/codegen/light-analysis/coroutines/handleException.txt
index 296bfb85f0e..450bd6ac4e0 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/handleException.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/handleException.txt
@@ -4,16 +4,29 @@ public final class Controller {
     public method <init>(): void
     public final @org.jetbrains.annotations.Nullable method getException(): java.lang.Throwable
     public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.ArrayList
-    public final method handleException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final method setException(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void
     public final @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class HandleExceptionKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method commonThrow(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/handleResultCallEmptyBody.txt b/compiler/testData/codegen/light-analysis/coroutines/handleResultCallEmptyBody.txt
index 16359b4c03a..d9f6d6675a1 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/handleResultCallEmptyBody.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/handleResultCallEmptyBody.txt
@@ -1,9 +1,14 @@
-public final class Controller {
-    private field ok: boolean
-    public method <init>(): void
-    public final method getOk(): boolean
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method setOk(p0: boolean): void
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
 
 
diff --git a/compiler/testData/codegen/light-analysis/coroutines/handleResultNonUnitExpression.txt b/compiler/testData/codegen/light-analysis/coroutines/handleResultNonUnitExpression.txt
index fb42d568a45..0c2d34e6053 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/handleResultNonUnitExpression.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/handleResultNonUnitExpression.txt
@@ -1,14 +1,19 @@
-public final class Controller {
-    private field isCompleted: boolean
-    public method <init>(): void
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method isCompleted(): boolean
-    public final method setCompleted(p0: boolean): void
-    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
 
 
 public final class HandleResultNonUnitExpressionKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/handleResultSuspended.txt b/compiler/testData/codegen/light-analysis/coroutines/handleResultSuspended.txt
index 93575fafa50..e65913d62f2 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/handleResultSuspended.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/handleResultSuspended.txt
@@ -2,13 +2,26 @@ public final class Controller {
     private @org.jetbrains.annotations.NotNull field log: java.lang.String
     public method <init>(): void
     public final @org.jetbrains.annotations.NotNull method getLog(): java.lang.String
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
     public final method setLog(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
     public final @org.jetbrains.annotations.Nullable method suspendAndLog(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class HandleResultSuspendedKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/illegalState.txt b/compiler/testData/codegen/light-analysis/coroutines/illegalState.txt
index 64910bf182c..8987888ae98 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/illegalState.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/illegalState.txt
@@ -1,6 +1,14 @@
-public final class Controller {
-    public method <init>(): void
-    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
 
 
@@ -8,4 +16,5 @@ public final class IllegalStateKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public final static method builder1(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
     public final static method builder2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/inlineSuspendFunction.txt b/compiler/testData/codegen/light-analysis/coroutines/inlineSuspendFunction.txt
index 218881294b1..d3ea2389746 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/inlineSuspendFunction.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/inlineSuspendFunction.txt
@@ -7,9 +7,23 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class InlineSuspendFunctionKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
 
 
diff --git a/compiler/testData/codegen/light-analysis/coroutines/inlinedTryCatchFinally.txt b/compiler/testData/codegen/light-analysis/coroutines/inlinedTryCatchFinally.txt
index ae75ac91bbd..da7712c029b 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/inlinedTryCatchFinally.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/inlinedTryCatchFinally.txt
@@ -2,19 +2,32 @@ public final class Controller {
     private final @org.jetbrains.annotations.NotNull field postponedActions: java.util.List
     public method <init>(): void
     public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.List
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class InlinedTryCatchFinallyKt {
     private static @org.jetbrains.annotations.NotNull field globalResult: java.lang.String
     private static field wasCalled: boolean
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public synthetic static method builder$default(p0: boolean, p1: kotlin.jvm.functions.Function1, p2: int, p3: java.lang.Object): void
-    public final static method builder(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): void
+    public synthetic static method builder$default(p0: boolean, p1: kotlin.jvm.functions.Function2, p2: int, p3: java.lang.Object): void
+    public final static method builder(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): void
     public final static method commonThrow(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
     public final static @org.jetbrains.annotations.NotNull method getGlobalResult(): java.lang.String
     public final static method getWasCalled(): boolean
diff --git a/compiler/testData/codegen/light-analysis/coroutines/innerSuspensionCalls.txt b/compiler/testData/codegen/light-analysis/coroutines/innerSuspensionCalls.txt
index 9c80a7494d7..8e9306a2a8f 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/innerSuspensionCalls.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/innerSuspensionCalls.txt
@@ -7,7 +7,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class InnerSuspensionCallsKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/instanceOfContinuation.txt b/compiler/testData/codegen/light-analysis/coroutines/instanceOfContinuation.txt
index 79996edc1c2..f174463e8ca 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/instanceOfContinuation.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/instanceOfContinuation.txt
@@ -5,7 +5,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class InstanceOfContinuationKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/complicatedMerge.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/complicatedMerge.txt
index 065b7babca9..5f342b7af04 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/complicatedMerge.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/complicatedMerge.txt
@@ -1,7 +1,7 @@
 public final class ComplicatedMergeKt {
     private static field booleanResult: boolean
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method foo(): boolean
     public final static method setBooleanRes(p0: boolean): void
 }
@@ -11,3 +11,17 @@ public final class Controller {
     public method <init>(): void
     public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
 }
+
+
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/i2bResult.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/i2bResult.txt
index 1b00f46c318..c479aff2ff1 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/i2bResult.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/i2bResult.txt
@@ -4,10 +4,24 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class I2bResultKt {
     private static field byteResult: byte
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method foo(): int
     public final static method setByteRes(p0: byte): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromBooleanArray.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromBooleanArray.txt
index 3d8eee4a623..d1729caf12f 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromBooleanArray.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromBooleanArray.txt
@@ -4,9 +4,23 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class LoadFromBooleanArrayKt {
     private static field booleanResult: boolean
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method setBooleanRes(p0: boolean): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromByteArray.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromByteArray.txt
index 8d1ef734c05..f36c58276e6 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromByteArray.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromByteArray.txt
@@ -4,9 +4,23 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class LoadFromByteArrayKt {
     private static field byteResult: byte
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method setByteRes(p0: byte): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/noVariableInTable.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/noVariableInTable.txt
index 973d14c9b92..ce16a6b37e2 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/noVariableInTable.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/noVariableInTable.txt
@@ -4,9 +4,23 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class NoVariableInTableKt {
     private static field booleanResult: boolean
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method setBooleanRes(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.Unit): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/sameIconst1ManyVars.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/sameIconst1ManyVars.txt
index bed91ad0646..09038139553 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/sameIconst1ManyVars.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/sameIconst1ManyVars.txt
@@ -4,10 +4,24 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class SameIconst1ManyVarsKt {
     private static field result: java.lang.String
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method foo(): int
     public final static method setRes(p0: byte, p1: int): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInArrayStore.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInArrayStore.txt
index 9bb8a1a3ca5..7ccc15e1eb0 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInArrayStore.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInArrayStore.txt
@@ -4,6 +4,20 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class UsedInArrayStoreKt {
     public static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field booleanResult: boolean[]
     public static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field byteResult: byte[]
@@ -11,5 +25,5 @@ public final class UsedInArrayStoreKt {
     public static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field intResult: int[]
     public static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field shortResult: short[]
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInMethodCall.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInMethodCall.txt
index ca2accb3303..4e9de0e4a39 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInMethodCall.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInMethodCall.txt
@@ -4,6 +4,20 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class UsedInMethodCallKt {
     private static field booleanResult: boolean
     private static field byteResult: byte
@@ -11,7 +25,7 @@ public final class UsedInMethodCallKt {
     private static field intResult: int
     private static field shortResult: short
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method setBooleanRes(p0: boolean): void
     public final static method setByteRes(p0: byte): void
     public final static method setCharRes(p0: char): void
diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInPutfield.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInPutfield.txt
index 1137cb37543..71573ffae85 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInPutfield.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInPutfield.txt
@@ -4,6 +4,20 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class UsedInPutfieldKt {
     public static @kotlin.jvm.JvmField field booleanResult: boolean
     public static @kotlin.jvm.JvmField field byteResult: byte
@@ -11,5 +25,5 @@ public final class UsedInPutfieldKt {
     public static @kotlin.jvm.JvmField field intResult: int
     public static @kotlin.jvm.JvmField field shortResult: short
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInVarStore.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInVarStore.txt
index 7655b6f4f8c..8005ebf8fe0 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInVarStore.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInVarStore.txt
@@ -4,7 +4,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class UsedInVarStoreKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/interceptResume.txt b/compiler/testData/codegen/light-analysis/coroutines/interceptResume.txt
index 4f2a42234fc..e960f4baf11 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/interceptResume.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/interceptResume.txt
@@ -4,7 +4,6 @@ public final class Controller {
     public method <init>(): void
     public final @org.jetbrains.annotations.NotNull method getLog(): java.lang.String
     public final method getResumeIndex(): int
-    public final method interceptResume(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
     public final method setLog(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
     public final method setResumeIndex(p0: int): void
     public final @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
@@ -12,7 +11,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class InterceptResumeKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/iterateOverArray.txt b/compiler/testData/codegen/light-analysis/coroutines/iterateOverArray.txt
index 722a0e0624f..db42dfa97cf 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/iterateOverArray.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/iterateOverArray.txt
@@ -4,7 +4,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class IterateOverArrayKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/kt12958.txt b/compiler/testData/codegen/light-analysis/coroutines/kt12958.txt
index 7e25d2a8373..63614dfbf58 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/kt12958.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/kt12958.txt
@@ -1,10 +1,14 @@
-public final class Controller {
-    private @org.jetbrains.annotations.NotNull field result: java.lang.String
-    public method <init>(): void
-    public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
-    public final @org.jetbrains.annotations.Nullable method suspendHere(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
 
 
@@ -12,4 +16,5 @@ public final class Kt12958Kt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
     public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String
+    public final static @org.jetbrains.annotations.Nullable method suspendHere(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/lastExpressionIsLoop.txt b/compiler/testData/codegen/light-analysis/coroutines/lastExpressionIsLoop.txt
index 8819355f80b..677d5727beb 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/lastExpressionIsLoop.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/lastExpressionIsLoop.txt
@@ -4,14 +4,27 @@ public final class Controller {
     public method <init>(): void
     public final method getOk(): boolean
     public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
     public final method setOk(p0: boolean): void
     public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
     public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class LastExpressionIsLoopKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/lastStatementInc.txt b/compiler/testData/codegen/light-analysis/coroutines/lastStatementInc.txt
index 36badbf6bdc..906c3380fcb 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/lastStatementInc.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/lastStatementInc.txt
@@ -1,14 +1,19 @@
-public final class Controller {
-    private field wasHandleResultCalled: boolean
-    public method <init>(): void
-    public final method getWasHandleResultCalled(): boolean
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method setWasHandleResultCalled(p0: boolean): void
-    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
 
 
 public final class LastStatementIncKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/lastStementAssignment.txt b/compiler/testData/codegen/light-analysis/coroutines/lastStementAssignment.txt
index 8bb66273327..33e61f9eebb 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/lastStementAssignment.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/lastStementAssignment.txt
@@ -1,10 +1,14 @@
-public final class Controller {
-    private field wasHandleResultCalled: boolean
-    public method <init>(): void
-    public final method getWasHandleResultCalled(): boolean
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method setWasHandleResultCalled(p0: boolean): void
-    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
 
 
@@ -14,4 +18,5 @@ public final class LastStementAssignmentKt {
     public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
     public final static @org.jetbrains.annotations.NotNull method getVarWithCustomSetter(): java.lang.String
     public final static method setVarWithCustomSetter(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/lastUnitExpression.txt b/compiler/testData/codegen/light-analysis/coroutines/lastUnitExpression.txt
index 1abc0b38725..ec9ed843b5e 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/lastUnitExpression.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/lastUnitExpression.txt
@@ -4,14 +4,27 @@ public final class Controller {
     public method <init>(): void
     public final method getOk(): boolean
     public final @org.jetbrains.annotations.NotNull method getV(): java.lang.String
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
     public final method setOk(p0: boolean): void
     public final method setV(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
     public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class LastUnitExpressionKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/multiModule/simple.txt b/compiler/testData/codegen/light-analysis/coroutines/multiModule/simple.txt
index 4175367b648..8151cb8d907 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/multiModule/simple.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/multiModule/simple.txt
@@ -1,6 +1,20 @@
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class MainKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
 
 
diff --git a/compiler/testData/codegen/light-analysis/coroutines/multiModule/suspendExtension.txt b/compiler/testData/codegen/light-analysis/coroutines/multiModule/suspendExtension.txt
index c602149fb2f..7c4535393f6 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/multiModule/suspendExtension.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/multiModule/suspendExtension.txt
@@ -1,6 +1,20 @@
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class MainKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static @org.jetbrains.annotations.Nullable method localInlineSuspendExtension(@org.jetbrains.annotations.NotNull p0: lib.Controller, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object
     public final static @org.jetbrains.annotations.Nullable method localSuspendExtension(@org.jetbrains.annotations.NotNull p0: lib.Controller, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCalls.txt b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCalls.txt
index e9c7b3426dc..a5d73195fcd 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCalls.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCalls.txt
@@ -12,9 +12,22 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class MultipleInvokeCallsKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
-    public final static method builder2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function3): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     private final static method runControllers(p0: Controller, p1: Controller): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda1.txt b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda1.txt
index c060fb279bd..3fe89b34e9e 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda1.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda1.txt
@@ -12,10 +12,23 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class MultipleInvokeCallsInsideInlineLambda1Kt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
-    public final static method builder2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function3): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
     private final static method runControllers(p0: Controller, p1: Controller): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda2.txt b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda2.txt
index edca5c45741..1ee23d2b301 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda2.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda2.txt
@@ -12,10 +12,23 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class MultipleInvokeCallsInsideInlineLambda2Kt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
-    public final static method builder2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function3): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
     private final static method runControllers(p0: Controller, p1: Controller): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda3.txt b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda3.txt
index 9534b806ed7..ac1bb000820 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda3.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda3.txt
@@ -12,10 +12,23 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class MultipleInvokeCallsInsideInlineLambda3Kt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
-    public final static method builder2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function3): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
     private final static method runControllers(p0: Controller, p1: Controller): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/nestedTryCatch.txt b/compiler/testData/codegen/light-analysis/coroutines/nestedTryCatch.txt
index 163614bdd92..1a4346cf8d2 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/nestedTryCatch.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/nestedTryCatch.txt
@@ -2,19 +2,32 @@ public final class Controller {
     private final @org.jetbrains.annotations.NotNull field postponedActions: java.util.ArrayList
     public method <init>(): void
     public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.ArrayList
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class NestedTryCatchKt {
     private static @org.jetbrains.annotations.NotNull field globalResult: java.lang.String
     private static field wasCalled: boolean
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public synthetic static method builder$default(p0: boolean, p1: kotlin.jvm.functions.Function1, p2: int, p3: java.lang.Object): void
-    public final static method builder(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): void
+    public synthetic static method builder$default(p0: boolean, p1: kotlin.jvm.functions.Function2, p2: int, p3: java.lang.Object): void
+    public final static method builder(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): void
     public final static method commonThrow(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
     public final static @org.jetbrains.annotations.NotNull method getGlobalResult(): java.lang.String
     public final static method getWasCalled(): boolean
diff --git a/compiler/testData/codegen/light-analysis/coroutines/noSuspensionPoints.txt b/compiler/testData/codegen/light-analysis/coroutines/noSuspensionPoints.txt
index 43b41386ce8..24507948132 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/noSuspensionPoints.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/noSuspensionPoints.txt
@@ -1,9 +1,14 @@
-public final class Controller {
-    private field res: int
-    public method <init>(): void
-    public final method getRes(): int
-    public final method handleResult(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method setRes(p0: int): void
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
 
 
diff --git a/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambda.txt b/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambda.txt
index a97c727d910..87e7319f22a 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambda.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambda.txt
@@ -2,14 +2,27 @@ public final class Controller {
     private field cResult: int
     public method <init>(): void
     public final method getCResult(): int
-    public final method handleResult(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
     public final method setCResult(p0: int): void
     public final @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class NonLocalReturnFromInlineLambdaKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): Controller
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): Controller
     public final static method foo(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambdaDeep.txt b/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambdaDeep.txt
index 96b76bce1af..1e27d46f4dd 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambdaDeep.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambdaDeep.txt
@@ -2,14 +2,27 @@ public final class Controller {
     private field cResult: int
     public method <init>(): void
     public final method getCResult(): int
-    public final method handleResult(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
     public final method setCResult(p0: int): void
     public final @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class NonLocalReturnFromInlineLambdaDeepKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): Controller
+    public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): Controller
     public final static method foo(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/returnByLabel.txt b/compiler/testData/codegen/light-analysis/coroutines/returnByLabel.txt
index 0719a6baeb4..10312036733 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/returnByLabel.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/returnByLabel.txt
@@ -1,14 +1,19 @@
-public final class Controller {
-    private field res: int
-    public method <init>(): void
-    public final method getRes(): int
-    public final method handleResult(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method setRes(p0: int): void
-    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
 
 
 public final class ReturnByLabelKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): int
+    public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/simple.txt b/compiler/testData/codegen/light-analysis/coroutines/simple.txt
index 0d2991b90ba..317cb1e1133 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/simple.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/simple.txt
@@ -1,10 +1,19 @@
-public final class Controller {
-    public method <init>(): void
-    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
 
 
 public final class SimpleKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/simpleException.txt b/compiler/testData/codegen/light-analysis/coroutines/simpleException.txt
index e3c4adda35a..5b523044663 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/simpleException.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/simpleException.txt
@@ -4,7 +4,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class SimpleExceptionKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/simpleWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/simpleWithHandleResult.txt
index a6b1d14857a..fd744e7a446 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/simpleWithHandleResult.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/simpleWithHandleResult.txt
@@ -1,14 +1,19 @@
-public final class Controller {
-    private field res: int
-    public method <init>(): void
-    public final method getRes(): int
-    public final method handleResult(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method setRes(p0: int): void
-    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
 
 
 public final class SimpleWithHandleResultKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): int
+    public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/exception.txt b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/exception.txt
index 4baeaeb3131..1588df80c99 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/exception.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/exception.txt
@@ -4,7 +4,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class ExceptionKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/inlineSuspendFunction.txt b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/inlineSuspendFunction.txt
index 9bf45ce361a..98024476eb6 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/inlineSuspendFunction.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/inlineSuspendFunction.txt
@@ -6,9 +6,23 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class InlineSuspendFunctionKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
 
 
diff --git a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/simple.txt b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/simple.txt
index 0d2991b90ba..0f01e9be74c 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/simple.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/simple.txt
@@ -4,7 +4,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class SimpleKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/suspendInCycle.txt b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/suspendInCycle.txt
index da0b1e55b6d..7429c2766c4 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/suspendInCycle.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/suspendInCycle.txt
@@ -5,7 +5,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class SuspendInCycleKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/statementLikeLastExpression.txt b/compiler/testData/codegen/light-analysis/coroutines/statementLikeLastExpression.txt
index 744089d5114..abfc5411fd5 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/statementLikeLastExpression.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/statementLikeLastExpression.txt
@@ -1,7 +1,14 @@
-public final class Controller {
-    public method <init>(): void
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
 }
 
 
@@ -11,4 +18,5 @@ public final class StatementLikeLastExpressionKt {
     public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
     public final static @org.jetbrains.annotations.NotNull method getGlobalResult(): java.lang.String
     public final static method setGlobalResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public final static @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendDelegation.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendDelegation.txt
index 953ec0210ef..79f012dd527 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/suspendDelegation.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/suspendDelegation.txt
@@ -5,7 +5,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class SuspendDelegationKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendExtension.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendExtension.txt
index c1cc757a766..efd7bd408fa 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/suspendExtension.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/suspendExtension.txt
@@ -6,9 +6,23 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class SuspendExtensionKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static @org.jetbrains.annotations.Nullable method inlineSuspendExtension(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object
     public final static @org.jetbrains.annotations.Nullable method suspendExtension(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFromInlineLambda.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFromInlineLambda.txt
index 19c0dbaba4a..900a7a603d3 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/suspendFromInlineLambda.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFromInlineLambda.txt
@@ -4,8 +4,22 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class SuspendFromInlineLambdaKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method foo(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendInCycle.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendInCycle.txt
index ac223e7e4f1..70a4af7ecad 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/suspendInCycle.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/suspendInCycle.txt
@@ -8,7 +8,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class SuspendInCycleKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendInTheMiddleOfObjectConstruction.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendInTheMiddleOfObjectConstruction.txt
index 794e97912a7..05052377d41 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/suspendInTheMiddleOfObjectConstruction.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/suspendInTheMiddleOfObjectConstruction.txt
@@ -40,7 +40,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class SuspendInTheMiddleOfObjectConstructionKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/tryCatchFinallyWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/tryCatchFinallyWithHandleResult.txt
index a95ce288e59..7c4c6aeccc3 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/tryCatchFinallyWithHandleResult.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/tryCatchFinallyWithHandleResult.txt
@@ -2,19 +2,32 @@ public final class Controller {
     private final @org.jetbrains.annotations.NotNull field postponedActions: java.util.ArrayList
     public method <init>(): void
     public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.ArrayList
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class TryCatchFinallyWithHandleResultKt {
     private static @org.jetbrains.annotations.NotNull field globalResult: java.lang.String
     private static field wasCalled: boolean
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public synthetic static method builder$default(p0: boolean, p1: kotlin.jvm.functions.Function1, p2: int, p3: java.lang.Object): void
-    public final static method builder(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): void
+    public synthetic static method builder$default(p0: boolean, p1: kotlin.jvm.functions.Function2, p2: int, p3: java.lang.Object): void
+    public final static method builder(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): void
     public final static method commonThrow(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
     public final static @org.jetbrains.annotations.NotNull method getGlobalResult(): java.lang.String
     public final static method getWasCalled(): boolean
diff --git a/compiler/testData/codegen/light-analysis/coroutines/tryCatchWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/tryCatchWithHandleResult.txt
index c83ced4ee4b..a158d9fd485 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/tryCatchWithHandleResult.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/tryCatchWithHandleResult.txt
@@ -2,19 +2,32 @@ public final class Controller {
     private final @org.jetbrains.annotations.NotNull field postponedActions: java.util.ArrayList
     public method <init>(): void
     public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.ArrayList
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class TryCatchWithHandleResultKt {
     private static @org.jetbrains.annotations.NotNull field globalResult: java.lang.String
     private static field wasCalled: boolean
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public synthetic static method builder$default(p0: boolean, p1: kotlin.jvm.functions.Function1, p2: int, p3: java.lang.Object): void
-    public final static method builder(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): void
+    public synthetic static method builder$default(p0: boolean, p1: kotlin.jvm.functions.Function2, p2: int, p3: java.lang.Object): void
+    public final static method builder(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): void
     public final static method commonThrow(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
     public final static @org.jetbrains.annotations.NotNull method getGlobalResult(): java.lang.String
     public final static method getWasCalled(): boolean
diff --git a/compiler/testData/codegen/light-analysis/coroutines/tryFinallyInsideInlineLambda.txt b/compiler/testData/codegen/light-analysis/coroutines/tryFinallyInsideInlineLambda.txt
index a76817c581a..690803ff4da 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/tryFinallyInsideInlineLambda.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/tryFinallyInsideInlineLambda.txt
@@ -4,8 +4,22 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class TryFinallyInsideInlineLambdaKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final static method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/tryFinallyWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/tryFinallyWithHandleResult.txt
index 349e0990c50..aa09ffa744f 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/tryFinallyWithHandleResult.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/tryFinallyWithHandleResult.txt
@@ -2,19 +2,32 @@ public final class Controller {
     private final @org.jetbrains.annotations.NotNull field postponedActions: java.util.List
     public method <init>(): void
     public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.List
-    public final method handleResult(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void
-    public final method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
     public final @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
     public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class TryFinallyWithHandleResultKt {
     private static @org.jetbrains.annotations.NotNull field globalResult: java.lang.String
     private static field wasCalled: boolean
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public synthetic static method builder$default(p0: boolean, p1: kotlin.jvm.functions.Function1, p2: int, p3: java.lang.Object): void
-    public final static method builder(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): void
+    public synthetic static method builder$default(p0: boolean, p1: kotlin.jvm.functions.Function2, p2: int, p3: java.lang.Object): void
+    public final static method builder(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): void
     public final static method commonThrow(): void
     public final static @org.jetbrains.annotations.NotNull method getGlobalResult(): java.lang.String
     public final static method getWasCalled(): boolean
diff --git a/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTable.txt b/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTable.txt
index fee9d63b382..4f88a3a2ac5 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTable.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTable.txt
@@ -4,7 +4,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class VarValueConflictsWithTableKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }
diff --git a/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTableSameSort.txt b/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTableSameSort.txt
index 6067eb14ef1..a47bd424f8e 100644
--- a/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTableSameSort.txt
+++ b/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTableSameSort.txt
@@ -4,7 +4,21 @@ public final class Controller {
 }
 
 
+public final class CoroutineUtilKt {
+    public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+    public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation
+}
+
+
+public final class EmptyContinuation {
+    public final static field INSTANCE: EmptyContinuation
+    private method <init>(): void
+    public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
+    public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
+}
+
+
 public final class VarValueConflictsWithTableSameSortKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
-    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
+    public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void
 }