From 0040298eac5ab7cc2948f837b7c6c9f1b61ec699 Mon Sep 17 00:00:00 2001
From: Roman Artemev <roman.artemev@jetbrains.com>
Date: Wed, 4 Sep 2019 13:46:11 +0300
Subject: [PATCH] Fix master  - improve assertion message  - compare correct
 file paths  - fix C JS BE testData

---
 .../src/org/jetbrains/kotlin/ir/backend/js/klib.kt     | 10 +++++++---
 .../testData/box/multiModule/clashedDeclLinkage.kt     |  1 +
 .../box/multiModule/clashedInternalDeclarations.kt     |  1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt
index fe80af135fd..45b140e46d2 100644
--- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt
+++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt
@@ -379,14 +379,18 @@ fun serializeModuleIntoKlib(
     val additionalFiles = mutableListOf<KotlinFileSerializedData>()
 
     for ((ktFile, binaryFile) in files.zip(serializedIr.files)) {
-        val ioFile = VfsUtilCore.virtualToIoFile(ktFile.virtualFile)
-        assert(ioFile.path == binaryFile.path) { "The Kt and Ir files are put in different order" }
+        assert(ktFile.virtualFilePath == binaryFile.path) {
+            """The Kt and Ir files are put in different order
+                Kt: ${ktFile.virtualFilePath}
+                Ir: ${binaryFile.path}
+            """.trimMargin()
+        }
         val memberScope = ktFile.declarations.map { getDescriptorForElement(bindingContext, it) }
         val packageFragment = serializeScope(ktFile.packageFqName, memberScope)
         val compiledKotlinFile = KotlinFileSerializedData(packageFragment, binaryFile)
 
         additionalFiles += compiledKotlinFile
-        processCompiledFileData(ioFile, compiledKotlinFile)
+        processCompiledFileData(VfsUtilCore.virtualToIoFile(ktFile.virtualFile), compiledKotlinFile)
     }
 
     incrementalResultsConsumer?.run {
diff --git a/js/js.translator/testData/box/multiModule/clashedDeclLinkage.kt b/js/js.translator/testData/box/multiModule/clashedDeclLinkage.kt
index bc37ad7d2dc..8faf0108684 100644
--- a/js/js.translator/testData/box/multiModule/clashedDeclLinkage.kt
+++ b/js/js.translator/testData/box/multiModule/clashedDeclLinkage.kt
@@ -1,3 +1,4 @@
+// EXPECTED_REACHABLE_NODES: 1283
 // KJS_WITH_FULL_RUNTIME
 
 // MODULE: AT
diff --git a/js/js.translator/testData/box/multiModule/clashedInternalDeclarations.kt b/js/js.translator/testData/box/multiModule/clashedInternalDeclarations.kt
index 02157e973ec..e3b25d57f15 100644
--- a/js/js.translator/testData/box/multiModule/clashedInternalDeclarations.kt
+++ b/js/js.translator/testData/box/multiModule/clashedInternalDeclarations.kt
@@ -1,3 +1,4 @@
+// EXPECTED_REACHABLE_NODES: 1284
 // KJS_WITH_FULL_RUNTIME
 
 // MODULE: AT