google-protobuf 4.27.1-x86_64-linux → 4.27.2-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92e48b349b25f2dbdf3a212a64417124369e8f19dc213be105e3304aaf0277f1
-  data.tar.gz: f5441cb1a623d8ff6be1e86027919a4ead67d2fe3f4353ad7bea14b24c0af6cf
+  metadata.gz: 6d8b37e2992edee9413754b370f65f4ce628ccea23d9313a02843619457453bd
+  data.tar.gz: b5deddf213464294252382ea2e5996011bf8508e1401eb1262f6e8afe6443d2c
 SHA512:
-  metadata.gz: cddafd8a311c05aa1d2948d24b19995acfa0547e21f4cd47640045600acb544ddcb6953df2810f49384c3f926f2430b1c694b2e7e28d990f76077b4f7f552a2b
-  data.tar.gz: 0165230a45c475dfa5e68a400ad10a8ea3071e68ccc4a3c43a33ea21922a088d84c446a09660485f265e2560b16f62f22cec076a0ae298063f6c5894ed0e0cd5
+  metadata.gz: 0ec19237a5ac620bbebb46afef0eae730e3ffd329edba5e8fc52e5272dbeedb94da5228638530f17d28f73ae087df9baf6bcc9f203c21d0498791e3687606435
+  data.tar.gz: 6262c212f34b21b17440ef00a4c205f0b0bdc1f0e0432fac7a769bb1d4bbcb4dad6e54b3cee2ded909089fce13351477f5aabef31e4c6b3f1d85b8165c3868bc

data/ext/google/protobuf_c/ruby-upb.c

@@ -13212,8 +13212,7 @@ bool _upb_FieldDef_ValidateUtf8(const upb_FieldDef* f) {
 
 bool _upb_FieldDef_IsGroupLike(const upb_FieldDef* f) {
   // Groups are always tag-delimited.
-  if (UPB_DESC(FeatureSet_message_encoding)(upb_FieldDef_ResolvedFeatures(f)) !=
-      UPB_DESC(FeatureSet_DELIMITED)) {
+  if (f->type_ != kUpb_FieldType_Group) {
     return false;
   }
 
@@ -13647,12 +13646,6 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix,
       UPB_DESC(FieldDescriptorProto_has_type_name)(field_proto);
 
   f->type_ = (int)UPB_DESC(FieldDescriptorProto_type)(field_proto);
-  if (f->type_ == kUpb_FieldType_Message &&
-      // TODO: remove once we can deprecate kUpb_FieldType_Group.
-      UPB_DESC(FeatureSet_message_encoding)(f->resolved_features) ==
-          UPB_DESC(FeatureSet_DELIMITED)) {
-    f->type_ = kUpb_FieldType_Group;
-  }
 
   if (has_type) {
     switch (f->type_) {
@@ -13673,7 +13666,7 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix,
     }
   }
 
-  if (!has_type && has_type_name) {
+  if ((!has_type && has_type_name) || f->type_ == kUpb_FieldType_Message) {
     f->type_ =
         UPB_FIELD_TYPE_UNSPECIFIED;  // We'll assign this in resolve_subdef()
   } else {
@@ -13823,8 +13816,15 @@ static void resolve_subdef(upb_DefBuilder* ctx, const char* prefix,
           break;
         case UPB_DEFTYPE_MSG:
           f->sub.msgdef = def;
-          f->type_ = kUpb_FieldType_Message;  // It appears there is no way of
-                                              // this being a group.
+          f->type_ = kUpb_FieldType_Message;
+          // TODO: remove once we can deprecate
+          // kUpb_FieldType_Group.
+          if (UPB_DESC(FeatureSet_message_encoding)(f->resolved_features) ==
+                  UPB_DESC(FeatureSet_DELIMITED) &&
+              !upb_MessageDef_IsMapEntry(def) &&
+              !(f->msgdef && upb_MessageDef_IsMapEntry(f->msgdef))) {
+            f->type_ = kUpb_FieldType_Group;
+          }
           f->has_presence = !upb_FieldDef_IsRepeated(f);
           break;
         default:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 4.27.1
+  version: 4.27.2
 platform: x86_64-linux
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
@@ -190,7 +190,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v4.27.1/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v4.27.2/ruby
 post_install_message: 
 rdoc_options: []
 require_paths: