From 70423e8129645cc75393953ceb44021649f0a681 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Tue, 27 Dec 2016 00:39:27 +0300
Subject: [PATCH] KJS: remove obsolete classIndex

---
 .../js/coroutine/CoroutineFunctionTransformer.kt      |  2 --
 js/js.libraries/src/js/callableReferenceUtils.js      |  1 -
 js/js.libraries/src/js/rtti.js                        | 11 -----------
 .../js/translate/declaration/ClassTranslator.kt       |  2 --
 4 files changed, 16 deletions(-)

diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineFunctionTransformer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineFunctionTransformer.kt
index 294712e8065..0f583c464a8 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineFunctionTransformer.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineFunctionTransformer.kt
@@ -121,8 +121,6 @@ class CoroutineFunctionTransformer(private val program: JsProgram, private val f
         val metadataObject = JsObjectLiteral(true)
         metadataObject.propertyInitializers += JsPropertyInitializer(
                 JsNameRef("type"), JsNameRef("CLASS", JsNameRef("TYPE", Namer.KOTLIN_NAME)))
-        metadataObject.propertyInitializers += JsPropertyInitializer(
-                JsNameRef("classIndex"), JsInvocation(JsNameRef("newClassIndex", Namer.KOTLIN_NAME)))
         metadataObject.propertyInitializers += JsPropertyInitializer(JsNameRef("simpleName"), JsLiteral.NULL)
         metadataObject.propertyInitializers += JsPropertyInitializer(JsNameRef("baseClasses"), JsArrayLiteral(listOf(baseClassRefRef)))
 
diff --git a/js/js.libraries/src/js/callableReferenceUtils.js b/js/js.libraries/src/js/callableReferenceUtils.js
index 0c9ffe3137c..c7096a7179f 100644
--- a/js/js.libraries/src/js/callableReferenceUtils.js
+++ b/js/js.libraries/src/js/callableReferenceUtils.js
@@ -133,7 +133,6 @@ function getPropertyRefMetadata(cache) {
         cache.value = {
             baseClasses: [cache.implementedInterface()],
             baseClass: null,
-            classIndex: Kotlin.newClassIndex(),
             functions: {},
             properties: {},
             types: {},
diff --git a/js/js.libraries/src/js/rtti.js b/js/js.libraries/src/js/rtti.js
index 060d7db2389..fd071d41c4e 100644
--- a/js/js.libraries/src/js/rtti.js
+++ b/js/js.libraries/src/js/rtti.js
@@ -20,13 +20,6 @@ Kotlin.TYPE = {
     OBJECT: "object"
 };
 
-Kotlin.classCount = 0;
-Kotlin.newClassIndex = function () {
-    var tmp = Kotlin.classCount;
-    Kotlin.classCount++;
-    return tmp;
-};
-
 Kotlin.callGetter = function (thisObject, klass, propertyName) {
     var propertyDescriptor = Object.getOwnPropertyDescriptor(klass, propertyName);
     if (propertyDescriptor != null) {
@@ -60,10 +53,6 @@ Kotlin.callSetter = function (thisObject, klass, propertyName, value) {
 };
 
 function isInheritanceFromInterface(metadata, iface) {
-    // TODO: return this optimization
-    /*if (metadata == null || metadata.classIndex < iface.$metadata$.classIndex) {
-        return false;
-    }*/
     var baseClasses = metadata.baseClasses;
     var i;
     for (i = 0; i < baseClasses.length; i++) {
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
index b0bf6b1e19f..9c65724bad0 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
@@ -177,10 +177,8 @@ class ClassTranslator private constructor(
             DescriptorUtils.isObject(descriptor) -> JsNameRef("OBJECT", kotlinType)
             else -> JsNameRef("CLASS", kotlinType)
         }
-        val typeIndex = JsInvocation(JsNameRef("newClassIndex", Namer.KOTLIN_NAME))
 
         metadataLiteral.propertyInitializers += JsPropertyInitializer(JsNameRef("type"), typeRef)
-        metadataLiteral.propertyInitializers += JsPropertyInitializer(JsNameRef("classIndex"), typeIndex)
 
         val simpleName = descriptor.name
         if (!simpleName.isSpecial) {