From 1227f8ad55bae31b622fabdfd5b5851dcf42e3dc Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 24 Dec 2015 03:13:52 +0300 Subject: [PATCH] Drop 'index' JVM binary format extension Compute the JVM parameer index manually instead Original commit: 39c10867a0df528e55c34866cea061b27f27fc46 --- .../kotlin/jps/incremental/ProtoCompareGenerated.kt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 81ea446d258..9dd6ea9ef24 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -430,11 +430,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.varargElementTypeId != new.varargElementTypeId) return false } - if (old.hasExtension(JvmProtoBuf.index) != new.hasExtension(JvmProtoBuf.index)) return false - if (old.hasExtension(JvmProtoBuf.index)) { - if (old.getExtension(JvmProtoBuf.index) != new.getExtension(JvmProtoBuf.index)) return false - } - return true } @@ -1123,10 +1118,6 @@ public fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameI hashCode = 31 * hashCode + varargElementTypeId } - if (hasExtension(JvmProtoBuf.index)) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.index) - } - return hashCode }