azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't write field signatures when not necessary

Browse Source 
Original commit: 934ffed944
This commit is contained in:
Alexander Udalov
2015-10-07 19:42:35 +03:00
parent 66961715dd
commit cfad31bba1
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
+14 -4
View File
@@ -390,9 +390,15 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
} }
open fun checkEquals(old: JvmProtoBuf.JvmFieldSignature, new: JvmProtoBuf.JvmFieldSignature): Boolean { open fun checkEquals(old: JvmProtoBuf.JvmFieldSignature, new: JvmProtoBuf.JvmFieldSignature): Boolean {
if (!checkStringEquals(old.name, new.name)) return false if (old.hasName() != new.hasName()) return false
if (old.hasName()) {
if (!checkStringEquals(old.name, new.name)) return false
}
if (!checkStringEquals(old.desc, new.desc)) return false if (old.hasDesc() != new.hasDesc()) return false
if (old.hasDesc()) {
if (!checkStringEquals(old.desc, new.desc)) return false
}
if (old.hasIsStaticInOuter() != new.hasIsStaticInOuter()) return false if (old.hasIsStaticInOuter() != new.hasIsStaticInOuter()) return false
if (old.hasIsStaticInOuter()) { if (old.hasIsStaticInOuter()) {
@@ -962,9 +968,13 @@ public fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: (Int) -> Int, fq
public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
var hashCode = 1 var hashCode = 1
hashCode = 31 * hashCode + stringIndexes(name) if (hasName()) {
hashCode = 31 * hashCode + stringIndexes(name)
}
hashCode = 31 * hashCode + stringIndexes(desc) if (hasDesc()) {
hashCode = 31 * hashCode + stringIndexes(desc)
}
if (hasIsStaticInOuter()) { if (hasIsStaticInOuter()) {
hashCode = 31 * hashCode + isStaticInOuter.hashCode() hashCode = 31 * hashCode + isStaticInOuter.hashCode()