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 1768649095e..4a3907764d2 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 @@ -198,6 +198,11 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR if (old.flags != new.flags) return false } + if (old.hasNewFlags() != new.hasNewFlags()) return false + if (old.hasNewFlags()) { + if (old.newFlags != new.newFlags) return false + } + if (!checkStringEquals(old.name, new.name)) return false if (old.hasReturnType() != new.hasReturnType()) return false @@ -243,6 +248,11 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR if (old.flags != new.flags) return false } + if (old.hasNewFlags() != new.hasNewFlags()) return false + if (old.hasNewFlags()) { + if (old.newFlags != new.newFlags) return false + } + if (!checkStringEquals(old.name, new.name)) return false if (old.hasReturnType() != new.hasReturnType()) return false @@ -900,6 +910,10 @@ fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) hashCode = 31 * hashCode + flags } + if (hasNewFlags()) { + hashCode = 31 * hashCode + newFlags + } + hashCode = 31 * hashCode + stringIndexes(name) if (hasReturnType()) { @@ -944,6 +958,10 @@ fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) hashCode = 31 * hashCode + flags } + if (hasNewFlags()) { + hashCode = 31 * hashCode + newFlags + } + hashCode = 31 * hashCode + stringIndexes(name) if (hasReturnType()) {