From e7275a7cb0f3cb9ee585fe6e02a44b8895d184b8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 28 May 2021 20:03:39 +0200 Subject: [PATCH] Revert "Enable JVM IR for stdlib/reflect/test libraries" This reverts commit 15e978dbd311c2ba78ec32b394c21acde9811ccb. Together with the previous revert, this led to multiple failures in Gradle integration tests: ConfigurationCacheIT.testIncrementalKaptProject ConfigurationCacheForAndroidIT.testAndroidKaptProject KotlinAndroid34GradleIT.testParcelize KotlinAndroid34GradleIT.testAndroidExtensionsManyVariants KotlinAndroid36GradleIT.testAndroidWithNewMppApp KotlinAndroid36GradleIT.testParcelize KotlinAndroid36GradleIT.testAndroidIcepickProject --- gradle.properties | 2 +- .../testData/continuation/suspendFun.out | 2 +- .../testData/continuation/suspendFunWithInner.out | 4 +++- .../testData/continuation/suspendLambda.out | 2 +- .../testData/xcoroutines/coroutineSuspendFun.out | 2 +- .../testData/xcoroutines/coroutineSuspendFun136.out | 2 +- .../testData/xcoroutines/suspendMain.out | 2 +- .../reference-public-api/kotlin-stdlib-runtime-merged.txt | 8 ++++---- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1e8246f69f7..9da19d2587f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ kotlin.compiler.newInferenceEnabled=true # Enable JVM IR backend for all modules except libraries such as kotlin-stdlib, kotlin-reflect, kotlin-test. kotlin.build.useIR=true # Enable JVM IR backend for the libraries mentioned above. -kotlin.build.useIRForLibraries=true +#kotlin.build.useIRForLibraries=true #maven.repository.mirror=http://repository.jetbrains.com/remote-repos/ #bootstrap.kotlin.repo=https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendFun.out b/idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendFun.out index 447a9e3346b..34072227528 100644 --- a/idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendFun.out +++ b/idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendFun.out @@ -15,7 +15,7 @@ CoroutineInfo: -1 coroutine UNKNOWN CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$3 (kotlin.coroutines.intrinsics) ($i$a$-createCoroutineFromSuspendFunction-IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$2, it, result, this) CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) - ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$resumeWith_u24lambda_u2d0, completion, current, param, result, this) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) CoroutineStackFrame startCoroutine:!LINE_NUMBER!, ContinuationKt (kotlin.coroutines) ($this$startCoroutine, completion, receiver) CoroutineStackFrame main:!LINE_NUMBER!, SuspendFunKt (coroutine1) diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendFunWithInner.out b/idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendFunWithInner.out index b99f36c755a..efdc7c386cb 100644 --- a/idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendFunWithInner.out +++ b/idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendFunWithInner.out @@ -10,8 +10,10 @@ CoroutineInfo: 1 coroutine RUNNING (inClassBMethodVal) CoroutineStackFrame a:!LINE_NUMBER!, TestSuspendA (continuation) (methodVal) + CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, SuspendFunWithInnerKt$main$1 (continuation) + (rootCoroutineVal) CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) - ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$resumeWith_u24lambda_u2d0, completion, current, param, result, this) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) CoroutineStackFrame run:!LINE_NUMBER!, DispatchedTask (kotlinx.coroutines) ($i$a$-withCoroutineContext-DispatchedTask$run$1, $i$f$withCoroutineContext, context, continuation, countOrElement$iv, delegate, exception, fatalException, job, oldValue$iv, state, taskContext, this) CoroutineStackFrame processNextEvent:!LINE_NUMBER!, EventLoopImplBase (kotlinx.coroutines) diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendLambda.out b/idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendLambda.out index 9bffcf870e4..3e0b17a6199 100644 --- a/idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendLambda.out +++ b/idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendLambda.out @@ -9,7 +9,7 @@ Thread stack trace: ($result, $this$sequence, step, terms, this) CoroutineInfo: -1 coroutine UNKNOWN CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) - ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$resumeWith_u24lambda_u2d0, completion, current, param, result, this) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) CoroutineStackFrame hasNext:!LINE_NUMBER!, SequenceBuilderIterator (kotlin.sequences) (step, this) CoroutineStackFrame hasNext:!LINE_NUMBER!, TakeSequence$iterator$1 (kotlin.sequences) diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/coroutineSuspendFun.out b/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/coroutineSuspendFun.out index 0c7c92399c5..ab6c3ebb6a2 100644 --- a/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/coroutineSuspendFun.out +++ b/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/coroutineSuspendFun.out @@ -13,7 +13,7 @@ CoroutineInfo: 1 coroutine RUNNING CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, CoroutineSuspendFunKt$main$1 (continuation) () CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) - ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$resumeWith_u24lambda_u2d0, completion, current, param, result, this) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) CoroutineStackFrame run:!LINE_NUMBER!, DispatchedTask (kotlinx.coroutines) ($i$a$-withCoroutineContext-DispatchedTask$run$1, $i$f$withCoroutineContext, context, continuation, countOrElement$iv, delegate, exception, fatalException, job, oldValue$iv, state, taskContext, this) CoroutineStackFrame processNextEvent:!LINE_NUMBER!, EventLoopImplBase (kotlinx.coroutines) diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/coroutineSuspendFun136.out b/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/coroutineSuspendFun136.out index a78c9e12f70..35330a741d2 100644 --- a/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/coroutineSuspendFun136.out +++ b/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/coroutineSuspendFun136.out @@ -13,7 +13,7 @@ CoroutineInfo: 1 coroutine RUNNING CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, CoroutineSuspendFun136Kt$main$1 (continuation) () CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) - ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$resumeWith_u24lambda_u2d0, completion, current, param, result, this) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) CoroutineStackFrame run:!LINE_NUMBER!, DispatchedTask (kotlinx.coroutines) ($i$a$-withCoroutineContext-DispatchedTask$run$1, $i$f$withCoroutineContext, context, continuation, countOrElement$iv, delegate, exception, fatalException, job, oldValue$iv, state, taskContext, this) CoroutineStackFrame processNextEvent:!LINE_NUMBER!, EventLoopImplBase (kotlinx.coroutines) diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/suspendMain.out b/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/suspendMain.out index 78a86bb7bd1..0476934ae0a 100644 --- a/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/suspendMain.out +++ b/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/suspendMain.out @@ -15,7 +15,7 @@ CoroutineInfo: -1 coroutine UNKNOWN CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$1 (kotlin.coroutines.intrinsics) ($i$a$-createCoroutineFromSuspendFunction-IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$1, it, result, this) CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) - ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$resumeWith_u24lambda_u2d0, completion, current, param, result, this) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) CoroutineStackFrame startCoroutine:!LINE_NUMBER!, ContinuationKt (kotlin.coroutines) ($this$startCoroutine, completion) CoroutineStackFrame runSuspend:!LINE_NUMBER!, RunSuspendKt (kotlin.coroutines.jvm.internal) diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt index 1f64b923824..0ccd542d815 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt @@ -312,7 +312,7 @@ public final class kotlin/UByteArray : java/util/Collection, kotlin/jvm/internal public fun removeAll (Ljava/util/Collection;)Z public fun retainAll (Ljava/util/Collection;)Z public static final fun set-VurrAj0 ([BIB)V - public synthetic fun size ()I + public final fun size ()I public fun toArray ()[Ljava/lang/Object; public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object; public fun toString ()Ljava/lang/String; @@ -371,7 +371,7 @@ public final class kotlin/UIntArray : java/util/Collection, kotlin/jvm/internal/ public fun removeAll (Ljava/util/Collection;)Z public fun retainAll (Ljava/util/Collection;)Z public static final fun set-VXSXFK8 ([III)V - public synthetic fun size ()I + public final fun size ()I public fun toArray ()[Ljava/lang/Object; public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object; public fun toString ()Ljava/lang/String; @@ -430,7 +430,7 @@ public final class kotlin/ULongArray : java/util/Collection, kotlin/jvm/internal public fun removeAll (Ljava/util/Collection;)Z public fun retainAll (Ljava/util/Collection;)Z public static final fun set-k8EXiF4 ([JIJ)V - public synthetic fun size ()I + public final fun size ()I public fun toArray ()[Ljava/lang/Object; public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object; public fun toString ()Ljava/lang/String; @@ -489,7 +489,7 @@ public final class kotlin/UShortArray : java/util/Collection, kotlin/jvm/interna public fun removeAll (Ljava/util/Collection;)Z public fun retainAll (Ljava/util/Collection;)Z public static final fun set-01HTLdE ([SIS)V - public synthetic fun size ()I + public final fun size ()I public fun toArray ()[Ljava/lang/Object; public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object; public fun toString ()Ljava/lang/String;