From 463af85f789d9e4bcc468c8a89a7a82431640d8b Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 26 Jan 2017 14:13:56 +0300 Subject: [PATCH] Minor. Update light-classes test data after coroutine-related changes --- .../coroutines/accessorForSuspend.txt | 16 +++---- .../coroutines/asyncIterator.txt | 46 +++++++++--------- .../coroutines/asyncIteratorToList.txt | 48 +++++++++---------- .../light-analysis/coroutines/await.txt | 16 +++---- .../coroutines/beginWithException.txt | 14 +++--- .../beginWithExceptionNoHandleException.txt | 14 +++--- .../coroutines/coercionToUnit.txt | 14 +++--- .../coroutines/controlFlow/breakFinally.txt | 14 +++--- .../coroutines/controlFlow/breakStatement.txt | 14 +++--- .../controlFlow/doWhileStatement.txt | 14 +++--- .../coroutines/controlFlow/forContinue.txt | 14 +++--- .../coroutines/controlFlow/forStatement.txt | 14 +++--- .../coroutines/controlFlow/ifStatement.txt | 14 +++--- .../controlFlow/returnFromFinally.txt | 14 +++--- .../coroutines/controlFlow/switchLikeWhen.txt | 14 +++--- .../coroutines/controlFlow/throwFromCatch.txt | 16 +++---- .../throwInTryWithHandleResult.txt | 14 +++--- .../coroutines/controlFlow/whileStatement.txt | 14 +++--- .../controllerAccessFromInnerLambda.txt | 14 +++--- .../coroutines/defaultParametersInSuspend.txt | 16 +++---- .../coroutines/dispatchResume.txt | 32 ++++++------- .../coroutines/emptyClosure.txt | 14 +++--- .../coroutines/falseUnitCoercion.txt | 14 +++--- .../light-analysis/coroutines/generate.txt | 18 +++---- .../coroutines/handleException.txt | 16 +++---- .../coroutines/handleResultCallEmptyBody.txt | 12 ++--- .../handleResultNonUnitExpression.txt | 14 +++--- .../coroutines/handleResultSuspended.txt | 14 +++--- .../coroutines/illegalState.txt | 14 +++--- .../coroutines/inlineSuspendFunction.txt | 20 ++++---- .../coroutines/inlinedTryCatchFinally.txt | 16 +++---- .../coroutines/innerSuspensionCalls.txt | 14 +++--- .../coroutines/instanceOfContinuation.txt | 16 +++---- .../intLikeVarSpilling/complicatedMerge.txt | 14 +++--- .../intLikeVarSpilling/i2bResult.txt | 14 +++--- .../loadFromBooleanArray.txt | 14 +++--- .../intLikeVarSpilling/loadFromByteArray.txt | 14 +++--- .../intLikeVarSpilling/noVariableInTable.txt | 14 +++--- .../sameIconst1ManyVars.txt | 14 +++--- .../intLikeVarSpilling/usedInArrayStore.txt | 14 +++--- .../intLikeVarSpilling/usedInMethodCall.txt | 14 +++--- .../intLikeVarSpilling/usedInPutfield.txt | 14 +++--- .../intLikeVarSpilling/usedInVarStore.txt | 14 +++--- .../coroutines/iterateOverArray.txt | 14 +++--- .../light-analysis/coroutines/kt12958.txt | 14 +++--- .../light-analysis/coroutines/kt15016.txt | 14 +++--- .../light-analysis/coroutines/kt15017.txt | 16 +++---- .../coroutines/lastExpressionIsLoop.txt | 14 +++--- .../coroutines/lastStatementInc.txt | 14 +++--- .../coroutines/lastStementAssignment.txt | 14 +++--- .../coroutines/lastUnitExpression.txt | 14 +++--- .../coroutines/localDelegate.txt | 14 +++--- .../inlineFunctionWithOptionalParam.txt | 12 ++--- .../coroutines/multiModule/simple.txt | 14 +++--- .../coroutines/multipleInvokeCalls.txt | 20 ++++---- ...multipleInvokeCallsInsideInlineLambda1.txt | 20 ++++---- ...multipleInvokeCallsInsideInlineLambda2.txt | 20 ++++---- ...multipleInvokeCallsInsideInlineLambda3.txt | 20 ++++---- .../coroutines/nestedTryCatch.txt | 16 +++---- .../coroutines/noSuspensionPoints.txt | 12 ++--- .../nonLocalReturnFromInlineLambda.txt | 14 +++--- .../nonLocalReturnFromInlineLambdaDeep.txt | 14 +++--- .../coroutines/returnByLabel.txt | 14 +++--- .../light-analysis/coroutines/simple.txt | 14 +++--- .../coroutines/simpleException.txt | 14 +++--- .../coroutines/simpleWithHandleResult.txt | 14 +++--- .../coroutines/stackUnwinding/exception.txt | 14 +++--- .../stackUnwinding/inlineSuspendFunction.txt | 18 +++---- .../coroutines/stackUnwinding/simple.txt | 14 +++--- .../stackUnwinding/suspendInCycle.txt | 16 +++---- .../statementLikeLastExpression.txt | 14 +++--- .../coroutines/suspendDefaultImpl.txt | 18 +++---- .../coroutines/suspendDelegation.txt | 16 +++---- .../coroutines/suspendFromInlineLambda.txt | 14 +++--- .../suspendFunImportedFromObject.txt | 14 +++--- .../dispatchResume.txt | 38 +++++++-------- .../handleException.txt | 28 +++++------ .../suspendFunctionAsCoroutine/inline.txt | 16 +++---- .../inlineTwoReceivers.txt | 18 +++---- .../suspendFunctionAsCoroutine/member.txt | 16 +++---- .../noinlineTwoReceivers.txt | 18 +++---- .../suspendFunctionAsCoroutine/operators.txt | 40 ++++++++-------- .../privateFunctions.txt | 20 ++++---- .../privateInFile.txt | 14 +++--- .../returnNoSuspend.txt | 16 +++---- .../suspendFunctionAsCoroutine/simple.txt | 16 +++---- .../withVariables.txt | 16 +++---- .../suspendFunctionTypeCall/localVal.txt | 16 +++---- .../manyParameters.txt | 16 +++---- .../suspendFunctionTypeCall/simple.txt | 20 ++++---- .../coroutines/suspendInCycle.txt | 16 +++---- ...suspendInTheMiddleOfObjectConstruction.txt | 18 +++---- .../coroutines/suspensionInsideSafeCall.txt | 14 +++--- .../suspensionInsideSafeCallWithElvis.txt | 14 +++--- .../tailOperations/suspendWithIf.txt | 16 +++---- .../tailOperations/suspendWithTryCatch.txt | 16 +++---- .../tailOperations/suspendWithWhen.txt | 16 +++---- .../tryCatchFinallyWithHandleResult.txt | 16 +++---- .../coroutines/tryCatchWithHandleResult.txt | 16 +++---- .../tryFinallyInsideInlineLambda.txt | 14 +++--- .../coroutines/tryFinallyWithHandleResult.txt | 16 +++---- .../coroutineNonLocalReturn.txt | 14 +++--- .../unitTypeReturn/coroutineReturn.txt | 14 +++--- .../unitTypeReturn/suspendNonLocalReturn.txt | 14 +++--- .../unitTypeReturn/suspendReturn.txt | 14 +++--- .../coroutines/varValueConflictsWithTable.txt | 14 +++--- .../varValueConflictsWithTableSameSort.txt | 14 +++--- 107 files changed, 878 insertions(+), 878 deletions(-) diff --git a/compiler/testData/codegen/light-analysis/coroutines/accessorForSuspend.txt b/compiler/testData/codegen/light-analysis/coroutines/accessorForSuspend.txt index f8672f23a66..c65699c73ab 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/accessorForSuspend.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/accessorForSuspend.txt @@ -1,8 +1,8 @@ @kotlin.Metadata public final class A { public method (): void - private final method a(p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method myfun(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + private final method a(p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method myfun(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata @@ -13,19 +13,19 @@ public final class AccessorForSuspendKt { @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/asyncIterator.txt b/compiler/testData/codegen/light-analysis/coroutines/asyncIterator.txt index fb6da523bb5..9cfbac3905f 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/asyncIterator.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/asyncIterator.txt @@ -1,45 +1,45 @@ @kotlin.Metadata public interface AsyncGenerator { - public abstract @org.jetbrains.annotations.Nullable method yield(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method yield(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata public final class AsyncGeneratorIterator { - private @org.jetbrains.annotations.Nullable field computeContinuation: kotlin.coroutines.Continuation + private @org.jetbrains.annotations.Nullable field computeContinuation: kotlin.coroutines.experimental.Continuation private field computedNext: boolean private field computesNext: boolean - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.EmptyCoroutineContext - private @org.jetbrains.annotations.Nullable field nextStep: kotlin.coroutines.Continuation + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.EmptyCoroutineContext + private @org.jetbrains.annotations.Nullable field nextStep: kotlin.coroutines.experimental.Continuation private @org.jetbrains.annotations.Nullable field nextValue: java.lang.Object public method (): void - public final @org.jetbrains.annotations.Nullable method computeHasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method computeNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method computeHasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method computeNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object private final method done(): void - public final @org.jetbrains.annotations.Nullable method getComputeContinuation(): kotlin.coroutines.Continuation + public final @org.jetbrains.annotations.Nullable method getComputeContinuation(): kotlin.coroutines.experimental.Continuation public final method getComputedNext(): boolean public final method getComputesNext(): boolean - public synthetic method getContext(): kotlin.coroutines.CoroutineContext - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.EmptyCoroutineContext - public final @org.jetbrains.annotations.Nullable method getNextStep(): kotlin.coroutines.Continuation + public synthetic method getContext(): kotlin.coroutines.experimental.CoroutineContext + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.EmptyCoroutineContext + public final @org.jetbrains.annotations.Nullable method getNextStep(): kotlin.coroutines.experimental.Continuation public final @org.jetbrains.annotations.Nullable method getNextValue(): java.lang.Object - public @org.jetbrains.annotations.Nullable method hasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method next(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method hasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method next(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object public method resume(@org.jetbrains.annotations.NotNull p0: kotlin.Unit): void public synthetic method resume(p0: java.lang.Object): void public final @kotlin.Suppress method resumeIterator(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void - public final method setComputeContinuation(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): void + public final method setComputeContinuation(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.experimental.Continuation): void public final method setComputedNext(p0: boolean): void public final method setComputesNext(p0: boolean): void - public final method setNextStep(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): void + public final method setNextStep(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.experimental.Continuation): void public final method setNextValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void - public @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.experimental.Continuation): java.lang.Object } @kotlin.Metadata public interface AsyncIterator { - public abstract @org.jetbrains.annotations.Nullable method hasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public abstract @org.jetbrains.annotations.Nullable method next(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method hasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method next(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata @@ -56,19 +56,19 @@ public interface AsyncSequence { @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/asyncIteratorToList.txt b/compiler/testData/codegen/light-analysis/coroutines/asyncIteratorToList.txt index ec35b258778..397a1917637 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/asyncIteratorToList.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/asyncIteratorToList.txt @@ -1,45 +1,45 @@ @kotlin.Metadata public interface AsyncGenerator { - public abstract @org.jetbrains.annotations.Nullable method yield(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method yield(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata public final class AsyncGeneratorIterator { - private @org.jetbrains.annotations.Nullable field computeContinuation: kotlin.coroutines.Continuation + private @org.jetbrains.annotations.Nullable field computeContinuation: kotlin.coroutines.experimental.Continuation private field computedNext: boolean private field computesNext: boolean - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.EmptyCoroutineContext - private @org.jetbrains.annotations.Nullable field nextStep: kotlin.coroutines.Continuation + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.EmptyCoroutineContext + private @org.jetbrains.annotations.Nullable field nextStep: kotlin.coroutines.experimental.Continuation private @org.jetbrains.annotations.Nullable field nextValue: java.lang.Object public method (): void - public final @org.jetbrains.annotations.Nullable method computeHasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method computeNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method computeHasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method computeNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object private final method done(): void - public final @org.jetbrains.annotations.Nullable method getComputeContinuation(): kotlin.coroutines.Continuation + public final @org.jetbrains.annotations.Nullable method getComputeContinuation(): kotlin.coroutines.experimental.Continuation public final method getComputedNext(): boolean public final method getComputesNext(): boolean - public synthetic method getContext(): kotlin.coroutines.CoroutineContext - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.EmptyCoroutineContext - public final @org.jetbrains.annotations.Nullable method getNextStep(): kotlin.coroutines.Continuation + public synthetic method getContext(): kotlin.coroutines.experimental.CoroutineContext + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.EmptyCoroutineContext + public final @org.jetbrains.annotations.Nullable method getNextStep(): kotlin.coroutines.experimental.Continuation public final @org.jetbrains.annotations.Nullable method getNextValue(): java.lang.Object - public @org.jetbrains.annotations.Nullable method hasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method next(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method hasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method next(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object public method resume(@org.jetbrains.annotations.NotNull p0: kotlin.Unit): void public synthetic method resume(p0: java.lang.Object): void public final @kotlin.Suppress method resumeIterator(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void - public final method setComputeContinuation(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): void + public final method setComputeContinuation(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.experimental.Continuation): void public final method setComputedNext(p0: boolean): void public final method setComputesNext(p0: boolean): void - public final method setNextStep(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): void + public final method setNextStep(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.experimental.Continuation): void public final method setNextValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void - public @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.experimental.Continuation): java.lang.Object } @kotlin.Metadata public interface AsyncIterator { - public abstract @org.jetbrains.annotations.Nullable method hasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public abstract @org.jetbrains.annotations.Nullable method next(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method hasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method next(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata @@ -47,7 +47,7 @@ public final class AsyncIteratorToListKt { public final static @org.jetbrains.annotations.NotNull method asyncGenerate(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): AsyncSequence 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 toList(@org.jetbrains.annotations.NotNull p0: AsyncSequence, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method toList(@org.jetbrains.annotations.NotNull p0: AsyncSequence, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata @@ -57,19 +57,19 @@ public interface AsyncSequence { @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/await.txt b/compiler/testData/codegen/light-analysis/coroutines/await.txt index d7a26607f4a..59cf80d1bd0 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/await.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/await.txt @@ -4,26 +4,26 @@ public final class AwaitKt { private static field log: java.lang.String public final static @org.jetbrains.annotations.NotNull method async(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): Promise public final static @org.jetbrains.annotations.NotNull method asyncOperation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): Promise - public final static @org.jetbrains.annotations.Nullable method await(@org.jetbrains.annotations.NotNull p0: Promise, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method awaitAndLog(@org.jetbrains.annotations.NotNull p0: Promise, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method await(@org.jetbrains.annotations.NotNull p0: Promise, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method awaitAndLog(@org.jetbrains.annotations.NotNull p0: Promise, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object public final static @org.jetbrains.annotations.NotNull method getLog(): java.lang.String } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 a2ffca45ac7..4526cebb048 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/beginWithException.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/beginWithException.txt @@ -2,24 +2,24 @@ 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 static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 85e393a4666..3b4a9567969 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/beginWithExceptionNoHandleException.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/beginWithExceptionNoHandleException.txt @@ -2,24 +2,24 @@ 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 static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 026a0caae71..79506fdc910 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/coercionToUnit.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/coercionToUnit.txt @@ -2,7 +2,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.Nullable method await(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.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 @@ -13,19 +13,19 @@ public final class CoercionToUnitKt { @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 25a05e303ed..ca100349c64 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakFinally.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakFinally.txt @@ -10,24 +10,24 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String 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 @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 faadc9eadce..593168db89e 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakStatement.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakStatement.txt @@ -10,24 +10,24 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String 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 @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 7e4201cfe57..6267e3abac3 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/doWhileStatement.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/doWhileStatement.txt @@ -4,13 +4,13 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String 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 @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata @@ -22,12 +22,12 @@ public final class DoWhileStatementKt { @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 1bbc92248c7..e9bb45e737c 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forContinue.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forContinue.txt @@ -4,24 +4,24 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String 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 @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/forStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forStatement.txt index 55bccf0c3fd..0a94fe2d230 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forStatement.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forStatement.txt @@ -4,24 +4,24 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String 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 @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/ifStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/ifStatement.txt index c67094c8d51..d7d51f72331 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/ifStatement.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/ifStatement.txt @@ -4,24 +4,24 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String 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 @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/returnFromFinally.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/returnFromFinally.txt index 550fe378f31..a58c4a6efca 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/returnFromFinally.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/returnFromFinally.txt @@ -4,24 +4,24 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String 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 suspendAndLog(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/switchLikeWhen.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/switchLikeWhen.txt index 2197ad36208..28a42200821 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/switchLikeWhen.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/switchLikeWhen.txt @@ -4,24 +4,24 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String 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 @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/throwFromCatch.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwFromCatch.txt index b3610b52500..b1ed80e1219 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwFromCatch.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwFromCatch.txt @@ -4,25 +4,25 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String 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 @org.jetbrains.annotations.Nullable method suspendAndLog(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.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.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/throwInTryWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwInTryWithHandleResult.txt index f6cc323f9ec..a05f10f32ff 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwInTryWithHandleResult.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwInTryWithHandleResult.txt @@ -4,24 +4,24 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String 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 suspendAndLog(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/whileStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/whileStatement.txt index 7fe8a3de3ae..35404a9a497 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/whileStatement.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/whileStatement.txt @@ -4,24 +4,24 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String 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 @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/controllerAccessFromInnerLambda.txt b/compiler/testData/codegen/light-analysis/coroutines/controllerAccessFromInnerLambda.txt index 8fa8457256f..efccc31bf14 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controllerAccessFromInnerLambda.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controllerAccessFromInnerLambda.txt @@ -5,7 +5,7 @@ public final class Controller { public final method foo(): void public final method getResult(): boolean public final method setResult(p0: boolean): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata @@ -17,19 +17,19 @@ public final class ControllerAccessFromInnerLambdaKt { @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 4dd9274c364..cb155d2dc4b 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/defaultParametersInSuspend.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/defaultParametersInSuspend.txt @@ -1,14 +1,14 @@ @kotlin.Metadata public final class Controller { public method (): void - public synthetic static method suspendHere$default(p0: Controller, p1: java.lang.String, p2: int, p3: kotlin.coroutines.Continuation, p4: int, p5: java.lang.Object): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object + public synthetic static method suspendHere$default(p0: Controller, p1: java.lang.String, p2: int, p3: kotlin.coroutines.experimental.Continuation, p4: int, p5: java.lang.Object): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata @@ -20,12 +20,12 @@ public final class DefaultParametersInSuspendKt { @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/dispatchResume.txt b/compiler/testData/codegen/light-analysis/coroutines/dispatchResume.txt index 516ec66e27d..e3410155e5d 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/dispatchResume.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/dispatchResume.txt @@ -1,9 +1,9 @@ @kotlin.Metadata public abstract class ContinuationDispatcher { public method (): void - public abstract method dispatchResume(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): boolean - public abstract method dispatchResumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): boolean - public @org.jetbrains.annotations.NotNull method interceptContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation + public abstract method dispatchResume(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): boolean + public abstract method dispatchResumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): boolean + public @org.jetbrains.annotations.NotNull method interceptContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata @@ -15,14 +15,14 @@ public final class Controller { public final method getResumeIndex(): int 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 - public final @org.jetbrains.annotations.Nullable method suspendWithValue(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendWithValue(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata @@ -33,12 +33,12 @@ public final class DispatchResumeKt { @kotlin.Metadata final class DispatchedContinuation { - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext - private final @org.jetbrains.annotations.NotNull field continuation: kotlin.coroutines.Continuation + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext + private final @org.jetbrains.annotations.NotNull field continuation: kotlin.coroutines.experimental.Continuation private final @org.jetbrains.annotations.NotNull field dispatcher: ContinuationDispatcher - public method (@org.jetbrains.annotations.NotNull p0: ContinuationDispatcher, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext - public final @org.jetbrains.annotations.NotNull method getContinuation(): kotlin.coroutines.Continuation + public method (@org.jetbrains.annotations.NotNull p0: ContinuationDispatcher, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext + public final @org.jetbrains.annotations.NotNull method getContinuation(): kotlin.coroutines.experimental.Continuation public final @org.jetbrains.annotations.NotNull method getDispatcher(): ContinuationDispatcher public method resume(p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void @@ -47,12 +47,12 @@ final class DispatchedContinuation { @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 a1f8b5c5a3c..fe621536152 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/emptyClosure.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/emptyClosure.txt @@ -1,13 +1,13 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata @@ -22,12 +22,12 @@ public final class EmptyClosureKt { @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 1fd5ff71d63..35cffaccc68 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/falseUnitCoercion.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/falseUnitCoercion.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): 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 @org.jetbrains.annotations.Nullable method suspendHere(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/generate.txt b/compiler/testData/codegen/light-analysis/coroutines/generate.txt index 870b780438c..4a254b9d0e8 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/generate.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/generate.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -35,10 +35,10 @@ public final class GenerateKt { @kotlin.Metadata public final class GeneratedIterator { - private field nextStep: kotlin.coroutines.Continuation + private field nextStep: kotlin.coroutines.experimental.Continuation public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void protected method computeNext(): void - public @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.experimental.Continuation): java.lang.Object } @kotlin.Metadata @@ -50,5 +50,5 @@ public final class GeneratedSequence { @kotlin.Metadata 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 + public abstract @org.jetbrains.annotations.Nullable method yield(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.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 4ba94097154..43b962c6e52 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/handleException.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/handleException.txt @@ -7,25 +7,25 @@ public final class Controller { public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.ArrayList 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 @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.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.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/handleResultCallEmptyBody.txt b/compiler/testData/codegen/light-analysis/coroutines/handleResultCallEmptyBody.txt index bacfc5809da..77548d80970 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/handleResultCallEmptyBody.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/handleResultCallEmptyBody.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 8efcdbc62b5..14fbba8c0d7 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/handleResultNonUnitExpression.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/handleResultNonUnitExpression.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,5 +27,5 @@ public final static class EmptyContinuation/Companion { 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 + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.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 b7afa261d1b..624820a638a 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/handleResultSuspended.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/handleResultSuspended.txt @@ -4,24 +4,24 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getLog(): java.lang.String 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 @org.jetbrains.annotations.Nullable method suspendAndLog(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/illegalState.txt b/compiler/testData/codegen/light-analysis/coroutines/illegalState.txt index 72967c376fe..fa4c1ccaf11 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/illegalState.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/illegalState.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -28,5 +28,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 + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.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 ad328c9b490..cfbc9af5759 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/inlineSuspendFunction.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/inlineSuspendFunction.txt @@ -1,27 +1,27 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendInline(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - private final method suspendInline(p0: kotlin.coroutines.Continuation): java.lang.Object - public final method withValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method suspendInline(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + private final method suspendInline(p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final method withValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): void } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/inlinedTryCatchFinally.txt b/compiler/testData/codegen/light-analysis/coroutines/inlinedTryCatchFinally.txt index 7619f037edc..beb3b4fb2f8 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/inlinedTryCatchFinally.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/inlinedTryCatchFinally.txt @@ -4,25 +4,25 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.List 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 @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.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.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/innerSuspensionCalls.txt b/compiler/testData/codegen/light-analysis/coroutines/innerSuspensionCalls.txt index 18cfc6c2529..d50756aa95a 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/innerSuspensionCalls.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/innerSuspensionCalls.txt @@ -4,24 +4,24 @@ public final class Controller { public method (): void public final method getI(): int public final method setI(p0: int): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/instanceOfContinuation.txt b/compiler/testData/codegen/light-analysis/coroutines/instanceOfContinuation.txt index 07f2fe797da..a44291635d3 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/instanceOfContinuation.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/instanceOfContinuation.txt @@ -1,25 +1,25 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method runCast(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method runInstanceOf(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method runCast(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method runInstanceOf(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/complicatedMerge.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/complicatedMerge.txt index 96d0830aaf6..e2ecb348b00 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/complicatedMerge.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/complicatedMerge.txt @@ -10,24 +10,24 @@ public final class ComplicatedMergeKt { @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 13e920dd281..5a86404bcda 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/i2bResult.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/i2bResult.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/loadFromBooleanArray.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromBooleanArray.txt index 3f6f896fb7f..8609171fd83 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromBooleanArray.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromBooleanArray.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/loadFromByteArray.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromByteArray.txt index 37c9090c9f6..dde45dc54e9 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromByteArray.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromByteArray.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/noVariableInTable.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/noVariableInTable.txt index dc53b777f8b..0cd2e2e912a 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/noVariableInTable.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/noVariableInTable.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/sameIconst1ManyVars.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/sameIconst1ManyVars.txt index c83c0d3ecba..0912720f2e6 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/sameIconst1ManyVars.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/sameIconst1ManyVars.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/usedInArrayStore.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInArrayStore.txt index 2f0f533cada..576608b61cd 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInArrayStore.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInArrayStore.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/usedInMethodCall.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInMethodCall.txt index 1b372dcbaa1..db188383023 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInMethodCall.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInMethodCall.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/usedInPutfield.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInPutfield.txt index 3b25eb19141..ee89880da9c 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInPutfield.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInPutfield.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/usedInVarStore.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInVarStore.txt index e2d9e198e6d..8cda3c271da 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInVarStore.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInVarStore.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/iterateOverArray.txt b/compiler/testData/codegen/light-analysis/coroutines/iterateOverArray.txt index bd1168de1ef..fece5afb2a9 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/iterateOverArray.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/iterateOverArray.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/kt12958.txt b/compiler/testData/codegen/light-analysis/coroutines/kt12958.txt index b270c500b9c..22d940f4b45 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/kt12958.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/kt12958.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -28,5 +28,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 + public final static @org.jetbrains.annotations.Nullable method suspendHere(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/kt15016.txt b/compiler/testData/codegen/light-analysis/coroutines/kt15016.txt index e522c80b011..c4b125af355 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/kt15016.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/kt15016.txt @@ -7,19 +7,19 @@ public final class Bar { @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -51,5 +51,5 @@ public final class Kt15016Kt { 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 map(@org.jetbrains.annotations.NotNull p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: 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 static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/kt15017.txt b/compiler/testData/codegen/light-analysis/coroutines/kt15017.txt index ac4cceedaeb..ba260d8498b 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/kt15017.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/kt15017.txt @@ -1,25 +1,25 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendInline(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendInlineThrow(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendInline(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendInlineThrow(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/lastExpressionIsLoop.txt b/compiler/testData/codegen/light-analysis/coroutines/lastExpressionIsLoop.txt index 4a618a6c7cc..ac1040d067f 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/lastExpressionIsLoop.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/lastExpressionIsLoop.txt @@ -7,24 +7,24 @@ public final class Controller { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String 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 @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/lastStatementInc.txt b/compiler/testData/codegen/light-analysis/coroutines/lastStatementInc.txt index 7807a13b6b4..0d23794a1c5 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/lastStatementInc.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/lastStatementInc.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,5 +27,5 @@ public final static class EmptyContinuation/Companion { 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 + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.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 fbc8368d7ed..a81c5512df5 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/lastStementAssignment.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/lastStementAssignment.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -30,5 +30,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 + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.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 144b77e620c..436fd9b3f49 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/lastUnitExpression.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/lastUnitExpression.txt @@ -7,24 +7,24 @@ public final class Controller { public final @org.jetbrains.annotations.NotNull method getV(): java.lang.String 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 @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/localDelegate.txt b/compiler/testData/codegen/light-analysis/coroutines/localDelegate.txt index 736996e0c9a..dbf0969e0a3 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/localDelegate.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/localDelegate.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,7 +27,7 @@ public final static class EmptyContinuation/Companion { public final class LocalDelegateKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method launch(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String - public final static @org.jetbrains.annotations.Nullable method suspendWithValue(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendWithValue(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata diff --git a/compiler/testData/codegen/light-analysis/coroutines/multiModule/inlineFunctionWithOptionalParam.txt b/compiler/testData/codegen/light-analysis/coroutines/multiModule/inlineFunctionWithOptionalParam.txt index 2615557b003..e648c95006d 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/multiModule/inlineFunctionWithOptionalParam.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/multiModule/inlineFunctionWithOptionalParam.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/multiModule/simple.txt b/compiler/testData/codegen/light-analysis/coroutines/multiModule/simple.txt index 1fdfa5107df..12f291ce34d 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/multiModule/simple.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/multiModule/simple.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -32,5 +32,5 @@ public final class MainKt { @kotlin.Metadata public final class lib/Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.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 4acec5731f9..3a9b71b4e93 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCalls.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCalls.txt @@ -1,32 +1,32 @@ @kotlin.Metadata public final class Controller { - private @org.jetbrains.annotations.Nullable field lastSuspension: kotlin.coroutines.Continuation + private @org.jetbrains.annotations.Nullable field lastSuspension: kotlin.coroutines.experimental.Continuation private @org.jetbrains.annotations.NotNull field result: java.lang.String public method (): void - public final @org.jetbrains.annotations.Nullable method getLastSuspension(): kotlin.coroutines.Continuation + public final @org.jetbrains.annotations.Nullable method getLastSuspension(): kotlin.coroutines.experimental.Continuation public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String public final method hasNext(): boolean public final method next(): void - public final method setLastSuspension(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): void + public final method setLastSuspension(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.experimental.Continuation): 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: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/multipleInvokeCallsInsideInlineLambda1.txt b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda1.txt index ed5a626758a..02241fda187 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda1.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda1.txt @@ -1,32 +1,32 @@ @kotlin.Metadata public final class Controller { - private @org.jetbrains.annotations.Nullable field lastSuspension: kotlin.coroutines.Continuation + private @org.jetbrains.annotations.Nullable field lastSuspension: kotlin.coroutines.experimental.Continuation private @org.jetbrains.annotations.NotNull field result: java.lang.String public method (): void - public final @org.jetbrains.annotations.Nullable method getLastSuspension(): kotlin.coroutines.Continuation + public final @org.jetbrains.annotations.Nullable method getLastSuspension(): kotlin.coroutines.experimental.Continuation public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String public final method hasNext(): boolean public final method next(): void - public final method setLastSuspension(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): void + public final method setLastSuspension(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.experimental.Continuation): 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: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/multipleInvokeCallsInsideInlineLambda2.txt b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda2.txt index e8cad47fa9b..cf0b1a671e1 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda2.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda2.txt @@ -1,32 +1,32 @@ @kotlin.Metadata public final class Controller { - private @org.jetbrains.annotations.Nullable field lastSuspension: kotlin.coroutines.Continuation + private @org.jetbrains.annotations.Nullable field lastSuspension: kotlin.coroutines.experimental.Continuation private @org.jetbrains.annotations.NotNull field result: java.lang.String public method (): void - public final @org.jetbrains.annotations.Nullable method getLastSuspension(): kotlin.coroutines.Continuation + public final @org.jetbrains.annotations.Nullable method getLastSuspension(): kotlin.coroutines.experimental.Continuation public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String public final method hasNext(): boolean public final method next(): void - public final method setLastSuspension(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): void + public final method setLastSuspension(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.experimental.Continuation): 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: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/multipleInvokeCallsInsideInlineLambda3.txt b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda3.txt index 50387bd73b5..3efcdd43e36 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda3.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda3.txt @@ -1,32 +1,32 @@ @kotlin.Metadata public final class Controller { - private @org.jetbrains.annotations.Nullable field lastSuspension: kotlin.coroutines.Continuation + private @org.jetbrains.annotations.Nullable field lastSuspension: kotlin.coroutines.experimental.Continuation private @org.jetbrains.annotations.NotNull field result: java.lang.String public method (): void - public final @org.jetbrains.annotations.Nullable method getLastSuspension(): kotlin.coroutines.Continuation + public final @org.jetbrains.annotations.Nullable method getLastSuspension(): kotlin.coroutines.experimental.Continuation public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String public final method hasNext(): boolean public final method next(): void - public final method setLastSuspension(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.Continuation): void + public final method setLastSuspension(@org.jetbrains.annotations.Nullable p0: kotlin.coroutines.experimental.Continuation): 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: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/nestedTryCatch.txt b/compiler/testData/codegen/light-analysis/coroutines/nestedTryCatch.txt index fefe187ddb6..9a4ba433341 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/nestedTryCatch.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/nestedTryCatch.txt @@ -4,25 +4,25 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.ArrayList 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 @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.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.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/noSuspensionPoints.txt b/compiler/testData/codegen/light-analysis/coroutines/noSuspensionPoints.txt index f7dae950f0b..a1fc8071aad 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/noSuspensionPoints.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/noSuspensionPoints.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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 86a3ec86f56..a544c9709dd 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambda.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambda.txt @@ -4,24 +4,24 @@ public final class Controller { public method (): void public final method getCResult(): int 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 @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/nonLocalReturnFromInlineLambdaDeep.txt b/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambdaDeep.txt index 6100b2266cb..163a3899d4f 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambdaDeep.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambdaDeep.txt @@ -4,24 +4,24 @@ public final class Controller { public method (): void public final method getCResult(): int 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 @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/returnByLabel.txt b/compiler/testData/codegen/light-analysis/coroutines/returnByLabel.txt index bb74a641674..bd5a3202b8a 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/returnByLabel.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/returnByLabel.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,5 +27,5 @@ public final static class EmptyContinuation/Companion { 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 + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.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 7aaaf7eae31..0871d006759 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/simple.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/simple.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,5 +27,5 @@ public final static class EmptyContinuation/Companion { 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 + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.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 d9447ae87b1..90985a775e2 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/simpleException.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/simpleException.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/simpleWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/simpleWithHandleResult.txt index b38fbd400a1..d71f802ca9b 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/simpleWithHandleResult.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/simpleWithHandleResult.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,5 +27,5 @@ public final static class EmptyContinuation/Companion { 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 + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.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 a130b12ba5a..44b36e4844c 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/exception.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/exception.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/stackUnwinding/inlineSuspendFunction.txt b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/inlineSuspendFunction.txt index 431947df18d..1543bf4ecc8 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/inlineSuspendFunction.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/inlineSuspendFunction.txt @@ -1,26 +1,26 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendInline(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - private final method suspendInline(p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendInline(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + private final method suspendInline(p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/stackUnwinding/simple.txt b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/simple.txt index 7cd2b23cbc1..9e7662a7df2 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/simple.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/simple.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/stackUnwinding/suspendInCycle.txt b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/suspendInCycle.txt index 9f75433abfd..1d2ac03268c 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/suspendInCycle.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/suspendInCycle.txt @@ -1,25 +1,25 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/statementLikeLastExpression.txt b/compiler/testData/codegen/light-analysis/coroutines/statementLikeLastExpression.txt index 7b1deba8ea6..34ea7e189ce 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/statementLikeLastExpression.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/statementLikeLastExpression.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -30,5 +30,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 + public final static @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendDefaultImpl.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendDefaultImpl.txt index 05090d78d87..78abf7b59d7 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendDefaultImpl.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendDefaultImpl.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -32,17 +32,17 @@ public final class SuspendDefaultImplKt { @kotlin.Metadata public final class TestClass2 { public method (): void - public @org.jetbrains.annotations.Nullable method toInt(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method toInt(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata public interface TestInterface { inner class TestInterface/DefaultImpls - public abstract @org.jetbrains.annotations.Nullable method toInt(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method toInt(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata public final class TestInterface/DefaultImpls { inner class TestInterface/DefaultImpls - public static @org.jetbrains.annotations.Nullable method toInt(@org.jetbrains.annotations.NotNull p0: TestInterface, p1: kotlin.coroutines.Continuation): java.lang.Object + public static @org.jetbrains.annotations.Nullable method toInt(@org.jetbrains.annotations.NotNull p0: TestInterface, p1: kotlin.coroutines.experimental.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 697fe9e3368..98f1e3b5711 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendDelegation.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendDelegation.txt @@ -1,25 +1,25 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/suspendFromInlineLambda.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFromInlineLambda.txt index 5854b81ec78..f9bb03635d2 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFromInlineLambda.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFromInlineLambda.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/suspendFunImportedFromObject.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunImportedFromObject.txt index 775e7f10bd0..0ec8662ec2a 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunImportedFromObject.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunImportedFromObject.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -33,5 +33,5 @@ public final class TestKt { public final class stuff/Host { public final static field INSTANCE: stuff.Host private method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/dispatchResume.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/dispatchResume.txt index e3893895867..55cc171f62c 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/dispatchResume.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/dispatchResume.txt @@ -1,9 +1,9 @@ @kotlin.Metadata public abstract class ContinuationDispatcher { public method (): void - public abstract method dispatchResume(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): boolean - public abstract method dispatchResumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): boolean - public @org.jetbrains.annotations.NotNull method interceptContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation + public abstract method dispatchResume(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): boolean + public abstract method dispatchResumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): boolean + public @org.jetbrains.annotations.NotNull method interceptContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata @@ -15,33 +15,33 @@ public final class Controller { public final method getResumeIndex(): int 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 - public final @org.jetbrains.annotations.Nullable method suspendWithValue(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendWithValue(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public final class DispatchResumeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String - public final static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String - public final static @org.jetbrains.annotations.Nullable method test1(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method test2(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method test1(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method test2(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata final class DispatchedContinuation { - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext - private final @org.jetbrains.annotations.NotNull field continuation: kotlin.coroutines.Continuation + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext + private final @org.jetbrains.annotations.NotNull field continuation: kotlin.coroutines.experimental.Continuation private final @org.jetbrains.annotations.NotNull field dispatcher: ContinuationDispatcher - public method (@org.jetbrains.annotations.NotNull p0: ContinuationDispatcher, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext - public final @org.jetbrains.annotations.NotNull method getContinuation(): kotlin.coroutines.Continuation + public method (@org.jetbrains.annotations.NotNull p0: ContinuationDispatcher, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext + public final @org.jetbrains.annotations.NotNull method getContinuation(): kotlin.coroutines.experimental.Continuation public final @org.jetbrains.annotations.NotNull method getDispatcher(): ContinuationDispatcher public method resume(p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void @@ -50,12 +50,12 @@ final class DispatchedContinuation { @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/suspendFunctionAsCoroutine/handleException.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/handleException.txt index 67f1f62749b..7b9b9e40693 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/handleException.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/handleException.txt @@ -7,25 +7,25 @@ public final class Controller { public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.ArrayList 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 @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.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.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -41,10 +41,10 @@ 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.Function2): void public final static method commonThrow(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void - public final static @org.jetbrains.annotations.Nullable method justContinue(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method test1(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method test2(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method test3(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method test4(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method test5(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method justContinue(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method test1(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method test2(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method test3(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method test4(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method test5(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/inline.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/inline.txt index 9d09cbcc75e..de2ae6e391d 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/inline.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/inline.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,6 +27,6 @@ public final static class EmptyContinuation/Companion { public final class InlineKt { 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.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.txt index 1af0f8f1ee9..b4972d72ed6 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,12 +27,12 @@ public final static class EmptyContinuation/Companion { public final class InlineTwoReceiversKt { 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 test(@org.jetbrains.annotations.NotNull p0: java.lang.Iterable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method testAsync(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: java.lang.Iterable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method testAsync(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata public final class MyTest { public method (): void - public final @org.jetbrains.annotations.Nullable method act(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method act(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/member.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/member.txt index 7b537335fc5..7a0f36697dc 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/member.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/member.txt @@ -3,25 +3,25 @@ public final class A { private final @org.jetbrains.annotations.NotNull field v: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final @org.jetbrains.annotations.NotNull method getV(): java.lang.String - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/suspendFunctionAsCoroutine/noinlineTwoReceivers.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.txt index 8b1ef75a524..026f8f1c74c 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -26,13 +26,13 @@ public final static class EmptyContinuation/Companion { @kotlin.Metadata public final class MyTest { public method (): void - public final @org.jetbrains.annotations.Nullable method act(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method act(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata public final class NoinlineTwoReceiversKt { 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 test(@org.jetbrains.annotations.NotNull p0: java.lang.Iterable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method testAsync(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: java.lang.Iterable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method testAsync(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/operators.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/operators.txt index 3698f50f2e3..ba1c3abe24f 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/operators.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/operators.txt @@ -6,40 +6,40 @@ public final class A { private field isSetValueCalled: boolean private final @org.jetbrains.annotations.NotNull field x: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void - public final @org.jetbrains.annotations.Nullable method component1(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method component1(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.experimental.Continuation): java.lang.Object public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String - public final @org.jetbrains.annotations.Nullable method inc(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method inc(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object public final method isIncCalled(): boolean public final method isMinusAssignCalled(): boolean public final method isProvideDelegateCalled(): boolean public final method isSetValueCalled(): boolean - public final @org.jetbrains.annotations.Nullable method minusAssign(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method plus(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method provideDelegate(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method minusAssign(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method plus(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method provideDelegate(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.experimental.Continuation): java.lang.Object public final method setIncCalled(p0: boolean): void public final method setMinusAssignCalled(p0: boolean): void public final method setProvideDelegateCalled(p0: boolean): void public final method setSetValueCalled(p0: boolean): void - public final @org.jetbrains.annotations.Nullable method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method unaryPlus(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method unaryPlus(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -55,12 +55,12 @@ public final class OperatorsKt { private static @org.jetbrains.annotations.NotNull field a: A 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 foo1(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method foo2(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method foo3(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method foo4(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method foo6(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo1(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo2(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo3(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo4(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo6(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object public final static @org.jetbrains.annotations.NotNull method getA(): A public final static method setA(@org.jetbrains.annotations.NotNull p0: A): void - public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/privateFunctions.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/privateFunctions.txt index 9db3465c009..62010bce1ae 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/privateFunctions.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/privateFunctions.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,16 +27,16 @@ public final static class EmptyContinuation/Companion { public final class PrivateFunctionsKt { 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.Function2): void - public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata public final class X { private @org.jetbrains.annotations.NotNull field res: java.lang.String public method (): void - private final method a(p0: kotlin.coroutines.Continuation): java.lang.Object - private final method b(p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method execute(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + private final method a(p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + private final method b(p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method execute(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object public final @org.jetbrains.annotations.NotNull method getRes(): java.lang.String public final method setRes(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/privateInFile.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/privateInFile.txt index 680a42350c2..c31f1feefce 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/privateInFile.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/privateInFile.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -28,7 +28,7 @@ public final class PrivateInFileKt { private static field x: 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 - private final static method foo(p0: kotlin.coroutines.Continuation): java.lang.Object + private final static method foo(p0: kotlin.coroutines.experimental.Continuation): java.lang.Object public final static method getX(): boolean public final static method setX(p0: boolean): void } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.txt index 8afba9649cc..3d18d8e2115 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,6 +27,6 @@ public final static class EmptyContinuation/Companion { public final class ReturnNoSuspendKt { 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(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/simple.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/simple.txt index 72d652a1b84..4a2b5c3df54 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/simple.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/simple.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,6 +27,6 @@ public final static class EmptyContinuation/Companion { 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 - public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/withVariables.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/withVariables.txt index 431de35d7f3..10a294ef0bc 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/withVariables.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionAsCoroutine/withVariables.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,6 +27,6 @@ public final static class EmptyContinuation/Companion { public final class WithVariablesKt { 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 static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionTypeCall/localVal.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionTypeCall/localVal.txt index c8834953852..f8ec137ddea 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionTypeCall/localVal.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionTypeCall/localVal.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,6 +27,6 @@ public final static class EmptyContinuation/Companion { public final class LocalValKt { 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 foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @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 static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionTypeCall/manyParameters.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionTypeCall/manyParameters.txt index f5f7a26cf94..720fdb877fa 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionTypeCall/manyParameters.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionTypeCall/manyParameters.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,6 +27,6 @@ public final static class EmptyContinuation/Companion { public final class ManyParametersKt { 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 foo(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function5, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @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 static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function5, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionTypeCall/simple.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionTypeCall/simple.txt index be6e9187b2c..cb2dcd2f793 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionTypeCall/simple.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFunctionTypeCall/simple.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,8 +27,8 @@ public final static class EmptyContinuation/Companion { 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 foo1(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method foo2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method foo3(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @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 static @org.jetbrains.annotations.Nullable method foo1(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo3(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendInCycle.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendInCycle.txt index 71c5d806aab..f32396db7f8 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendInCycle.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendInCycle.txt @@ -4,25 +4,25 @@ public final class Controller { public method (): void public final method getI(): int public final method setI(p0: int): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/suspendInTheMiddleOfObjectConstruction.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendInTheMiddleOfObjectConstruction.txt index aaa8fbd371c..8188654372b 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendInTheMiddleOfObjectConstruction.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendInTheMiddleOfObjectConstruction.txt @@ -35,26 +35,26 @@ public final class C { @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendWithArgument(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendWithDouble(p0: double, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendWithArgument(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendWithDouble(p0: double, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/suspensionInsideSafeCall.txt b/compiler/testData/codegen/light-analysis/coroutines/suspensionInsideSafeCall.txt index 4eab8fbcb44..e16e0645563 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspensionInsideSafeCall.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspensionInsideSafeCall.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -33,5 +33,5 @@ public final class SuspensionInsideSafeCallKt { @kotlin.Metadata public final class TestClass { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspensionInsideSafeCallWithElvis.txt b/compiler/testData/codegen/light-analysis/coroutines/suspensionInsideSafeCallWithElvis.txt index 0213817c0e4..a831c2a7b24 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspensionInsideSafeCallWithElvis.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspensionInsideSafeCallWithElvis.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -32,5 +32,5 @@ public final class SuspensionInsideSafeCallWithElvisKt { @kotlin.Metadata public final class TestClass { public method (): void - public final @org.jetbrains.annotations.Nullable method toInt(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method toInt(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/tailOperations/suspendWithIf.txt b/compiler/testData/codegen/light-analysis/coroutines/tailOperations/suspendWithIf.txt index e38934baa27..c8197799316 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tailOperations/suspendWithIf.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tailOperations/suspendWithIf.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,6 +27,6 @@ public final static class EmptyContinuation/Companion { public final class SuspendWithIfKt { 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 foo(@org.jetbrains.annotations.NotNull p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/tailOperations/suspendWithTryCatch.txt b/compiler/testData/codegen/light-analysis/coroutines/tailOperations/suspendWithTryCatch.txt index 477172dbd3f..ccb58c7573d 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tailOperations/suspendWithTryCatch.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tailOperations/suspendWithTryCatch.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,6 +27,6 @@ public final static class EmptyContinuation/Companion { public final class SuspendWithTryCatchKt { 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 foo(@org.jetbrains.annotations.NotNull p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/tailOperations/suspendWithWhen.txt b/compiler/testData/codegen/light-analysis/coroutines/tailOperations/suspendWithWhen.txt index 1fa76835392..15959047c1e 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tailOperations/suspendWithWhen.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tailOperations/suspendWithWhen.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -27,6 +27,6 @@ public final static class EmptyContinuation/Companion { public final class SuspendWithWhenKt { 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 foo(@org.jetbrains.annotations.NotNull p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/tryCatchFinallyWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/tryCatchFinallyWithHandleResult.txt index 77f37e2d962..433334d959d 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tryCatchFinallyWithHandleResult.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tryCatchFinallyWithHandleResult.txt @@ -4,25 +4,25 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.ArrayList 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 @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.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.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/tryCatchWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/tryCatchWithHandleResult.txt index 155ba133583..0e2c177d1f9 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tryCatchWithHandleResult.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tryCatchWithHandleResult.txt @@ -4,25 +4,25 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.ArrayList 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 @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.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.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/tryFinallyInsideInlineLambda.txt b/compiler/testData/codegen/light-analysis/coroutines/tryFinallyInsideInlineLambda.txt index 436b9ae3d29..beb3861bf76 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tryFinallyInsideInlineLambda.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tryFinallyInsideInlineLambda.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): 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 @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/tryFinallyWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/tryFinallyWithHandleResult.txt index 96e34d824b1..25b4ddfe9ed 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tryFinallyWithHandleResult.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tryFinallyWithHandleResult.txt @@ -4,25 +4,25 @@ public final class Controller { public method (): void public final @org.jetbrains.annotations.NotNull method getPostponedActions(): java.util.List 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 @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Exception, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.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.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/unitTypeReturn/coroutineNonLocalReturn.txt b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineNonLocalReturn.txt index 21269495c22..ac06131b4ca 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineNonLocalReturn.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineNonLocalReturn.txt @@ -2,24 +2,24 @@ public final class CoroutineNonLocalReturnKt { 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 static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/unitTypeReturn/coroutineReturn.txt b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineReturn.txt index d660161c230..2e8782cace0 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineReturn.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineReturn.txt @@ -2,24 +2,24 @@ public final class CoroutineReturnKt { 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 static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/unitTypeReturn/suspendNonLocalReturn.txt b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendNonLocalReturn.txt index 79bdcfa036e..142b39760e3 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendNonLocalReturn.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendNonLocalReturn.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -30,5 +30,5 @@ public final class SuspendNonLocalReturnKt { public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void public final static @org.jetbrains.annotations.NotNull method getResult(): java.lang.String public final static method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void - public final static @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendReturn.txt b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendReturn.txt index cd27f3ed922..7a96a37c7d0 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendReturn.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendReturn.txt @@ -1,18 +1,18 @@ @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -30,5 +30,5 @@ public final class SuspendReturnKt { public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void public final static @org.jetbrains.annotations.NotNull method getResult(): java.lang.String public final static method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void - public final static @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTable.txt b/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTable.txt index b76e099432e..c54576cb8a5 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTable.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTable.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext 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/varValueConflictsWithTableSameSort.txt b/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTableSameSort.txt index e0d6f0451d3..93be7eca1c0 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTableSameSort.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTableSameSort.txt @@ -1,24 +1,24 @@ @kotlin.Metadata public final class Controller { public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object } @kotlin.Metadata 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 static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void }