From da67ebb1e23d66ace1a6fd00c558bb985478dd58 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 23 Dec 2015 23:22:55 +0300 Subject: [PATCH] Drop old JVM binary format extensions: static in outer, impl class name Original commit: dc6a1762828bea945727dc3758f8de32ecb9a175 --- .../jps/incremental/ProtoCompareGenerated.kt | 27 ------------------- 1 file changed, 27 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 ac285dc6624..81ea446d258 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 @@ -212,11 +212,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEquals(old.getExtension(JvmProtoBuf.methodSignature), new.getExtension(JvmProtoBuf.methodSignature))) return false } - if (old.hasExtension(JvmProtoBuf.methodImplClassName) != new.hasExtension(JvmProtoBuf.methodImplClassName)) return false - if (old.hasExtension(JvmProtoBuf.methodImplClassName)) { - if (!checkStringEquals(old.getExtension(JvmProtoBuf.methodImplClassName), new.getExtension(JvmProtoBuf.methodImplClassName))) return false - } - return true } @@ -270,11 +265,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEquals(old.getExtension(JvmProtoBuf.propertySignature), new.getExtension(JvmProtoBuf.propertySignature))) return false } - if (old.hasExtension(JvmProtoBuf.propertyImplClassName) != new.hasExtension(JvmProtoBuf.propertyImplClassName)) return false - if (old.hasExtension(JvmProtoBuf.propertyImplClassName)) { - if (!checkStringEquals(old.getExtension(JvmProtoBuf.propertyImplClassName), new.getExtension(JvmProtoBuf.propertyImplClassName))) return false - } - return true } @@ -524,11 +514,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkStringEquals(old.desc, new.desc)) return false } - if (old.hasIsStaticInOuter() != new.hasIsStaticInOuter()) return false - if (old.hasIsStaticInOuter()) { - if (old.isStaticInOuter != new.isStaticInOuter) return false - } - return true } @@ -924,10 +909,6 @@ public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes hashCode = 31 * hashCode + getExtension(JvmProtoBuf.methodSignature).hashCode(stringIndexes, fqNameIndexes) } - if (hasExtension(JvmProtoBuf.methodImplClassName)) { - hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.methodImplClassName)) - } - return hashCode } @@ -976,10 +957,6 @@ public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes hashCode = 31 * hashCode + getExtension(JvmProtoBuf.propertySignature).hashCode(stringIndexes, fqNameIndexes) } - if (hasExtension(JvmProtoBuf.propertyImplClassName)) { - hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.propertyImplClassName)) - } - return hashCode } @@ -1228,10 +1205,6 @@ public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, f hashCode = 31 * hashCode + stringIndexes(desc) } - if (hasIsStaticInOuter()) { - hashCode = 31 * hashCode + isStaticInOuter.hashCode() - } - return hashCode }