Merge pull request #179 from rickclephas/feature/kotlin-2.0.20

Kotlin 2.0.20
rickclephas · Aug 26, 2024 · 4a14e1e · 4a14e1e
2 parents 407634d + 1c6fc37
commit 4a14e1e
Show file tree

Hide file tree

Showing 22 changed files with 174 additions and 162 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,7 +18,7 @@ buildscript {
 
 allprojects {
     group = "com.rickclephas.kmp"
-    version = "1.0.0-ALPHA-34"
+    version = "1.0.0-ALPHA-34-kotlin-2.0.20-RC2"
 
     repositories {
         mavenCentral()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
-kotlin = "2.0.10"
+kotlin = "2.0.20"
 kotlinx-coroutines = "1.8.1"
 kotlinx-binary-compatibility-validator = "0.15.0-Beta.2"
-ksp = "2.0.10-1.0.24"
+ksp = "2.0.20-1.0.24"
 kotlinpoet = "1.18.1"
 junit = "5.9.1"
 

diff --git a/kmp-nativecoroutines-annotations/build.gradle.kts b/kmp-nativecoroutines-annotations/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)

diff --git a/.../src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/Annotations.kt b/.../src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/Annotations.kt
@@ -110,4 +110,4 @@ private fun FirAnnotation.getArguments(vararg names: Name): Map<Name, FirExpress
 }
 
 private inline fun <reified T> FirExpression.getLiteralValue(): T? =
-    (this as? FirLiteralExpression<*>)?.value as? T
+    (this as? FirLiteralExpression)?.value as? T
diff --git a/...c/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/NativeFunction.kt b/...c/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/NativeFunction.kt
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.extensions.FirExtension
 import org.jetbrains.kotlin.fir.moduleData
 import org.jetbrains.kotlin.fir.symbols.SymbolInternals
 import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
-import org.jetbrains.kotlin.fir.types.*
+import org.jetbrains.kotlin.fir.toFirResolvedTypeRef
 import org.jetbrains.kotlin.name.CallableId
 
 internal fun FirExtension.buildNativeFunction(

diff --git a/...c/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/NativeProperty.kt b/...c/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/NativeProperty.kt
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.extensions.FirExtension
 import org.jetbrains.kotlin.fir.moduleData
 import org.jetbrains.kotlin.fir.symbols.SymbolInternals
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
-import org.jetbrains.kotlin.fir.types.*
+import org.jetbrains.kotlin.fir.toFirResolvedTypeRef
 import org.jetbrains.kotlin.name.CallableId
 
 internal fun FirExtension.buildNativeProperty(

diff --git a/...ain/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/ReceiverParameter.kt b/...ain/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/ReceiverParameter.kt
@@ -6,8 +6,8 @@ import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter
 import org.jetbrains.kotlin.fir.declarations.builder.buildReceiverParameter
 import org.jetbrains.kotlin.fir.extensions.FirExtension
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
+import org.jetbrains.kotlin.fir.toFirResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.coneType
-import org.jetbrains.kotlin.fir.types.toFirResolvedTypeRef
 
 internal fun FirExtension.buildReceiverParameterCopy(
     originalParameter: FirReceiverParameter?,

diff --git a/...kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/SharedFlowReplayCache.kt b/...kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/SharedFlowReplayCache.kt
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.extensions.FirExtension
 import org.jetbrains.kotlin.fir.moduleData
 import org.jetbrains.kotlin.fir.symbols.SymbolInternals
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
+import org.jetbrains.kotlin.fir.toFirResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.StandardClassIds

diff --git a/...c/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/StateFlowValue.kt b/...c/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/StateFlowValue.kt
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.extensions.FirExtension
 import org.jetbrains.kotlin.fir.moduleData
 import org.jetbrains.kotlin.fir.symbols.SymbolInternals
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
+import org.jetbrains.kotlin.fir.toFirResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.utils.addToStdlib.applyIf

diff --git a/...c/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/TypeParameters.kt b/...c/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/TypeParameters.kt
@@ -13,8 +13,8 @@ import org.jetbrains.kotlin.fir.resolve.substitution.substitutorByMap
 import org.jetbrains.kotlin.fir.scopes.impl.toConeType
 import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
+import org.jetbrains.kotlin.fir.toFirResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.coneType
-import org.jetbrains.kotlin.fir.types.toFirResolvedTypeRef
 
 internal data class TypeParameters(
     val parameters: List<FirTypeParameter>,

diff --git a/.../main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/ValueParameters.kt b/.../main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/ValueParameters.kt
@@ -12,8 +12,8 @@ import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.symbols.SymbolInternals
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol
+import org.jetbrains.kotlin.fir.toFirResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.coneType
-import org.jetbrains.kotlin.fir.types.toFirResolvedTypeRef
 
 internal fun FirExtension.buildValueParametersCopy(
     originalParameters: List<FirValueParameterSymbol>,

diff --git a/...in/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/utils/FirLiteralExpression.kt b/...in/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/utils/FirLiteralExpression.kt
@@ -4,5 +4,5 @@ import org.jetbrains.kotlin.fir.expressions.FirLiteralExpression
 import org.jetbrains.kotlin.fir.expressions.builder.buildLiteralExpression
 import org.jetbrains.kotlin.types.ConstantValueKind
 
-internal fun String.asFirExpression(): FirLiteralExpression<String> =
+internal fun String.asFirExpression(): FirLiteralExpression =
     buildLiteralExpression(null, ConstantValueKind.String, this, setType = true)
diff --git a/kmp-nativecoroutines-compiler/src/testData/codegen/annotations.fir.ir.txt b/kmp-nativecoroutines-compiler/src/testData/codegen/annotations.fir.ir.txt
@@ -18,7 +18,7 @@ FILE fqName:<root> fileName:/annotations.kt
   PROPERTY name:deprecatedProperty2 visibility:public modality:FINAL [val]
     annotations:
       NativeCoroutines
-      Deprecated(message = "This is deprecated 5", replaceWith = <null>, level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:WARNING' type=kotlin.DeprecationLevel)
+      Deprecated(message = "This is deprecated 5", replaceWith = <null>, level = GET_ENUM 'ENUM_ENTRY name:WARNING' type=kotlin.DeprecationLevel)
     FIELD PROPERTY_BACKING_FIELD name:deprecatedProperty2 type:kotlinx.coroutines.flow.Flow<kotlin.String> visibility:private [final,static]
       EXPRESSION_BODY
         CALL 'public final fun flowOf <T> (value: T of kotlinx.coroutines.flow.flowOf): kotlinx.coroutines.flow.Flow<T of kotlinx.coroutines.flow.flowOf> declared in kotlinx.coroutines.flow' type=kotlinx.coroutines.flow.Flow<kotlin.String> origin=null
@@ -32,7 +32,7 @@ FILE fqName:<root> fileName:/annotations.kt
   PROPERTY name:deprecatedProperty3 visibility:public modality:FINAL [val]
     annotations:
       NativeCoroutines
-      Deprecated(message = "This is deprecated 6", replaceWith = ReplaceWith(expression = "deprecatedProperty2", imports = []), level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:ERROR' type=kotlin.DeprecationLevel)
+      Deprecated(message = "This is deprecated 6", replaceWith = ReplaceWith(expression = "deprecatedProperty2", imports = []), level = GET_ENUM 'ENUM_ENTRY name:ERROR' type=kotlin.DeprecationLevel)
     FIELD PROPERTY_BACKING_FIELD name:deprecatedProperty3 type:kotlinx.coroutines.flow.Flow<kotlin.String> visibility:private [final,static]
       EXPRESSION_BODY
         CALL 'public final fun flowOf <T> (value: T of kotlinx.coroutines.flow.flowOf): kotlinx.coroutines.flow.Flow<T of kotlinx.coroutines.flow.flowOf> declared in kotlinx.coroutines.flow' type=kotlinx.coroutines.flow.Flow<kotlin.String> origin=null
@@ -61,7 +61,7 @@ FILE fqName:<root> fileName:/annotations.kt
   PROPERTY name:objCNameProperty1 visibility:public modality:FINAL [val]
     annotations:
       NativeCoroutines
-      OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalObjCName modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalObjCName>])
+      OptIn(markerClass = [CLASS_REFERENCE 'CLASS ANNOTATION_CLASS name:ExperimentalObjCName modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalObjCName>])
       ObjCName(name = "objCNameProperty1ObjC", swiftName = <null>, exact = <null>)
     FIELD PROPERTY_BACKING_FIELD name:objCNameProperty1 type:kotlinx.coroutines.flow.StateFlow<kotlin.String> visibility:private [final,static]
       EXPRESSION_BODY
@@ -76,7 +76,7 @@ FILE fqName:<root> fileName:/annotations.kt
   PROPERTY name:objCNameProperty2 visibility:public modality:FINAL [val]
     annotations:
       NativeCoroutinesState
-      OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalObjCName modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalObjCName>])
+      OptIn(markerClass = [CLASS_REFERENCE 'CLASS ANNOTATION_CLASS name:ExperimentalObjCName modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalObjCName>])
       ObjCName(name = "objCNameProperty2ObjC", swiftName = <null>, exact = <null>)
     FIELD PROPERTY_BACKING_FIELD name:objCNameProperty2 type:kotlinx.coroutines.flow.StateFlow<kotlin.String> visibility:private [final,static]
       EXPRESSION_BODY
@@ -166,45 +166,45 @@ FILE fqName:<root> fileName:/annotations.kt
   FUN name:deprecatedFunction2 visibility:public modality:FINAL <> () returnType:kotlin.String [suspend]
     annotations:
       NativeCoroutines
-      Deprecated(message = "This is deprecated 2", replaceWith = <null>, level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:WARNING' type=kotlin.DeprecationLevel)
+      Deprecated(message = "This is deprecated 2", replaceWith = <null>, level = GET_ENUM 'ENUM_ENTRY name:WARNING' type=kotlin.DeprecationLevel)
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun deprecatedFunction2 (): kotlin.String declared in <root>'
         CONST String type=kotlin.String value="OK2"
   FUN name:deprecatedFunction3 visibility:public modality:FINAL <> () returnType:kotlin.String [suspend]
     annotations:
       NativeCoroutines
-      Deprecated(message = "This is deprecated 3", replaceWith = ReplaceWith(expression = "deprecatedFunction2()", imports = []), level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:ERROR' type=kotlin.DeprecationLevel)
+      Deprecated(message = "This is deprecated 3", replaceWith = ReplaceWith(expression = "deprecatedFunction2()", imports = []), level = GET_ENUM 'ENUM_ENTRY name:ERROR' type=kotlin.DeprecationLevel)
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun deprecatedFunction3 (): kotlin.String declared in <root>'
         CONST String type=kotlin.String value="OK3"
   FUN name:objCNameFunction1 visibility:public modality:FINAL <> () returnType:kotlin.String [suspend]
     annotations:
       NativeCoroutines
-      OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalObjCName modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalObjCName>])
+      OptIn(markerClass = [CLASS_REFERENCE 'CLASS ANNOTATION_CLASS name:ExperimentalObjCName modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalObjCName>])
       ObjCName(name = "objCNameFunction1ObjC", swiftName = <null>, exact = <null>)
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun objCNameFunction1 (): kotlin.String declared in <root>'
         CONST String type=kotlin.String value="OK8"
   FUN name:objCNameFunction2 visibility:public modality:FINAL <> () returnType:kotlin.String [suspend]
     annotations:
       NativeCoroutines
-      OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalObjCName modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalObjCName>])
+      OptIn(markerClass = [CLASS_REFERENCE 'CLASS ANNOTATION_CLASS name:ExperimentalObjCName modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalObjCName>])
       ObjCName(name = <null>, swiftName = "objCNameFunction2Swift", exact = <null>)
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun objCNameFunction2 (): kotlin.String declared in <root>'
         CONST String type=kotlin.String value="OK9"
   FUN name:objCNameFunction3 visibility:public modality:FINAL <> () returnType:kotlin.String [suspend]
     annotations:
       NativeCoroutines
-      OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalObjCName modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalObjCName>])
+      OptIn(markerClass = [CLASS_REFERENCE 'CLASS ANNOTATION_CLASS name:ExperimentalObjCName modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalObjCName>])
       ObjCName(name = "objCNameFunction3ObjC", swiftName = "objCNameFunction3Swift", exact = <null>)
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun objCNameFunction3 (): kotlin.String declared in <root>'
         CONST String type=kotlin.String value="OK10"
   FUN name:objCNameFunctionParameter visibility:public modality:FINAL <> (value:kotlin.String) returnType:kotlin.String [suspend]
     annotations:
       NativeCoroutines
-      OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalObjCName modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalObjCName>])
+      OptIn(markerClass = [CLASS_REFERENCE 'CLASS ANNOTATION_CLASS name:ExperimentalObjCName modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalObjCName>])
     VALUE_PARAMETER name:value index:0 type:kotlin.String
       annotations:
         ObjCName(name = "valueObjC", swiftName = <null>, exact = <null>)

diff --git a/kmp-nativecoroutines-compiler/src/testData/codegen/coroutinescope.fir.ir.txt b/kmp-nativecoroutines-compiler/src/testData/codegen/coroutinescope.fir.ir.txt
@@ -6,7 +6,7 @@ FILE fqName:<root> fileName:/coroutinescope1.kt
       EXPRESSION_BODY
         CALL 'public final fun CoroutineScope (context: kotlin.coroutines.CoroutineContext): kotlinx.coroutines.CoroutineScope declared in kotlinx.coroutines' type=kotlinx.coroutines.CoroutineScope origin=null
           context: CALL 'public final fun <get-Default> (): kotlinx.coroutines.CoroutineDispatcher declared in kotlinx.coroutines.Dispatchers' type=kotlinx.coroutines.CoroutineDispatcher origin=GET_PROPERTY
-            $this: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Dispatchers modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlinx.coroutines.Dispatchers
+            $this: GET_OBJECT 'CLASS OBJECT name:Dispatchers modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlinx.coroutines.Dispatchers
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-coroutineScope1> visibility:internal modality:FINAL <> () returnType:kotlinx.coroutines.CoroutineScope
       correspondingProperty: PROPERTY name:coroutineScope1 visibility:internal modality:FINAL [val]
       BLOCK_BODY
@@ -34,7 +34,7 @@ FILE fqName:<root> fileName:/coroutinescope1.kt
         EXPRESSION_BODY
           CALL 'public final fun CoroutineScope (context: kotlin.coroutines.CoroutineContext): kotlinx.coroutines.CoroutineScope declared in kotlinx.coroutines' type=kotlinx.coroutines.CoroutineScope origin=null
             context: CALL 'public final fun <get-Default> (): kotlinx.coroutines.CoroutineDispatcher declared in kotlinx.coroutines.Dispatchers' type=kotlinx.coroutines.CoroutineDispatcher origin=GET_PROPERTY
-              $this: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Dispatchers modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlinx.coroutines.Dispatchers
+              $this: GET_OBJECT 'CLASS OBJECT name:Dispatchers modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlinx.coroutines.Dispatchers
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-coroutineScope2> visibility:protected modality:FINAL <> ($this:<root>.MyClass1) returnType:kotlinx.coroutines.CoroutineScope
         correspondingProperty: PROPERTY name:coroutineScope2 visibility:protected modality:FINAL [val]
         $this: VALUE_PARAMETER name:<this> type:<root>.MyClass1
@@ -134,7 +134,7 @@ FILE fqName:<root> fileName:/coroutinescope1.kt
       annotations:
         NativeCoroutineScope
       overridden:
-        protected final coroutineScope2: kotlinx.coroutines.CoroutineScope
+        protected final coroutineScope2: kotlinx.coroutines.CoroutineScope declared in <root>.MyClass1
       FUN FAKE_OVERRIDE name:<get-coroutineScope2> visibility:protected modality:FINAL <> ($this:<root>.MyClass1) returnType:kotlinx.coroutines.CoroutineScope [fake_override]
         correspondingProperty: PROPERTY FAKE_OVERRIDE name:coroutineScope2 visibility:protected modality:FINAL [fake_override,val]
         overridden:
@@ -167,7 +167,7 @@ FILE fqName:<root> fileName:/coroutinescope1.kt
         EXPRESSION_BODY
           CALL 'public final fun CoroutineScope (context: kotlin.coroutines.CoroutineContext): kotlinx.coroutines.CoroutineScope declared in kotlinx.coroutines' type=kotlinx.coroutines.CoroutineScope origin=null
             context: CALL 'public final fun <get-Default> (): kotlinx.coroutines.CoroutineDispatcher declared in kotlinx.coroutines.Dispatchers' type=kotlinx.coroutines.CoroutineDispatcher origin=GET_PROPERTY
-              $this: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Dispatchers modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlinx.coroutines.Dispatchers
+              $this: GET_OBJECT 'CLASS OBJECT name:Dispatchers modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlinx.coroutines.Dispatchers
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-coroutineScope3> visibility:internal modality:FINAL <> ($this:<root>.MyClass3) returnType:kotlinx.coroutines.CoroutineScope
         correspondingProperty: PROPERTY name:coroutineScope3 visibility:internal modality:FINAL [val]
         $this: VALUE_PARAMETER name:<this> type:<root>.MyClass3
@@ -233,7 +233,7 @@ FILE fqName:<root> fileName:/coroutinescope1.kt
       annotations:
         NativeCoroutineScope
       overridden:
-        protected final coroutineScope2: kotlinx.coroutines.CoroutineScope
+        protected final coroutineScope2: kotlinx.coroutines.CoroutineScope declared in <root>.MyClass1
       FUN FAKE_OVERRIDE name:<get-coroutineScope2> visibility:protected modality:FINAL <> ($this:<root>.MyClass1) returnType:kotlinx.coroutines.CoroutineScope [fake_override]
         correspondingProperty: PROPERTY FAKE_OVERRIDE name:coroutineScope2 visibility:protected modality:FINAL [fake_override,val]
         overridden:
@@ -358,7 +358,7 @@ FILE fqName:<root> fileName:/coroutinescope2.kt
         EXPRESSION_BODY
           CALL 'public final fun CoroutineScope (context: kotlin.coroutines.CoroutineContext): kotlinx.coroutines.CoroutineScope declared in kotlinx.coroutines' type=kotlinx.coroutines.CoroutineScope origin=null
             context: CALL 'public final fun <get-Default> (): kotlinx.coroutines.CoroutineDispatcher declared in kotlinx.coroutines.Dispatchers' type=kotlinx.coroutines.CoroutineDispatcher origin=GET_PROPERTY
-              $this: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Dispatchers modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlinx.coroutines.Dispatchers
+              $this: GET_OBJECT 'CLASS OBJECT name:Dispatchers modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlinx.coroutines.Dispatchers
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-coroutineScope4> visibility:private modality:FINAL <> ($this:<root>.MyClass6) returnType:kotlinx.coroutines.CoroutineScope
         correspondingProperty: PROPERTY name:coroutineScope4 visibility:private modality:FINAL [val]
         $this: VALUE_PARAMETER name:<this> type:<root>.MyClass6