From 57e75a1b28d10b61e996e9063f2e7e961c5d07b5 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 27 Nov 2015 15:53:13 +0300
Subject: [PATCH] Drop deprecated code in ModuleMapping, add TODO

---
 .../jetbrains/kotlin/load/kotlin/ModuleMapping.kt  | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
index 65fe0e55676..2721e4563be 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
@@ -41,16 +41,9 @@ public class ModuleMapping private constructor(val packageFqName2Parts: Map<Stri
             val inputStream = DataInputStream(ByteArrayInputStream(proto))
             val size = inputStream.readInt()
 
-            val abiVersion =
-                    if (size == 1) {
-                        // TODO: this is a temporary workaround, drop after M13
-                        BinaryVersion.create(0, inputStream.readInt(), 0)
-                    }
-                    else {
-                        BinaryVersion.create((0..size - 1).map { inputStream.readInt() }.toIntArray())
-                    }
+            val version = BinaryVersion.create((0..size - 1).map { inputStream.readInt() }.toIntArray())
 
-            if (AbiVersionUtil.isAbiVersionCompatible(abiVersion)) {
+            if (AbiVersionUtil.isAbiVersionCompatible(version)) {
                 val parseFrom = JvmPackageTable.PackageTable.parseFrom(inputStream)
                 if (parseFrom != null) {
                     val packageFqNameParts = hashMapOf<String, PackageParts>()
@@ -64,6 +57,9 @@ public class ModuleMapping private constructor(val packageFqName2Parts: Map<Stri
                     return ModuleMapping(packageFqNameParts)
                 }
             }
+            else {
+                // TODO: consider reporting "incompatible ABI version" error for package parts
+            }
 
             return EMPTY
         }