From 06b2efe65ffc70433477ac48409ab26708474053 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 13 May 2021 13:54:09 +0300
Subject: [PATCH] [Test] Introduce new syntax for dependsOn dependencies

---
 .../jetbrains/kotlin/test/model/Modules.kt    | 17 +++++---
 .../exhaustiveness/commonEnum.kt              |  2 +-
 .../exhaustiveness/commonSealedClass.kt       |  2 +-
 .../exhaustiveness/commonSealedInterface.kt   |  2 +-
 ...arImportOfExpectEnumWithActualTypeAlias.kt |  2 +-
 .../annotationArgumentEquality.kt             |  2 +-
 .../defaultArguments/annotations.fir.kt       |  2 +-
 .../defaultArguments/annotations.kt           |  2 +-
 .../annotationsViaActualTypeAlias.fir.kt      |  2 +-
 .../annotationsViaActualTypeAlias.kt          |  2 +-
 .../annotationsViaActualTypeAlias2.kt         |  2 +-
 .../defaultArguments/constructor.fir.kt       |  2 +-
 .../defaultArguments/constructor.kt           |  2 +-
 .../expectedDeclaresDefaultArguments.fir.kt   |  2 +-
 .../expectedDeclaresDefaultArguments.kt       |  2 +-
 .../expectedInheritsDefaultArguments.fir.kt   |  2 +-
 .../expectedInheritsDefaultArguments.kt       |  2 +-
 .../expectedVsNonExpectedWithDefaults.fir.kt  |  2 +-
 .../expectedVsNonExpectedWithDefaults.kt      |  2 +-
 .../multiplatform/deprecated/header.fir.kt    |  2 +-
 .../tests/multiplatform/deprecated/header.kt  |  2 +-
 .../enum/additionalEntriesInImpl.kt           |  2 +-
 .../multiplatform/enum/differentEntryOrder.kt |  2 +-
 .../tests/multiplatform/enum/javaEnum.kt      |  2 +-
 .../tests/multiplatform/enum/simpleEnum.kt    |  2 +-
 .../commonSealedWithPlatformInheritor.fir.kt  |  2 +-
 .../commonSealedWithPlatformInheritor.kt      |  2 +-
 .../exhaustiveness/expectEnum.fir.kt          |  2 +-
 .../exhaustiveness/expectEnum.kt              |  2 +-
 .../exhaustiveness/expectSealedClass.fir.kt   |  2 +-
 .../exhaustiveness/expectSealedClass.kt       |  2 +-
 .../expectSealedClassWithActualTypealias.kt   |  2 +-
 .../expectSealedInterface.fir.kt              |  2 +-
 .../exhaustiveness/expectSealedInterface.kt   |  2 +-
 .../exhaustiveness/kt45796.fir.kt             |  2 +-
 .../multiplatform/exhaustiveness/kt45796.kt   |  2 +-
 .../expectInterfaceApplicability.fir.kt       |  2 +-
 .../expectInterfaceApplicability.kt           |  2 +-
 .../generic/functionTypeParameterBounds.kt    |  2 +-
 .../generic/genericMemberBounds.kt            |  2 +-
 .../generic/membersInGenericClass.kt          |  2 +-
 ...erBoundsDifferentOrderActualMissing.fir.kt |  2 +-
 ...ameterBoundsDifferentOrderActualMissing.kt |  2 +-
 ...faultValuesInAnnotationViaTypealias.fir.kt |  4 +-
 ...thDefaultValuesInAnnotationViaTypealias.kt |  4 +-
 ...ctualClassWithDifferentConstructors.fir.kt |  2 +-
 .../actualClassWithDifferentConstructors.kt   |  2 +-
 .../headerClass/actualMissing.fir.kt          |  2 +-
 .../headerClass/actualMissing.kt              |  2 +-
 .../baseExpectClassWithoutConstructor.fir.kt  |  2 +-
 .../baseExpectClassWithoutConstructor.kt      |  2 +-
 .../multiplatform/headerClass/classKinds.kt   |  2 +-
 ...verrideMethodsFromInterfaceInCommonCode.kt |  4 +-
 .../expectClassWithoutConstructor.fir.kt      |  4 +-
 .../expectClassWithoutConstructor.kt          |  4 +-
 ...larationWithStrongIncompatibilities.fir.kt |  2 +-
 ...tDeclarationWithStrongIncompatibilities.kt |  2 +-
 ...eclarationWithWeakIncompatibilities.fir.kt |  2 +-
 ...ectDeclarationWithWeakIncompatibilities.kt |  2 +-
 .../headerClass/expectFinalActualOpen.kt      |  2 +-
 ...lassWithoutExplicitOverrideOfMethod.fir.kt |  4 +-
 ...tedClassWithoutExplicitOverrideOfMethod.kt |  4 +-
 .../headerClass/extraHeaderOnMembers.fir.kt   |  2 +-
 .../headerClass/extraHeaderOnMembers.kt       |  2 +-
 .../functionAndPropertyWithSameName.kt        |  2 +-
 .../genericClassImplTypeAlias.fir.kt          |  2 +-
 .../headerClass/genericClassImplTypeAlias.kt  |  2 +-
 .../headerClass/headerClassMember.kt          |  4 +-
 .../headerClass/implDataClass.kt              |  2 +-
 .../headerClass/implOpenClass.kt              |  2 +-
 ...CheckForExplicitAndImplicitOverride.fir.kt |  2 +-
 ...lityCheckForExplicitAndImplicitOverride.kt |  2 +-
 .../morePermissiveVisibilityOnActual.fir.kt   |  4 +-
 .../morePermissiveVisibilityOnActual.kt       |  4 +-
 ...ermissiveVisibilityOnActualViaTypeAlias.kt |  4 +-
 .../headerClass/nestedClasses.fir.kt          |  2 +-
 .../headerClass/nestedClasses.kt              |  2 +-
 .../nestedClassesWithErrors.fir.kt            |  2 +-
 .../headerClass/nestedClassesWithErrors.kt    |  2 +-
 .../headerClass/noImplKeywordOnMember.fir.kt  |  2 +-
 .../headerClass/noImplKeywordOnMember.kt      |  2 +-
 .../headerClass/privateMembers.fir.kt         |  2 +-
 .../headerClass/privateMembers.kt             |  2 +-
 .../headerClass/simpleHeaderClass.kt          |  4 +-
 .../headerClass/superClass.fir.kt             |  4 +-
 .../multiplatform/headerClass/superClass.kt   |  4 +-
 .../headerFunInNonHeaderClass.fir.kt          |  2 +-
 .../headerFunInNonHeaderClass.kt              |  2 +-
 .../multiplatform/implDelegatedMember.kt      |  2 +-
 .../tests/multiplatform/implDynamic.kt        |  2 +-
 .../tests/multiplatform/implFakeOverride.kt   |  2 +-
 .../expectActualInlineClass.fir.kt            |  2 +-
 .../inlineClasses/expectActualInlineClass.kt  |  2 +-
 .../jvmInlineExpectValueClass.kt              |  2 +-
 .../tests/multiplatform/java/flexibleTypes.kt |  2 +-
 .../multiplatform/java/parameterNames.kt      |  2 +-
 .../tests/multiplatform/namedArguments.fir.kt |  2 +-
 .../tests/multiplatform/namedArguments.kt     |  2 +-
 .../privateTopLevelDeclarations.fir.kt        |  2 +-
 .../privateTopLevelDeclarations.kt            |  2 +-
 .../tests/multiplatform/sealedTypeAlias.kt    |  2 +-
 .../multiplatform/sealedTypeAliasTopLevel.kt  |  2 +-
 .../topLevelFun/callHeaderFun.kt              |  4 +-
 .../callableReferenceOnExpectFun.fir.kt       |  2 +-
 .../callableReferenceOnExpectFun.kt           |  2 +-
 .../conflictingImplDeclarations.fir.kt        |  4 +-
 .../conflictingImplDeclarations.kt            |  4 +-
 .../topLevelFun/functionModifiers.kt          |  2 +-
 .../headerAndImplInDIfferentPackages.fir.kt   |  4 +-
 .../headerAndImplInDIfferentPackages.kt       |  4 +-
 .../implDeclarationWithoutBody.fir.kt         |  2 +-
 .../topLevelFun/implDeclarationWithoutBody.kt |  2 +-
 .../topLevelFun/inlineFun.fir.kt              |  4 +-
 .../multiplatform/topLevelFun/inlineFun.kt    |  4 +-
 .../topLevelFun/simpleHeaderFun.kt            |  4 +-
 .../valueParameterModifiers.fir.kt            |  2 +-
 .../topLevelFun/valueParameterModifiers.kt    |  2 +-
 .../topLevelProperty/simpleHeaderVar.kt       |  4 +-
 .../multiplatform/jvmOverloads.kt             |  2 +-
 .../test/backend/handlers/JvmBoxRunner.kt     |  2 +-
 .../frontend/classic/ClassicFrontendFacade.kt | 25 ++++++-----
 .../test/frontend/fir/FirFrontendFacade.kt    |  3 +-
 .../frontend/fir/FirModuleInfoProvider.kt     | 10 +++--
 .../ModuleTransformerForTwoFilesBoxTests.kt   |  6 +--
 .../JvmEnvironmentConfigurator.kt             |  8 ++--
 .../impl/ModuleStructureExtractorImpl.kt      | 41 +++++++++----------
 .../services/impl/TestModuleStructureImpl.kt  |  2 +-
 127 files changed, 203 insertions(+), 193 deletions(-)

diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/Modules.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/Modules.kt
index f5dba1c8080..10ee95462d4 100644
--- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/Modules.kt
+++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/Modules.kt
@@ -18,11 +18,17 @@ data class TestModule(
     val frontendKind: FrontendKind<*>,
     val binaryKind: BinaryKind<*>,
     val files: List<TestFile>,
-    val dependencies: List<DependencyDescription>,
-    val friends: List<DependencyDescription>,
+    val allDependencies: List<DependencyDescription>,
     val directives: RegisteredDirectives,
     val languageVersionSettings: LanguageVersionSettings
 ) {
+    val regularDependencies: List<DependencyDescription>
+        get() = allDependencies.filter { it.relation == DependencyRelation.RegularDependency }
+    val friendDependencies: List<DependencyDescription>
+        get() = allDependencies.filter { it.relation == DependencyRelation.FriendDependency }
+    val dependsOnDependencies: List<DependencyDescription>
+        get() = allDependencies.filter { it.relation == DependencyRelation.DependsOnDependency }
+
     override fun equals(other: Any?): Boolean =
         other is TestModule && name == other.name
 
@@ -33,7 +39,7 @@ data class TestModule(
             appendLine("Module: $name")
             appendLine("targetPlatform = $targetPlatform")
             appendLine("Dependencies:")
-            dependencies.forEach { appendLine("  $it") }
+            allDependencies.forEach { appendLine("  $it") }
             appendLine("Directives:\n  $directives")
             files.forEach { appendLine(it) }
         }
@@ -56,8 +62,9 @@ class TestFile(
 }
 
 enum class DependencyRelation {
-    Dependency,
-    DependsOn
+    RegularDependency,
+    FriendDependency,
+    DependsOnDependency
 }
 
 enum class DependencyKind {
diff --git a/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonEnum.kt b/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonEnum.kt
index 0f57160b8a4..16c7e104c78 100644
--- a/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonEnum.kt
+++ b/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonEnum.kt
@@ -16,7 +16,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: main.kt
 
 fun testPlatform(base: Base) {
diff --git a/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonSealedClass.kt b/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonSealedClass.kt
index 15c0d5bd1d2..3ef4098087c 100644
--- a/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonSealedClass.kt
+++ b/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonSealedClass.kt
@@ -17,7 +17,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: main.kt
 
 fun testPlatform(base: Base) {
diff --git a/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonSealedInterface.kt b/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonSealedInterface.kt
index dc85d2b73e1..32ca8a8f67f 100644
--- a/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonSealedInterface.kt
+++ b/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonSealedInterface.kt
@@ -17,7 +17,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: main.kt
 
 fun testPlatform(base: Base) {
diff --git a/compiler/testData/codegen/box/multiplatform/starImportOfExpectEnumWithActualTypeAlias.kt b/compiler/testData/codegen/box/multiplatform/starImportOfExpectEnumWithActualTypeAlias.kt
index 8c87702bd1d..e9d1b2a3bd3 100644
--- a/compiler/testData/codegen/box/multiplatform/starImportOfExpectEnumWithActualTypeAlias.kt
+++ b/compiler/testData/codegen/box/multiplatform/starImportOfExpectEnumWithActualTypeAlias.kt
@@ -11,7 +11,7 @@ package test
 
 expect enum class E
 
-// MODULE: lib-jvm(lib-common)
+// MODULE: lib-jvm()()(lib-common)
 // FILE: jvm.kt
 
 package test
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.kt
index be2fa05791d..7022108ef23 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.kt
@@ -47,7 +47,7 @@ expect annotation class ClassArrays(
     vararg val v: Int = [42]
 )
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 import kotlin.reflect.KClass
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.fir.kt
index 80ee3795709..ad9b6a09b45 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.fir.kt
@@ -19,7 +19,7 @@ expect annotation class A5(val x: Int = 42, val y: String)
 @A5(0, "")
 fun test() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual annotation class A1(actual val x: Int, actual val y: String)
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.kt
index c9f4ca8ec9d..ddf7d94e7fc 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.kt
@@ -19,7 +19,7 @@ expect annotation class A5(val x: Int = 42, val y: String)
 @A5(0, "")
 fun test() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual annotation class A1(actual val x: Int, actual val y: String)
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.fir.kt
index 0fdad4b88fd..570743e36c4 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.fir.kt
@@ -19,7 +19,7 @@ expect annotation class A5(val x: Int = 42, val y: String)
 @A5(0, "")
 fun test() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias A1 = J1
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.kt
index 8fb973a8fdf..ae6dffb212f 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.kt
@@ -19,7 +19,7 @@ expect annotation class A5(val x: Int = 42, val y: String)
 @A5(0, "")
 fun test() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias A1 = J1
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.kt
index 6f25f16e624..33745770423 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.kt
@@ -43,7 +43,7 @@ annotation class A(val value: String)
 @Anno
 fun test() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias Anno = Jnno
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.fir.kt
index d801d2363de..9805029743d 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.fir.kt
@@ -13,7 +13,7 @@ fun test() {
     Ok(42, "OK")
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Ok actual constructor(x: Int, y: String)
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.kt
index b10a772353f..0588b55f901 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.kt
@@ -13,7 +13,7 @@ fun test() {
     Ok(42, "OK")
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Ok actual constructor(x: Int, y: String)
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.fir.kt
index fbf064e3270..d83d88bb81b 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.fir.kt
@@ -23,7 +23,7 @@ fun test(foo: Foo) {
     foo.ok(42, "OK")
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual fun ok(x: Int, y: String) {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.kt
index 91c0ba6c62d..ef72dee3522 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.kt
@@ -23,7 +23,7 @@ fun test(foo: Foo) {
     foo.ok(42, "OK")
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual fun ok(x: Int, y: String) {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.fir.kt
index 1fb2506bad2..cb557e3ed51 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.fir.kt
@@ -25,7 +25,7 @@ fun test(foo: Foo, bar: Bar) {
     bar.ok(42, "OK")
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Bar : Foo {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.kt
index a262fcb7075..d6e9b0daca8 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.kt
@@ -25,7 +25,7 @@ fun test(foo: Foo, bar: Bar) {
     bar.ok(42, "OK")
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Bar : Foo {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.fir.kt
index b77b263b686..250cdfada5d 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.fir.kt
@@ -5,7 +5,7 @@
 
 expect fun ok(x: Int, y: String = "")
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual fun ok(x: Int, y: String) {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.kt
index 6dabd1d749d..54826ac0766 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.kt
@@ -5,7 +5,7 @@
 
 expect fun ok(x: Int, y: String = "")
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual fun ok(x: Int, y: String) {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.fir.kt
index cd90da17db2..2b79d2ae72d 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.fir.kt
@@ -14,7 +14,7 @@ header enum class E {
     FIRST
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 impl class My
diff --git a/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.kt b/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.kt
index ea0af3b9ba3..579c3db9a01 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.kt
@@ -14,7 +14,7 @@
     FIRST
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 <!DEPRECATED_MODIFIER!>impl<!> class My
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.kt b/compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.kt
index 17f3586af9e..61fd0542bbb 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.kt
@@ -5,7 +5,7 @@
 expect enum class Foo { A, B }
 expect enum class Bar { X, Y, Z }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual enum class Foo { A, B, C, D, E }
 actual enum class Bar { V, X, W, Y, Z }
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.kt b/compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.kt
index 0e071fee695..cba489e3172 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.kt
@@ -5,7 +5,7 @@
 expect enum class Foo { A, B }
 expect enum class Bar { X, Y, Z }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual enum class Foo { B, A }
 actual enum class Bar { X, Z, Y }
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.kt b/compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.kt
index d10e59c7376..a677fca38ef 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.kt
@@ -8,7 +8,7 @@ expect enum class Foo {
 
 expect enum class _TimeUnit
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual typealias Foo = FooImpl
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.kt b/compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.kt
index 15c7f097c22..715c68634d2 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.kt
@@ -8,7 +8,7 @@ expect enum class Foo {
     ENTRY3;
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual enum class Foo(val x: String) {
     ENTRY1("1"),
diff --git a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/commonSealedWithPlatformInheritor.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/commonSealedWithPlatformInheritor.fir.kt
index 1b2c22d8478..c66f25f23a8 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/commonSealedWithPlatformInheritor.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/commonSealedWithPlatformInheritor.fir.kt
@@ -10,7 +10,7 @@ fun test_1(b: Base) = when (b) {
     is Derived -> 1
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 
 class PlatfromDerived : Base() // must be an error
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/commonSealedWithPlatformInheritor.kt b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/commonSealedWithPlatformInheritor.kt
index a5528d8b47a..ce5731722df 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/commonSealedWithPlatformInheritor.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/commonSealedWithPlatformInheritor.kt
@@ -10,7 +10,7 @@ fun test_1(b: Base) = <!NO_ELSE_IN_WHEN{JVM}!>when<!> (b) {
     is Derived -> 1
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 
 class PlatfromDerived : <!SEALED_INHERITOR_IN_DIFFERENT_MODULE!>Base<!>() // must be an error
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.fir.kt
index e901305cf87..f426941647b 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.fir.kt
@@ -15,7 +15,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: Base.kt
 actual enum class Base {
     A, B, C
diff --git a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.kt b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.kt
index 541d2ac5e1c..7af8c3e519a 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.kt
@@ -15,7 +15,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: Base.kt
 actual enum class Base {
     A, B, C
diff --git a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClass.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClass.fir.kt
index b4b5b3e516b..188decb0939 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClass.fir.kt
@@ -16,7 +16,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: Base.kt
 actual sealed class Base
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClass.kt b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClass.kt
index 996c39a0f95..4d30025aadb 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClass.kt
@@ -16,7 +16,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: Base.kt
 actual sealed class Base
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClassWithActualTypealias.kt b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClassWithActualTypealias.kt
index d9c2ae04c6e..8c1a61eaaff 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClassWithActualTypealias.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClassWithActualTypealias.kt
@@ -8,7 +8,7 @@ expect sealed class SealedClass()
 
 class Derived1 : SealedClass()
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 actual typealias SealedClass = MySealedClass
 
 sealed class MySealedClass
diff --git a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedInterface.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedInterface.fir.kt
index d3f32ee568c..d5cd3cfaf5b 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedInterface.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedInterface.fir.kt
@@ -16,7 +16,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: Base.kt
 actual sealed interface Base
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedInterface.kt b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedInterface.kt
index a41c023a1ac..030e6c58300 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedInterface.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedInterface.kt
@@ -16,7 +16,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: Base.kt
 actual sealed interface Base
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/kt45796.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/kt45796.fir.kt
index fe2ffa4b9c0..dc688b7b0ed 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/kt45796.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/kt45796.fir.kt
@@ -15,7 +15,7 @@ fun whenForExpectSealed(s: SealedClass): Int {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 actual sealed class SealedClass {
     actual class Nested : SealedClass() {
         actual class NestedDeeper : SealedClass()
diff --git a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/kt45796.kt b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/kt45796.kt
index 92df145901e..601ceff6ba6 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/kt45796.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/kt45796.kt
@@ -15,7 +15,7 @@ fun whenForExpectSealed(s: SealedClass): Int {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 actual sealed class SealedClass {
     actual class Nested : SealedClass() {
         actual class NestedDeeper : SealedClass()
diff --git a/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.fir.kt
index 14ed539ef7f..d98211adfd1 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.fir.kt
@@ -12,7 +12,7 @@ expect interface My {
     abstract val abstractVal: Int
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 actual interface My {
     actual fun openFunPositive() = Unit
diff --git a/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.kt b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.kt
index 5c42615b114..3163a93a849 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.kt
@@ -12,7 +12,7 @@ expect interface My {
     abstract val abstractVal: Int
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 actual interface My {
     actual fun openFunPositive() = Unit
diff --git a/compiler/testData/diagnostics/tests/multiplatform/generic/functionTypeParameterBounds.kt b/compiler/testData/diagnostics/tests/multiplatform/generic/functionTypeParameterBounds.kt
index 01bcf6ae830..b16c3747b8f 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/generic/functionTypeParameterBounds.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/generic/functionTypeParameterBounds.kt
@@ -5,7 +5,7 @@
 
 expect fun <T : Comparable<T>> Array<out T>.sort(): Unit
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual fun <T : Comparable<T>> Array<out T>.sort(): Unit {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/generic/genericMemberBounds.kt b/compiler/testData/diagnostics/tests/multiplatform/generic/genericMemberBounds.kt
index 48debd5315b..9a6436f4c7d 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/generic/genericMemberBounds.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/generic/genericMemberBounds.kt
@@ -9,7 +9,7 @@ expect class A {
     fun <S : Comparable<S>> bar(): List<S>
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias A = JavaA
diff --git a/compiler/testData/diagnostics/tests/multiplatform/generic/membersInGenericClass.kt b/compiler/testData/diagnostics/tests/multiplatform/generic/membersInGenericClass.kt
index d7642a1d5c1..4e4fd9939c0 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/generic/membersInGenericClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/generic/membersInGenericClass.kt
@@ -9,7 +9,7 @@ expect interface A<T> {
     fun f(p: Collection<T>): Map<T, A<T?>>
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual interface A<T> {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.fir.kt
index 309c8d14dce..66b7bd8f782 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.fir.kt
@@ -7,7 +7,7 @@ interface B
 
 expect fun <T> List<T>.foo() where T : A, T : B
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 fun <T> List<T>.foo() where T : B, T : A {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.kt b/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.kt
index 6b3da1979c5..cddaaa8f222 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.kt
@@ -7,7 +7,7 @@ interface B
 
 expect fun <!NO_ACTUAL_FOR_EXPECT{JVM}!><T><!> List<T>.foo() where T : A, T : B
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 fun <T> List<T>.foo() where T : B, T : A {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.fir.kt
index f632ea1d20c..3157b28af6b 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.fir.kt
@@ -16,7 +16,7 @@ fun foo() {}
 @Foo5
 fun bar() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: Bar1.java
 
@@ -45,4 +45,4 @@ actual annotation class Foo5
 
 actual annotation class Foo6(val s: String = "value")
 
-actual typealias Foo7 = Bar2
\ No newline at end of file
+actual typealias Foo7 = Bar2
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.kt
index f332040430d..0a8e4218575 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.kt
@@ -16,7 +16,7 @@ fun foo() {}
 @Foo5
 fun bar() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: Bar1.java
 
@@ -45,4 +45,4 @@ actual annotation class Foo5
 
 actual annotation class Foo6(val s: String = "value")
 
-actual typealias <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>Foo7<!> = Bar2
\ No newline at end of file
+actual typealias <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>Foo7<!> = Bar2
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.fir.kt
index d9998d3d679..8d52588efd7 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.fir.kt
@@ -14,7 +14,7 @@ expect class Bar5()
 expect class Bar6()
 expect class Bar7(s: String)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: JavaFoo.java
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.kt
index 6e818d57d8c..00d7db5b984 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.kt
@@ -14,7 +14,7 @@ expect class Bar5()
 expect class Bar6()
 expect class Bar7(s: String)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: JavaFoo.java
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.fir.kt
index b6b5439476b..34152949870 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.fir.kt
@@ -6,7 +6,7 @@ expect class A {
     fun foo()
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 class A {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.kt
index 22c9574d25d..326195c6b3c 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.kt
@@ -6,7 +6,7 @@ expect class A {
     fun foo()
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 class <!ACTUAL_MISSING!>A<!> {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.fir.kt
index ab7dd939b17..59ded755697 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.fir.kt
@@ -6,7 +6,7 @@ expect open class A
 expect class B : A
 open class C : <!SUPERTYPE_NOT_INITIALIZED!>A<!>
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual open class A
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.kt
index 7eaea54b9d2..d053de3a37e 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.kt
@@ -6,7 +6,7 @@ expect open class A
 expect class B : A
 open class C : <!SUPERTYPE_NOT_INITIALIZED, SUPERTYPE_NOT_INITIALIZED{JVM}!>A<!>
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual open class A
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.kt
index 09b3470ee2f..4bd2b91d784 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.kt
@@ -13,7 +13,7 @@ expect class Class
 
 expect enum class En { ENTRY }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual interface Interface
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/dontOverrideMethodsFromInterfaceInCommonCode.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/dontOverrideMethodsFromInterfaceInCommonCode.kt
index 628118196a8..1b4541c3321 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/dontOverrideMethodsFromInterfaceInCommonCode.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/dontOverrideMethodsFromInterfaceInCommonCode.kt
@@ -15,7 +15,7 @@ expect class ExplicitFoo : Foo {
 
 expect class ImplicitFooCheck : Foo
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class ImplicitFoo : Foo {
@@ -26,4 +26,4 @@ actual class ExplicitFoo : Foo {
     actual override fun foo() {}
 }
 
-actual <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class ImplicitFooCheck<!> : Foo
\ No newline at end of file
+actual <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class ImplicitFooCheck<!> : Foo
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.fir.kt
index cf76d6cbf37..a547ba440ae 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.fir.kt
@@ -16,10 +16,10 @@ fun test() {
     FooBar()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo
 actual class Bar
 actual class Baz
-actual class FooBar
\ No newline at end of file
+actual class FooBar
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.kt
index 96b17584c39..447883291b5 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.kt
@@ -16,10 +16,10 @@ fun test() {
     FooBar()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo
 actual class Bar
 actual class Baz
-actual class FooBar
\ No newline at end of file
+actual class FooBar
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.fir.kt
index 615437435a7..38e62017325 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.fir.kt
@@ -11,7 +11,7 @@ expect class NoArgConstructor()
 expect fun foo3(): Int
 expect fun foo4(): Int
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.kt
index 2aa48bfe258..43dc7199adb 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.kt
@@ -11,7 +11,7 @@ expect class NoArgConstructor()
 expect fun foo3(): <!NO_ACTUAL_FOR_EXPECT{JVM}!>Int<!>
 expect fun foo4<!NO_ACTUAL_FOR_EXPECT{JVM}!>()<!>: Int
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.fir.kt
index d526eebfdb5..1e69f28d2b1 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.fir.kt
@@ -12,7 +12,7 @@ expect val s: String
 
 expect open class Foo3
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.kt
index d7fb8c12dfc..f3c614ceb61 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.kt
@@ -12,7 +12,7 @@ expect val s: String
 
 expect open class <!AMBIGUOUS_ACTUALS{JVM}, PACKAGE_OR_CLASSIFIER_REDECLARATION{JVM}!>Foo3<!>
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.kt
index 2ccaab051c7..ac0c92f4523 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.kt
@@ -12,7 +12,7 @@ expect class Bar {
     fun g()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual open class Foo(actual open val v: String) {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.fir.kt
index c2db2cca892..baf7482a770 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.fir.kt
@@ -16,7 +16,7 @@ expect class DerivedExplicitCheck : Base {
     override fun foo()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual abstract class Base {
@@ -33,4 +33,4 @@ actual class DerivedExplicit : Base() {
 
 actual class DerivedExplicitCheck : Base() {
     override fun foo() {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.kt
index b16a7251c1c..bc84bd1e6d9 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.kt
@@ -16,7 +16,7 @@ expect class DerivedExplicitCheck : Base {
     override fun foo()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual abstract class Base {
@@ -33,4 +33,4 @@ actual class DerivedExplicit : Base() {
 
 actual class DerivedExplicitCheck : Base() {
     override fun <!ACTUAL_MISSING!>foo<!>() {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.fir.kt
index fe29843bf5b..070add747cb 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.fir.kt
@@ -6,7 +6,7 @@ expect class H {
     expect fun foo()
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class H {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.kt
index d1844503c12..b09a6bba0ed 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.kt
@@ -6,7 +6,7 @@ expect class H {
     <!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> fun foo()
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class H {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/functionAndPropertyWithSameName.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/functionAndPropertyWithSameName.kt
index eae86ee516c..32e1bf555fd 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/functionAndPropertyWithSameName.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/functionAndPropertyWithSameName.kt
@@ -7,7 +7,7 @@ expect class Foo {
     val bar: String
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.fir.kt
index f732153f8c4..d98db4f6acc 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.fir.kt
@@ -14,7 +14,7 @@ expect interface C8<J>
 expect interface C9<K>
 expect interface C10<L>
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias C1 = String
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.kt
index a29e5ec526e..abaaffad912 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.kt
@@ -14,7 +14,7 @@ expect interface C8<J>
 expect interface C9<K>
 expect interface C10<L>
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias C1 = String
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassMember.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassMember.kt
index 411269dcc25..e0faa03d9a2 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassMember.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassMember.kt
@@ -8,7 +8,7 @@ expect class Foo {
     fun bar(x: Int): Int
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual class Foo {
     actual val foo: String = "JVM"
@@ -16,7 +16,7 @@ actual class Foo {
     actual fun bar(x: Int): Int = x + 1
 }
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 actual class Foo {
     actual val foo: String = "JS"
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.kt
index 58c7df6d49d..9fb24121517 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.kt
@@ -23,7 +23,7 @@ expect class Baz(w: List<String>) {
     override fun toString(): String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual data class Foo actual constructor(actual val x: Int, actual val y: String)
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/implOpenClass.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/implOpenClass.kt
index 419486408f4..bc940141af6 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/implOpenClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/implOpenClass.kt
@@ -9,7 +9,7 @@ expect fun getFoo(): Foo
 
 fun <T : Foo> bar() {} // no "Foo is final" warning should be here
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual open class Foo
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.fir.kt
index b81079ecae1..7e506fc49f5 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.fir.kt
@@ -14,7 +14,7 @@ expect class Foo3 {
     val x: String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.kt
index 71578189703..6a42bb20506 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.kt
@@ -14,7 +14,7 @@ expect class Foo3 {
     val x: String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.fir.kt
index 649d8c1888f..256d471e411 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.fir.kt
@@ -18,7 +18,7 @@ expect open class Container {
     open fun openPublicFun()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 
@@ -36,4 +36,4 @@ actual open class Container {
 
     actual open fun openInternalFun() {}    // BAD: internal+open -> public
     actual internal fun openPublicFun() {}  // BAD: open+public -> internal
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.kt
index d1447a8d6aa..081dffdf70d 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.kt
@@ -18,7 +18,7 @@ expect open class Container {
     open fun openPublicFun()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 
@@ -36,4 +36,4 @@ actual open class Container {
 
     actual open fun <!ACTUAL_WITHOUT_EXPECT!>openInternalFun<!>() {}    // BAD: internal+open -> public
     actual internal fun <!ACTUAL_WITHOUT_EXPECT!>openPublicFun<!>() {}  // BAD: open+public -> internal
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias.kt
index 16f31103a51..16fd92514a1 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias.kt
@@ -8,7 +8,7 @@ expect open class Container {
     internal fun internalFun()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: foo/Foo.java
 
@@ -20,4 +20,4 @@ public class Foo {
 
 // FILE: jvm.kt
 
-actual typealias Container = foo.Foo
\ No newline at end of file
+actual typealias Container = foo.Foo
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.fir.kt
index eb20620de6b..94cd85c57c2 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.fir.kt
@@ -37,7 +37,7 @@ expect object OuterObject {
     object NestedObject
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class OuterClass {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.kt
index aac3f3a7c05..9096ab4c073 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.kt
@@ -37,7 +37,7 @@ expect object OuterObject {
     object NestedObject
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class OuterClass {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.fir.kt
index 8f47be93d20..703eaa28ad0 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.fir.kt
@@ -23,7 +23,7 @@ expect class E {
     class N
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class B {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.kt
index 917ce026f49..361b626835e 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.kt
@@ -23,7 +23,7 @@ expect class E {
     class N
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class B {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.fir.kt
index b12c5d39467..00ae98397d9 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.fir.kt
@@ -6,7 +6,7 @@ expect class Foo {
     fun bar(): String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.kt
index d024554a27f..663d74465db 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.kt
@@ -6,7 +6,7 @@ expect class Foo {
     fun bar(): String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.fir.kt
index 2637cdcae26..751b6f104d4 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.fir.kt
@@ -10,7 +10,7 @@ expect class A {
     private class Nested
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class A {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.kt
index 0f18a6b5c41..1115732b734 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.kt
@@ -10,7 +10,7 @@ expect class A {
     <!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> class Nested
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class A {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/simpleHeaderClass.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/simpleHeaderClass.kt
index 8a40e9c3fa9..f47abc8d772 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/simpleHeaderClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/simpleHeaderClass.kt
@@ -4,10 +4,10 @@
 // FILE: common.kt
 expect class Foo
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual class Foo
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 actual class Foo
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.fir.kt
index 25dafe6fef2..585e6581411 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.fir.kt
@@ -10,13 +10,13 @@ expect class Foo : I, C, J
 
 expect class Bar : C()
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual class Foo : I, C(), J
 
 actual class Bar
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 actual class Foo : I, J, C()
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.kt
index bfacd7bbd9b..4c0c7eb586b 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.kt
@@ -10,13 +10,13 @@ expect class Foo : I, C, J
 
 expect class Bar : <!SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR, SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR{JVM}, SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR{JS}!>C<!SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS, SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS{JVM}, SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS{JS}!>()<!><!>
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual class Foo : I, C(), J
 
 actual class <!ACTUAL_WITHOUT_EXPECT!>Bar<!>
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 actual class Foo : I, J, C()
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.fir.kt
index f4158f8e9aa..9384de29443 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.fir.kt
@@ -6,5 +6,5 @@ class Foo {
     <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>expect fun bar(): String<!>
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.kt b/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.kt
index f90553efb51..8a0ec3293df 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.kt
@@ -6,5 +6,5 @@ class Foo {
     <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY, NON_ABSTRACT_FUNCTION_WITH_NO_BODY{JVM}!><!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> fun bar(): String<!>
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
diff --git a/compiler/testData/diagnostics/tests/multiplatform/implDelegatedMember.kt b/compiler/testData/diagnostics/tests/multiplatform/implDelegatedMember.kt
index 452adfc31d4..4fd830ec7fe 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/implDelegatedMember.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/implDelegatedMember.kt
@@ -7,7 +7,7 @@ expect open class Foo {
     open fun bar(): String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 interface Bar {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/implDynamic.kt b/compiler/testData/diagnostics/tests/multiplatform/implDynamic.kt
index c87f05840b1..895b81496ee 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/implDynamic.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/implDynamic.kt
@@ -14,7 +14,7 @@ expect class Foo {
     fun <T : Set<Number>> f3(t: T): T?
 }
 
-// MODULE: m2-js(m1-common)
+// MODULE: m2-js()()(m1-common)
 // FILE: js.kt
 
 // TODO: do not suppress UNSUPPORTED once JS files in multi-platform tests are analyzed with JS analyzer facade
diff --git a/compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.kt b/compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.kt
index 6cd5609ea02..90e673c50c4 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.kt
@@ -7,7 +7,7 @@ expect class Foo {
     fun bar(): String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 open class Bar {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.fir.kt
index 7372c763a97..32a95b1b683 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.fir.kt
@@ -14,7 +14,7 @@ expect class NonInlineExpect
 
 expect inline class NonInlineActual(val x: Int)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual inline class Foo1(val x: Int) {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.kt b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.kt
index 0fe15e75e3c..2dd69e286af 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.kt
@@ -14,7 +14,7 @@ expect class NonInlineExpect
 
 expect inline class NonInlineActual(val x: Int)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual inline class Foo1(val x: Int) {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.kt b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.kt
index 625a959438e..b1daf22e634 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.kt
@@ -10,7 +10,7 @@ annotation class JvmInline
 
 expect value class VC(val a: Any)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 package kotlin.jvm
diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.kt b/compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.kt
index 8889c224406..d6c6e43f37b 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.kt
@@ -13,7 +13,7 @@ expect class Foo {
     fun <T : Set<Number>> f3(t: T): T?
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: FooImpl.java
 
 import java.util.*;
diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.kt b/compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.kt
index 47fac8ffff7..ae231ddc9e3 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.kt
@@ -7,7 +7,7 @@ expect class Foo {
     fun foo(i: Int, d: Double, f: Float): Unit
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: FooImpl.java
 
 public class FooImpl {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.fir.kt
index c4145c624e8..9a064ec275d 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.fir.kt
@@ -18,7 +18,7 @@ fun testCommon() {
     f2(<!NAMED_ARGUMENTS_NOT_ALLOWED!>xxx<!> = 42)
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo actual constructor(val aaa: Boolean) {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt
index 67f01d593e8..37790ce62e4 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt
@@ -18,7 +18,7 @@ fun testCommon() {
     f2(xxx = 42)
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo actual constructor(val aaa: Boolean) {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.fir.kt
index 6b91b6b4321..98f3d8bce48 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.fir.kt
@@ -8,7 +8,7 @@
 
 private expect class Foo
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 private actual fun foo() {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.kt b/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.kt
index ab76e4ec653..dfbb729094f 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.kt
@@ -8,7 +8,7 @@
 
 <!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> expect class Foo
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 private actual fun foo() {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAlias.kt b/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAlias.kt
index aeb9f76e5f0..d0e5a6234e4 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAlias.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAlias.kt
@@ -8,7 +8,7 @@ expect sealed class Presence {
     object Offline: Presence
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias Presence = P
diff --git a/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAliasTopLevel.kt b/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAliasTopLevel.kt
index f13fb4f241c..49aca7a6bf7 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAliasTopLevel.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAliasTopLevel.kt
@@ -8,7 +8,7 @@ expect object Online: Presence
 expect object Offline: Presence
 
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias Presence = P
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callHeaderFun.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callHeaderFun.kt
index 0a4f73595a1..a1eb0132ddb 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callHeaderFun.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callHeaderFun.kt
@@ -7,7 +7,7 @@ expect fun foo(x: Int): Int
 
 fun callFromCommonCode(x: Int) = foo(x)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual fun foo(x: Int): Int {
@@ -16,7 +16,7 @@ actual fun foo(x: Int): Int {
 
 fun callFromJVM(x: Int) = foo(x)
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 
 actual fun foo(x: Int): Int {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.fir.kt
index 0c3024de2fb..7622bbd7d38 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.fir.kt
@@ -12,7 +12,7 @@ fun test() {
     g(::foo)
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 package test
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.kt
index 5c6282fba7f..694a66f1772 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.kt
@@ -12,7 +12,7 @@ fun test() {
     g(::<!DEPRECATION{JVM}!>foo<!>)
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 package test
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.fir.kt
index f7be9406549..54addebdd73 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.fir.kt
@@ -4,13 +4,13 @@
 
 expect fun foo()
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 <!CONFLICTING_OVERLOADS!>actual fun foo()<!> {}
 <!CONFLICTING_OVERLOADS!>actual fun foo()<!> {}
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 
 <!CONFLICTING_OVERLOADS!>actual fun foo()<!> {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.kt
index bef94de7134..73c017f9f80 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.kt
@@ -4,13 +4,13 @@
 
 expect fun <!AMBIGUOUS_ACTUALS{JVM}, AMBIGUOUS_ACTUALS{JS}!>foo<!>()
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 <!CONFLICTING_OVERLOADS!>actual fun foo()<!> {}
 <!CONFLICTING_OVERLOADS!>actual fun foo()<!> {}
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 
 <!CONFLICTING_OVERLOADS!>actual fun foo()<!> {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.kt
index f55d2eb22d3..fe5d17234b3 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.kt
@@ -10,7 +10,7 @@ expect fun inline()
 expect fun String.unaryMinus(): String
 expect fun String.and(other: String): String
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual external fun external()
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.fir.kt
index c091e129909..302141d41ed 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.fir.kt
@@ -5,13 +5,13 @@ package common
 
 expect fun foo()
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 package jvm
 
 actual fun foo() {}
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 package js
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.kt
index b475da2119c..2d239f97bd4 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.kt
@@ -5,13 +5,13 @@ package common
 
 expect fun <!NO_ACTUAL_FOR_EXPECT{JVM}, NO_ACTUAL_FOR_EXPECT{JS}!>foo<!>()
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 package jvm
 
 actual fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>() {}
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 package js
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.fir.kt
index dcf84740c0d..8638c4b1309 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.fir.kt
@@ -4,7 +4,7 @@
 
 expect fun foo()
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 <!NON_MEMBER_FUNCTION_NO_BODY!>actual fun foo()<!>
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.kt
index 2cc3a673721..933f763d04d 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.kt
@@ -4,7 +4,7 @@
 
 expect fun foo()
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 <!NON_MEMBER_FUNCTION_NO_BODY!>actual fun foo()<!>
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.fir.kt
index d398914f60c..7e18691d4b1 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.fir.kt
@@ -5,13 +5,13 @@
 inline expect fun inlineFun()
 expect fun nonInlineFun()
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual fun inlineFun() { }
 actual fun nonInlineFun() { }
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 
 actual inline fun inlineFun() { }
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.kt
index 9eb19a8cac7..59ffd1a6ff1 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.kt
@@ -5,13 +5,13 @@
 inline expect fun inlineFun()
 expect fun nonInlineFun()
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 <!ACTUAL_WITHOUT_EXPECT!>actual<!> fun inlineFun() { }
 actual fun nonInlineFun() { }
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 
 actual <!NOTHING_TO_INLINE!>inline<!> fun inlineFun() { }
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/simpleHeaderFun.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/simpleHeaderFun.kt
index 374c1241b7f..60c721ba7e3 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/simpleHeaderFun.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/simpleHeaderFun.kt
@@ -4,10 +4,10 @@
 // FILE: common.kt
 expect fun foo()
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual fun foo() {}
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 actual fun foo() {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.fir.kt
index b20033c7e33..3c7f861d418 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.fir.kt
@@ -14,7 +14,7 @@ expect inline fun f6(crossinline s: () -> String)
 expect fun f7(x: Any)
 expect fun f8(vararg x: Any)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual inline fun f1(noinline s: () -> String) {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.kt
index 4193e874d90..d002d0baea8 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.kt
@@ -14,7 +14,7 @@ expect inline fun f6(crossinline s: () -> String)
 expect fun f7<!NO_ACTUAL_FOR_EXPECT{JVM}!>(x: Any)<!>
 expect fun f8<!NO_ACTUAL_FOR_EXPECT{JVM}!>(vararg x: Any)<!>
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual inline fun f1(noinline s: () -> String) {}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/simpleHeaderVar.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/simpleHeaderVar.kt
index 573132d9dcb..442f5558d7e 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/simpleHeaderVar.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/simpleHeaderVar.kt
@@ -4,10 +4,10 @@
 // FILE: common.kt
 expect var foo: String
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual var foo: String = "JVM"
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 actual var foo: String = "JS"
diff --git a/compiler/testData/diagnostics/testsWithStdLib/multiplatform/jvmOverloads.kt b/compiler/testData/diagnostics/testsWithStdLib/multiplatform/jvmOverloads.kt
index 5500819238a..c8cd23b0410 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/multiplatform/jvmOverloads.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/multiplatform/jvmOverloads.kt
@@ -5,7 +5,7 @@
 
 expect fun foo(x: String, y: Int = -1)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 @JvmOverloads
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt
index bcedcf112a7..71adfcc9a0d 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt
@@ -187,7 +187,7 @@ class JvmBoxRunner(testServices: TestServices) : JvmBinaryArtifactHandler(testSe
             }
             result.addIfNotNull(testServices.compiledClassesManager.getCompiledJavaDirForModule(module))
 
-            for (dependency in module.dependencies + module.friends) {
+            for (dependency in module.allDependencies) {
                 if (dependency.kind == DependencyKind.Binary) {
                     computeClasspath(testServices.dependencyProvider.getTestModule(dependency.moduleName), false)
                 }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt
index 6df7cc09388..5c487ceafc5 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt
@@ -51,10 +51,7 @@ import org.jetbrains.kotlin.resolve.multiplatform.isCommonSource
 import org.jetbrains.kotlin.serialization.deserialization.MetadataPartProvider
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
-import org.jetbrains.kotlin.test.model.DependencyKind
-import org.jetbrains.kotlin.test.model.FrontendFacade
-import org.jetbrains.kotlin.test.model.FrontendKinds
-import org.jetbrains.kotlin.test.model.TestModule
+import org.jetbrains.kotlin.test.model.*
 import org.jetbrains.kotlin.test.services.*
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import org.jetbrains.kotlin.utils.addToStdlib.runIf
@@ -77,20 +74,24 @@ class ClassicFrontendFacade(
         val ktFilesMap = testServices.sourceFileProvider.getKtFilesForSourceFiles(module.files, project).toMutableMap()
         val languageVersionSettings = module.languageVersionSettings
 
-        val sourceDependencies = module.dependencies.filter { it.kind == DependencyKind.Source }
-        val dependentDescriptors = sourceDependencies.map {
+        val sourceDependencies = module.allDependencies.filter { it.kind == DependencyKind.Source }
+        val dependentDescriptors = sourceDependencies.mapNotNull {
             val testModule = dependencyProvider.getTestModule(it.moduleName)
+            if (testModule.targetPlatform.isCommon()) return@mapNotNull null
             moduleDescriptorProvider.getModuleDescriptor(testModule)
         }
 
-        val friendDescriptors = module.friends.filter { it.kind == DependencyKind.Source }.map {
+        val friendDescriptors = module.friendDependencies.filter { it.kind == DependencyKind.Source }.map {
             moduleDescriptorProvider.getModuleDescriptor(dependencyProvider.getTestModule(it.moduleName))
         }
 
         var hasCommonModules = false
-        sourceDependencies.forEach {
-            val dependencyModule = dependencyProvider.getTestModule(it.moduleName)
-            if (dependencyModule.targetPlatform.isCommon()) {
+
+        fun addDependsOnSources(dependencies: List<DependencyDescription>) {
+            if (dependencies.isEmpty()) return
+            hasCommonModules = true
+            for (dependency in dependencies) {
+                val dependencyModule = dependencyProvider.getTestModule(dependency.moduleName)
                 val artifact = dependencyProvider.getArtifact(dependencyModule, FrontendKinds.ClassicFrontend)
                 /*
                  * We need create KtFiles again with new project because otherwise we can access to some caches using
@@ -99,10 +100,12 @@ class ClassicFrontendFacade(
                 val ktFiles = testServices.sourceFileProvider.getKtFilesForSourceFiles(artifact.allKtFiles.keys, project)
                 ktFiles.values.forEach { ktFile -> ktFile.isCommonSource = true }
                 ktFilesMap.putAll(ktFiles)
-                hasCommonModules = true
+                addDependsOnSources(dependencyModule.dependsOnDependencies)
             }
         }
 
+        addDependsOnSources(module.dependsOnDependencies)
+
         val ktFiles = ktFilesMap.values.toList()
         setupJavacIfNeeded(module, ktFiles, configuration)
         val analysisResult = performResolve(
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt
index 99d5b2c94ea..17f19c04321 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt
@@ -84,8 +84,9 @@ class FirFrontendFacade(
 
                 friendDependencies(configuration[JVMConfigurationKeys.FRIEND_PATHS] ?: emptyList())
 
-                sourceDependencies(moduleInfoProvider.getDependentSourceModules(module))
+                sourceDependencies(moduleInfoProvider.getRegularDependentSourceModules(module))
                 sourceFriendsDependencies(moduleInfoProvider.getDependentFriendSourceModules(module))
+                sourceDependsOnDependencies(moduleInfoProvider.getDependentDependsOnSourceModules(module))
             },
             sessionConfigurator = {
                 if (FirDiagnosticsDirectives.WITH_EXTENDED_CHECKERS in module.directives) {
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirModuleInfoProvider.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirModuleInfoProvider.kt
index 00e3fb4f59c..a61f16145dc 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirModuleInfoProvider.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirModuleInfoProvider.kt
@@ -28,12 +28,16 @@ class FirModuleInfoProvider(private val testServices: TestServices) : TestServic
         return firModuleDataByModule[module] ?: error("module data for module $module is not registered")
     }
 
-    fun getDependentSourceModules(module: TestModule): List<FirModuleData> {
-        return getDependentModulesImpl(module.dependencies)
+    fun getRegularDependentSourceModules(module: TestModule): List<FirModuleData> {
+        return getDependentModulesImpl(module.regularDependencies)
     }
 
     fun getDependentFriendSourceModules(module: TestModule): List<FirModuleData> {
-        return getDependentModulesImpl(module.friends)
+        return getDependentModulesImpl(module.friendDependencies)
+    }
+
+    fun getDependentDependsOnSourceModules(module: TestModule): List<FirModuleData> {
+        return getDependentModulesImpl(module.dependsOnDependencies)
     }
 
     private fun getDependentModulesImpl(dependencies: List<DependencyDescription>): List<FirModuleData> {
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/ModuleTransformerForTwoFilesBoxTests.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/ModuleTransformerForTwoFilesBoxTests.kt
index 593fdc325b8..14e4c15bf23 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/ModuleTransformerForTwoFilesBoxTests.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/ModuleTransformerForTwoFilesBoxTests.kt
@@ -34,8 +34,7 @@ class ModuleTransformerForTwoFilesBoxTests : ModuleStructureTransformer() {
             module.frontendKind,
             module.binaryKind,
             files = listOf(first) + additionalFiles,
-            dependencies = emptyList(),
-            friends = emptyList(),
+            allDependencies = emptyList(),
             module.directives,
             module.languageVersionSettings
         )
@@ -47,8 +46,7 @@ class ModuleTransformerForTwoFilesBoxTests : ModuleStructureTransformer() {
             module.frontendKind,
             module.binaryKind,
             files = listOf(second) + additionalFiles,
-            dependencies = emptyList(),
-            friends = listOf(DependencyDescription("lib", DependencyKind.Binary, DependencyRelation.Dependency)),
+            allDependencies = listOf(DependencyDescription("lib", DependencyKind.Binary, DependencyRelation.FriendDependency)),
             module.directives,
             module.languageVersionSettings
         )
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
index b7c0f841b1e..b8352a1a628 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
@@ -275,7 +275,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
         module: TestModule,
         bySources: Boolean
     ) {
-        val moduleDependencies = module.dependencies.map { testServices.dependencyProvider.getTestModule(it.moduleName) }
+        val moduleDependencies = module.allDependencies.map { testServices.dependencyProvider.getTestModule(it.moduleName) }
         val filterJavaModuleInfoFiles = { testFile: TestFile ->
             val binaryFilesFilter = INCLUDE_JAVA_AS_BINARY in testFile.directives || ALL_JAVA_AS_BINARY in module.directives
             val includeOrExcludeBinaryFilesFilter = (bySources && !binaryFilesFilter) || (!bySources && binaryFilesFilter)
@@ -350,7 +350,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
 
     private fun CompilerConfiguration.registerModuleDependencies(module: TestModule) {
         val dependencyProvider = testServices.dependencyProvider
-        val modulesFromDependencies = module.dependencies
+        val modulesFromDependencies = module.allDependencies
             .filter { it.kind == DependencyKind.Binary }
             .map { dependencyProvider.getTestModule(it.moduleName) }
             .takeIf { it.isNotEmpty() }
@@ -365,8 +365,8 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
         module: TestModule,
         configuration: CompilerConfiguration,
     ) {
-        val binaryDependencies = module.dependencies.filter { it.kind == DependencyKind.Binary }
-        val binaryFriends = module.friends.filter { it.kind == DependencyKind.Binary }
+        val binaryDependencies = module.allDependencies.filter { it.kind == DependencyKind.Binary }
+        val binaryFriends = module.friendDependencies.filter { it.kind == DependencyKind.Binary }
         val dependencyProvider = testServices.dependencyProvider
         val compiledClassesManager = testServices.compiledClassesManager
         val compilerConfigurationProvider = testServices.compilerConfigurationProvider
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt
index d421045801b..6b9043ed8ef 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt
@@ -49,9 +49,9 @@ class ModuleStructureExtractorImpl(
         /*
          * ([\w-]+) module name
          * \((.*?)\) module dependencies
-         * (\((.*?)\))? module friends
+         * (\((.*?)\)(\((.*?)\))?)? module friendDependencies and dependsOnDependencies
          */
-        private val moduleDirectiveRegex = """([\w-]+)(\((.*?)\)(\((.*?)\))?)?""".toRegex()
+        private val moduleDirectiveRegex = """([\w-]+)(\((.*?)\)(\((.*?)\)(\((.*?)\))?)?)?""".toRegex()
     }
 
     override fun splitTestDataByModules(
@@ -95,7 +95,6 @@ class ModuleStructureExtractorImpl(
         private var currentModuleTargetBackend: TargetBackend? = null
         private var currentModuleLanguageVersionSettingsBuilder: LanguageVersionSettingsBuilder = initLanguageSettingsBuilder()
         private var dependenciesOfCurrentModule = mutableListOf<DependencyDescription>()
-        private var friendsOfCurrentModule = mutableListOf<DependencyDescription>()
         private var filesOfCurrentModule = mutableListOf<TestFile>()
 
         private var currentFileName: String? = null
@@ -138,7 +137,7 @@ class ModuleStructureExtractorImpl(
                 modules.singleOrNull() ?: error("Duplicated modules with name $name")
             }
             return DFS.topologicalOrder(modules) { module ->
-                module.dependencies.map {
+                module.allDependencies.map {
                     val moduleName = it.moduleName
                     moduleByName[moduleName] ?: error("Module \"$moduleName\" not found while observing dependencies of \"${module.name}\"")
                 }
@@ -150,7 +149,7 @@ class ModuleStructureExtractorImpl(
             for (module in modules) {
                 val moduleName = module.name
                 visited.add(moduleName)
-                for (dependency in module.dependencies) {
+                for (dependency in module.allDependencies) {
                     val dependencyName = dependency.moduleName
                     if (dependencyName == moduleName) {
                         error("Module $moduleName has dependency to itself")
@@ -178,19 +177,17 @@ class ModuleStructureExtractorImpl(
                     } else {
                         finishGlobalDirectives()
                     }
-                    val (moduleName, dependencies, friends) = splitRawModuleStringToNameAndDependencies(values.joinToString(separator = " "))
+                    val (moduleName, dependencies, friends, dependsOn) = splitRawModuleStringToNameAndDependencies(values.joinToString(separator = " "))
                     currentModuleName = moduleName
+                    val kind = defaultsProvider.defaultDependencyKind
                     dependencies.mapTo(dependenciesOfCurrentModule) { name ->
-                        val dependentModule = modules.firstOrNull { it.name == name }
-                        if (dependentModule?.targetPlatform.isCommon()) {
-                            return@mapTo DependencyDescription(name, DependencyKind.Source, DependencyRelation.DependsOn)
-                        }
-                        val kind = defaultsProvider.defaultDependencyKind
-                        DependencyDescription(name, kind, DependencyRelation.Dependency)
+                        DependencyDescription(name, kind, DependencyRelation.RegularDependency)
                     }
-                    friends.mapTo(friendsOfCurrentModule) { name ->
-                        val kind = defaultsProvider.defaultDependencyKind
-                        DependencyDescription(name, kind, DependencyRelation.Dependency)
+                    friends.mapTo(dependenciesOfCurrentModule) { name ->
+                        DependencyDescription(name, kind, DependencyRelation.FriendDependency)
+                    }
+                    dependsOn.mapTo(dependenciesOfCurrentModule) { name ->
+                        DependencyDescription(name, DependencyKind.Source, DependencyRelation.DependsOnDependency)
                     }
                 }
                 ModuleStructureDirectives.DEPENDENCY,
@@ -198,8 +195,8 @@ class ModuleStructureExtractorImpl(
                     val name = values.first() as String
                     val kind = values.getOrNull(1)?.let { valueOfOrNull(it as String) } ?: defaultsProvider.defaultDependencyKind
                     val relation = when (directive) {
-                        ModuleStructureDirectives.DEPENDENCY -> DependencyRelation.Dependency
-                        ModuleStructureDirectives.DEPENDS_ON -> DependencyRelation.DependsOn
+                        ModuleStructureDirectives.DEPENDENCY -> DependencyRelation.RegularDependency
+                        ModuleStructureDirectives.DEPENDS_ON -> DependencyRelation.DependsOnDependency
                         else -> error("Should not be here")
                     }
                     dependenciesOfCurrentModule.add(DependencyDescription(name, kind, relation))
@@ -232,7 +229,7 @@ class ModuleStructureExtractorImpl(
         private fun splitRawModuleStringToNameAndDependencies(moduleDirectiveString: String): ModuleNameAndDependencies {
             val matchResult = moduleDirectiveRegex.matchEntire(moduleDirectiveString)
                 ?: error("\"$moduleDirectiveString\" doesn't matches with pattern \"moduleName(dep1, dep2)\"")
-            val (name, _, dependencies, _, friends) = matchResult.destructured
+            val (name, _, dependencies, _, friends, _, dependsOn) = matchResult.destructured
             var dependenciesNames = dependencies.takeIf { it.isNotBlank() }?.split(" ") ?: emptyList()
             globalDirectives?.let { directives ->
                 /*
@@ -248,6 +245,7 @@ class ModuleStructureExtractorImpl(
                 name,
                 dependenciesNames,
                 friends.takeIf { it.isNotBlank() }?.split(" ") ?: emptyList(),
+                dependsOn.takeIf { it.isNotBlank() }?.split(" ") ?: emptyList(),
             )
         }
 
@@ -295,8 +293,7 @@ class ModuleStructureExtractorImpl(
                 frontendKind = currentModuleFrontendKind ?: defaultsProvider.defaultFrontend,
                 binaryKind = defaultsProvider.defaultArtifactKind ?: targetPlatform.toArtifactKind(),
                 files = filesOfCurrentModule,
-                dependencies = dependenciesOfCurrentModule,
-                friends = friendsOfCurrentModule,
+                allDependencies = dependenciesOfCurrentModule,
                 directives = moduleDirectives,
                 languageVersionSettings = currentModuleLanguageVersionSettingsBuilder.build()
             )
@@ -371,7 +368,6 @@ class ModuleStructureExtractorImpl(
             currentModuleLanguageVersionSettingsBuilder = initLanguageSettingsBuilder()
             filesOfCurrentModule = mutableListOf()
             dependenciesOfCurrentModule = mutableListOf()
-            friendsOfCurrentModule = mutableListOf()
             resetDirectivesBuilder()
             moduleDirectivesBuilder = directivesBuilder
         }
@@ -414,7 +410,8 @@ class ModuleStructureExtractorImpl(
     private data class ModuleNameAndDependencies(
         val name: String,
         val dependencies: List<String>,
-        val friends: List<String>
+        val friends: List<String>,
+        val dependsOn: List<String>
     )
 }
 
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/TestModuleStructureImpl.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/TestModuleStructureImpl.kt
index 5c2e74baf4e..e6ce6c7f8d7 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/TestModuleStructureImpl.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/TestModuleStructureImpl.kt
@@ -28,7 +28,7 @@ class TestModuleStructureImpl(
     private val targetArtifactsByModule: Map<String, List<BinaryKind<*>>> = buildMap {
         for (module in modules) {
             val result = mutableListOf<BinaryKind<*>>()
-            for (dependency in module.dependencies) {
+            for (dependency in module.allDependencies) {
                 if (dependency.kind == DependencyKind.KLib) {
                     result += ArtifactKinds.KLib
                 }