Fix master

- improve assertion message
 - compare correct file paths
 - fix C JS BE testData

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 {

js/js.translator/testData/box/multiModule/clashedDeclLinkage.kt

@@ -1,3 +1,4 @@
+// EXPECTED_REACHABLE_NODES: 1283
 // KJS_WITH_FULL_RUNTIME
 
 // MODULE: AT

js/js.translator/testData/box/multiModule/clashedInternalDeclarations.kt

@@ -1,3 +1,4 @@
+// EXPECTED_REACHABLE_NODES: 1284
 // KJS_WITH_FULL_RUNTIME
 
 // MODULE: AT