Simplify presence check

Author: Mr3zee

protobuf/protobuf-core/src/commonMain/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Api.kt

@@ -39,11 +39,12 @@ public class ApiInternal: com.google.protobuf.kotlin.Api, kotlinx.rpc.protobuf.i
         if (other == null || this::class != other::class) return false
         other as ApiInternal
         other.checkRequiredFields()
+        if (presenceMask != other.presenceMask) return false
         if (name != other.name) return false
         if (methods != other.methods) return false
         if (options != other.options) return false
         if (version != other.version) return false
-        if (presenceMask[0] != other.presenceMask[0] || presenceMask[0] && sourceContext != other.sourceContext) return false
+        if (presenceMask[0] && sourceContext != other.sourceContext) return false
         if (mixins != other.mixins) return false
         if (syntax != other.syntax) return false
         return true

protobuf/protobuf-core/src/commonMain/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Struct.kt

@@ -65,8 +65,9 @@ public class StructInternal: com.google.protobuf.kotlin.Struct, kotlinx.rpc.prot
             if (other == null || this::class != other::class) return false
             other as FieldsEntryInternal
             other.checkRequiredFields()
+            if (presenceMask != other.presenceMask) return false
             if (key != other.key) return false
-            if (presenceMask[0] != other.presenceMask[0] || presenceMask[0] && value != other.value) return false
+            if (presenceMask[0] && value != other.value) return false
             return true
         }
 

protobuf/protobuf-core/src/commonMain/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Type.kt

@@ -39,11 +39,12 @@ public class TypeInternal: com.google.protobuf.kotlin.Type, kotlinx.rpc.protobuf
         if (other == null || this::class != other::class) return false
         other as TypeInternal
         other.checkRequiredFields()
+        if (presenceMask != other.presenceMask) return false
         if (name != other.name) return false
         if (fields != other.fields) return false
         if (oneofs != other.oneofs) return false
         if (options != other.options) return false
-        if (presenceMask[0] != other.presenceMask[0] || presenceMask[0] && sourceContext != other.sourceContext) return false
+        if (presenceMask[0] && sourceContext != other.sourceContext) return false
         if (syntax != other.syntax) return false
         if (edition != other.edition) return false
         return true
@@ -236,10 +237,11 @@ public class EnumInternal: com.google.protobuf.kotlin.Enum, kotlinx.rpc.protobuf
         if (other == null || this::class != other::class) return false
         other as EnumInternal
         other.checkRequiredFields()
+        if (presenceMask != other.presenceMask) return false
         if (name != other.name) return false
         if (enumvalue != other.enumvalue) return false
         if (options != other.options) return false
-        if (presenceMask[0] != other.presenceMask[0] || presenceMask[0] && sourceContext != other.sourceContext) return false
+        if (presenceMask[0] && sourceContext != other.sourceContext) return false
         if (syntax != other.syntax) return false
         if (edition != other.edition) return false
         return true
@@ -395,8 +397,9 @@ public class OptionInternal: com.google.protobuf.kotlin.Option, kotlinx.rpc.prot
         if (other == null || this::class != other::class) return false
         other as OptionInternal
         other.checkRequiredFields()
+        if (presenceMask != other.presenceMask) return false
         if (name != other.name) return false
-        if (presenceMask[0] != other.presenceMask[0] || presenceMask[0] && value != other.value) return false
+        if (presenceMask[0] && value != other.value) return false
         return true
     }
 

protobuf/protobuf-core/src/commonMain/kotlin/kotlinx/rpc/protobuf/internal/BitSet.kt

@@ -66,4 +66,22 @@ public class BitSet(public val size: Int) {
         }
         return true
     }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || this::class != other::class) return false
+
+        other as BitSet
+
+        if (size != other.size) return false
+        if (!data.contentEquals(other.data)) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = size
+        result = 31 * result + data.contentHashCode()
+        return result
+    }
 }

protoc-gen/protobuf/src/main/kotlin/kotlinx/rpc/protoc/gen/ModelToProtobufKotlinCommonGenerator.kt

@@ -285,11 +285,14 @@ class ModelToProtobufKotlinCommonGenerator(
             addLine("if (other == null || this::class != other::class) return false")
             addLine("other as ${declaration.internalClassName()}")
             addLine("other.checkRequiredFields()")
+            if (declaration.presenceMaskSize != 0) {
+                addLine("if (presenceMask != other.presenceMask) return false")
+            }
             if (fields.isNotEmpty()) {
                 fields.forEach { field ->
                     if (field.presenceIdx != null) {
                         fieldEqualsCheck(
-                            presenceCheck = "presenceMask[${field.presenceIdx}] != other.presenceMask[${field.presenceIdx}] || presenceMask[${field.presenceIdx}] && ",
+                            presenceCheck = "presenceMask[${field.presenceIdx}] && ",
                             field = field,
                         )
                     } else {

tests/protobuf-conformance/src/main/generated-code/kotlin-multiplatform/com/google/protobuf/conformance/_rpc_internal/Conformance.kt

@@ -185,10 +185,11 @@ class ConformanceRequestInternal: com.google.protobuf.conformance.ConformanceReq
         if (other == null || this::class != other::class) return false
         other as ConformanceRequestInternal
         other.checkRequiredFields()
+        if (presenceMask != other.presenceMask) return false
         if (requestedOutputFormat != other.requestedOutputFormat) return false
         if (messageType != other.messageType) return false
         if (testCategory != other.testCategory) return false
-        if (presenceMask[0] != other.presenceMask[0] || presenceMask[0] && jspbEncodingOptions != other.jspbEncodingOptions) return false
+        if (presenceMask[0] && jspbEncodingOptions != other.jspbEncodingOptions) return false
         if (printUnknownFields != other.printUnknownFields) return false
         if (payload != other.payload) return false
         return true