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

Revert "Enable JVM IR for stdlib/reflect/test libraries"

Browse Source 
This reverts commit 15e978dbd3.

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
This commit is contained in:
Alexander Udalov
2021-05-28 20:03:39 +02:00
parent e0cc6d44a7
commit e7275a7cb0
8 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -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. # Enable JVM IR backend for all modules except libraries such as kotlin-stdlib, kotlin-reflect, kotlin-test.
kotlin.build.useIR=true kotlin.build.useIR=true
# Enable JVM IR backend for the libraries mentioned above. # 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/ #maven.repository.mirror=http://repository.jetbrains.com/remote-repos/
#bootstrap.kotlin.repo=https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap #bootstrap.kotlin.repo=https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap
idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendFun.out
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ CoroutineInfo: -1 coroutine UNKNOWN
CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$3 (kotlin.coroutines.intrinsics) 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) ($i$a$-createCoroutineFromSuspendFunction-IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$2, it, result, this)
CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) 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) CoroutineStackFrame startCoroutine:!LINE_NUMBER!, ContinuationKt (kotlin.coroutines)
($this$startCoroutine, completion, receiver) ($this$startCoroutine, completion, receiver)
CoroutineStackFrame main:!LINE_NUMBER!, SuspendFunKt (coroutine1) CoroutineStackFrame main:!LINE_NUMBER!, SuspendFunKt (coroutine1)
idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendFunWithInner.out
Vendored
+3 -1
View File
@@ -10,8 +10,10 @@ CoroutineInfo: 1 coroutine RUNNING
(inClassBMethodVal) (inClassBMethodVal)
CoroutineStackFrame a:!LINE_NUMBER!, TestSuspendA (continuation) CoroutineStackFrame a:!LINE_NUMBER!, TestSuspendA (continuation)
(methodVal) (methodVal)
CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, SuspendFunWithInnerKt$main$1 (continuation)
(rootCoroutineVal)
CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) 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) 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) ($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) CoroutineStackFrame processNextEvent:!LINE_NUMBER!, EventLoopImplBase (kotlinx.coroutines)
idea/jvm-debugger/jvm-debugger-test/testData/continuation/suspendLambda.out
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ Thread stack trace:
($result, $this$sequence, step, terms, this) ($result, $this$sequence, step, terms, this)
CoroutineInfo: -1 coroutine UNKNOWN CoroutineInfo: -1 coroutine UNKNOWN
CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) 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) CoroutineStackFrame hasNext:!LINE_NUMBER!, SequenceBuilderIterator (kotlin.sequences)
(step, this) (step, this)
CoroutineStackFrame hasNext:!LINE_NUMBER!, TakeSequence$iterator$1 (kotlin.sequences) CoroutineStackFrame hasNext:!LINE_NUMBER!, TakeSequence$iterator$1 (kotlin.sequences)
idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/coroutineSuspendFun.out
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ CoroutineInfo: 1 coroutine RUNNING
CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, CoroutineSuspendFunKt$main$1 (continuation) CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, CoroutineSuspendFunKt$main$1 (continuation)
() ()
CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) 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) 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) ($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) CoroutineStackFrame processNextEvent:!LINE_NUMBER!, EventLoopImplBase (kotlinx.coroutines)
idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/coroutineSuspendFun136.out
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ CoroutineInfo: 1 coroutine RUNNING
CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, CoroutineSuspendFun136Kt$main$1 (continuation) CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, CoroutineSuspendFun136Kt$main$1 (continuation)
() ()
CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) 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) 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) ($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) CoroutineStackFrame processNextEvent:!LINE_NUMBER!, EventLoopImplBase (kotlinx.coroutines)
idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/suspendMain.out
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ CoroutineInfo: -1 coroutine UNKNOWN
CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$1 (kotlin.coroutines.intrinsics) 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) ($i$a$-createCoroutineFromSuspendFunction-IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$1, it, result, this)
CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) 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) CoroutineStackFrame startCoroutine:!LINE_NUMBER!, ContinuationKt (kotlin.coroutines)
($this$startCoroutine, completion) ($this$startCoroutine, completion)
CoroutineStackFrame runSuspend:!LINE_NUMBER!, RunSuspendKt (kotlin.coroutines.jvm.internal) CoroutineStackFrame runSuspend:!LINE_NUMBER!, RunSuspendKt (kotlin.coroutines.jvm.internal)
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+4 -4
View File
@@ -312,7 +312,7 @@ public final class kotlin/UByteArray : java/util/Collection, kotlin/jvm/internal
public fun removeAll (Ljava/util/Collection;)Z public fun removeAll (Ljava/util/Collection;)Z
public fun retainAll (Ljava/util/Collection;)Z public fun retainAll (Ljava/util/Collection;)Z
public static final fun set-VurrAj0 ([BIB)V 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;
public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object; public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
public fun toString ()Ljava/lang/String; 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 removeAll (Ljava/util/Collection;)Z
public fun retainAll (Ljava/util/Collection;)Z public fun retainAll (Ljava/util/Collection;)Z
public static final fun set-VXSXFK8 ([III)V 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;
public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object; public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
public fun toString ()Ljava/lang/String; 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 removeAll (Ljava/util/Collection;)Z
public fun retainAll (Ljava/util/Collection;)Z public fun retainAll (Ljava/util/Collection;)Z
public static final fun set-k8EXiF4 ([JIJ)V 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;
public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object; public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
public fun toString ()Ljava/lang/String; 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 removeAll (Ljava/util/Collection;)Z
public fun retainAll (Ljava/util/Collection;)Z public fun retainAll (Ljava/util/Collection;)Z
public static final fun set-01HTLdE ([SIS)V 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;
public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object; public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
public fun toString ()Ljava/lang/String; public fun toString ()Ljava/lang/String;