google-protobuf 4.27.0-x86-linux → 4.27.2-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e6f4d46f6979b521973cfcfdbdbbe2121bf7082f9ac0d876e196d951a742284
-  data.tar.gz: e106d6292c22af1d16241452b0d295109e9b0b450b7ca0980f8cc8cd7b2d4ec6
+  metadata.gz: a9ac44d5d1b8530a5b31e58ddf01665876c62e42fd0fd17a321617cfb06e0079
+  data.tar.gz: cfe22d745ee92ba0775aefe2effa97ff1afab2ad1b7b0d81191ff167fbca9ce2
 SHA512:
-  metadata.gz: d47e676bfbf4725db5723f40a8516f666a3d285916783ed279ea9de33dc9f223856e7473f181a013aa10888ad47b2ea3609b459070033d284becc75421c87dbd
-  data.tar.gz: d1f55a41d980faa80481205f86dd5767501b9f89aa899cef370aff8307ec628d64546424d720445d4ac5f2d5d1538dfb54e627be5ac9f58d00e3c11ad29cfc68
+  metadata.gz: 9b6808bb056d44ae0e3c3d8f8adafa3035a08d398d0fca5b851749879978a942ad3cd9827e6a880b3d6ce88e91afec68406b24ef2d6c246b5506d98f8cf151fc
+  data.tar.gz: f37955cf9371324e7a97687a78e0282cc1bada528b36c395afa43e44af1584400a73eef8ef340f3763aeef1d17cd5ceb98301f68ff783139ea1d653f8b75cdb4

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.0
+  version: 4.27.2
 platform: x86-linux
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-22 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.0/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v4.27.2/ruby
 post_install_message: 
 rdoc_options: []
 require_paths: