google-protobuf 3.20.0.rc.1 → 3.20.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb2618df4d80bce774d4aa3114327b80e098ccbe6ec4b337c96f93137cb2576
-  data.tar.gz: a09de36f1d04b8fc90774c3b4d96c5fc040fcde819b847d8a9db768969e85cd8
+  metadata.gz: e0eaa0e9490c0ca710f54751ec4484ee577061c3713ebfb01c49f61a6c12793f
+  data.tar.gz: 6c2740af26293911ba980f6a303055763382ca1f4315a404e4e77a51a603ad16
 SHA512:
-  metadata.gz: 50ccb5a50378630bf39a0b7ba3141c5ee362062ea19fb5173137d9bfbb0dc8eac5880c8cf9697368d36bac4228c24ec51c6d895bb45e2614babe81cd84078d23
-  data.tar.gz: 958b5976cb6a6b901a5de108529ef460c8a8ca97cd2a1822334c1ca607e8d39b0c6acc4fe1b427072c976366bcb525b1eb486edd0da64df7e40e373d88da5ba7
+  metadata.gz: a8b72735dc34f30fd2bee0eb251724237dbd05bb0408af0748b8a352926a9d1d1a54d90bfaca4e7c3af7909e88ea6c87037e39859b0e7d1cd92dc2630c0166cf
+  data.tar.gz: 50f1f1bc894b82557e66d733789b5d092defc0895c8af87ee43d38e05e886695ca1120e4046020284cc7c2301defc82875c8d6c7e96daea45090aea417ec3fc8

data/ext/google/protobuf_c/convert.c

@@ -340,19 +340,19 @@ uint64_t Msgval_GetHash(upb_MessageValue val, TypeInfo type_info,
                         uint64_t seed) {
   switch (type_info.type) {
     case kUpb_CType_Bool:
-      return Wyhash(&val, 1, seed, kWyhashSalt);
+      return _upb_Hash(&val, 1, seed);
     case kUpb_CType_Float:
     case kUpb_CType_Int32:
     case kUpb_CType_UInt32:
     case kUpb_CType_Enum:
-      return Wyhash(&val, 4, seed, kWyhashSalt);
+      return _upb_Hash(&val, 4, seed);
     case kUpb_CType_Double:
     case kUpb_CType_Int64:
     case kUpb_CType_UInt64:
-      return Wyhash(&val, 8, seed, kWyhashSalt);
+      return _upb_Hash(&val, 8, seed);
     case kUpb_CType_String:
     case kUpb_CType_Bytes:
-      return Wyhash(val.str_val.data, val.str_val.size, seed, kWyhashSalt);
+      return _upb_Hash(val.str_val.data, val.str_val.size, seed);
     case kUpb_CType_Message:
       return Message_Hash(val.msg_val, type_info.def.msgdef, seed);
     default:

data/ext/google/protobuf_c/defs.c

@@ -159,6 +159,7 @@ VALUE DescriptorPool_add_serialized_file(VALUE _self,
     rb_raise(cTypeError, "Unable to build file to DescriptorPool: %s",
              upb_Status_ErrorMessage(&status));
   }
+  RB_GC_GUARD(arena_rb);
   return get_filedef_obj(_self, filedef);
 }
 

data/ext/google/protobuf_c/extconf.rb

@@ -23,6 +23,6 @@ $INCFLAGS << "$(srcdir)/third_party/utf8_range"
 
 $srcs = ["protobuf.c", "convert.c", "defs.c", "message.c",
          "repeated_field.c", "map.c", "ruby-upb.c", "wrap_memcpy.c",
-         "utf8_range.c"]
+         "naive.c", "range2-neon.c", "range2-sse.c"]
 
 create_makefile(ext_name)

data/ext/google/protobuf_c/message.c

@@ -161,10 +161,8 @@ void Message_PrintMessage(StringBuilder* b, const upb_Message* msg,
 
     if (upb_FieldDef_IsMap(field)) {
       const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(field);
-      const upb_FieldDef* key_f =
-          upb_MessageDef_FindFieldByNumberWithSize(entry_m, 1);
-      const upb_FieldDef* val_f =
-          upb_MessageDef_FindFieldByNumberWithSize(entry_m, 2);
+      const upb_FieldDef* key_f = upb_MessageDef_FindFieldByNumber(entry_m, 1);
+      const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(entry_m, 2);
       TypeInfo val_info = TypeInfo_get(val_f);
       Map_Inspect(b, msgval.map_val, upb_FieldDef_CType(key_f), val_info);
     } else if (upb_FieldDef_IsRepeated(field)) {
@@ -365,7 +363,7 @@ static VALUE Message_field_accessor(VALUE _self, const upb_FieldDef* f,
         upb_MessageValue wrapper = upb_Message_Get(self->msg, f);
         const upb_MessageDef* wrapper_m = upb_FieldDef_MessageSubDef(f);
         const upb_FieldDef* value_f =
-            upb_MessageDef_FindFieldByNumberWithSize(wrapper_m, 1);
+            upb_MessageDef_FindFieldByNumber(wrapper_m, 1);
         upb_MessageValue value = upb_Message_Get(wrapper.msg_val, value_f);
         return Convert_UpbToRuby(value, TypeInfo_get(value_f), self->arena);
       } else {
@@ -377,8 +375,8 @@ static VALUE Message_field_accessor(VALUE _self, const upb_FieldDef* f,
       if (argv[1] == Qnil) {
         upb_Message_ClearField(msg, f);
       } else {
-        const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumberWithSize(
-            upb_FieldDef_MessageSubDef(f), 1);
+        const upb_FieldDef* val_f =
+            upb_MessageDef_FindFieldByNumber(upb_FieldDef_MessageSubDef(f), 1);
         upb_MessageValue msgval = Convert_RubyToUpb(
             argv[1], upb_FieldDef_Name(f), TypeInfo_get(val_f), arena);
         upb_Message* wrapper = upb_Message_Mutable(msg, f, arena).msg;
@@ -527,10 +525,8 @@ static int Map_initialize_kwarg(VALUE key, VALUE val, VALUE _self) {
 static void Map_InitFromValue(upb_Map* map, const upb_FieldDef* f, VALUE val,
                               upb_Arena* arena) {
   const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* key_f =
-      upb_MessageDef_FindFieldByNumberWithSize(entry_m, 1);
-  const upb_FieldDef* val_f =
-      upb_MessageDef_FindFieldByNumberWithSize(entry_m, 2);
+  const upb_FieldDef* key_f = upb_MessageDef_FindFieldByNumber(entry_m, 1);
+  const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(entry_m, 2);
   if (TYPE(val) != T_HASH) {
     rb_raise(rb_eArgError,
              "Expected Hash object as initializer value for map field '%s' "
@@ -748,7 +744,7 @@ uint64_t Message_Hash(const upb_Message* msg, const upb_MessageDef* m,
                     &size);
 
   if (data) {
-    uint64_t ret = Wyhash(data, size, seed, kWyhashSalt);
+    uint64_t ret = _upb_Hash(data, size, seed);
     upb_Arena_Free(arena);
     return ret;
   } else {
@@ -847,10 +843,8 @@ static VALUE Message_CreateHash(const upb_Message* msg,
 
     if (upb_FieldDef_IsMap(field)) {
       const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(field);
-      const upb_FieldDef* key_f =
-          upb_MessageDef_FindFieldByNumberWithSize(entry_m, 1);
-      const upb_FieldDef* val_f =
-          upb_MessageDef_FindFieldByNumberWithSize(entry_m, 2);
+      const upb_FieldDef* key_f = upb_MessageDef_FindFieldByNumber(entry_m, 1);
+      const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(entry_m, 2);
       upb_CType key_type = upb_FieldDef_CType(key_f);
       msg_value = Map_CreateHash(msgval.map_val, key_type, TypeInfo_get(val_f));
     } else if (upb_FieldDef_IsRepeated(field)) {
@@ -1141,7 +1135,11 @@ static VALUE Message_encode_json(int argc, VALUE* argv, VALUE klass) {
   if (argc == 2) {
     VALUE hash_args = argv[1];
     if (TYPE(hash_args) != T_HASH) {
-      rb_raise(rb_eArgError, "Expected hash arguments.");
+      if (RTEST(rb_funcall(hash_args, rb_intern("respond_to?"), 1, rb_str_new2("to_h")))) {
+        hash_args = rb_funcall(hash_args, rb_intern("to_h"), 0);
+      } else {
+        rb_raise(rb_eArgError, "Expected hash arguments.");
+      }
     }
 
     if (RTEST(rb_hash_lookup2(hash_args,
@@ -1353,10 +1351,8 @@ const upb_Message* Message_GetUpbMessage(VALUE value, const upb_MessageDef* m,
         upb_Message* msg = upb_Message_New(m, arena);
         upb_MessageValue sec, nsec;
         struct timespec time;
-        const upb_FieldDef* sec_f =
-            upb_MessageDef_FindFieldByNumberWithSize(m, 1);
-        const upb_FieldDef* nsec_f =
-            upb_MessageDef_FindFieldByNumberWithSize(m, 2);
+        const upb_FieldDef* sec_f = upb_MessageDef_FindFieldByNumber(m, 1);
+        const upb_FieldDef* nsec_f = upb_MessageDef_FindFieldByNumber(m, 2);
 
         if (!rb_obj_is_kind_of(value, rb_cTime)) goto badtype;
 
@@ -1371,10 +1367,8 @@ const upb_Message* Message_GetUpbMessage(VALUE value, const upb_MessageDef* m,
         // Numeric -> Google::Protobuf::Duration
         upb_Message* msg = upb_Message_New(m, arena);
         upb_MessageValue sec, nsec;
-        const upb_FieldDef* sec_f =
-            upb_MessageDef_FindFieldByNumberWithSize(m, 1);
-        const upb_FieldDef* nsec_f =
-            upb_MessageDef_FindFieldByNumberWithSize(m, 2);
+        const upb_FieldDef* sec_f = upb_MessageDef_FindFieldByNumber(m, 1);
+        const upb_FieldDef* nsec_f = upb_MessageDef_FindFieldByNumber(m, 2);
 
         if (!rb_obj_is_kind_of(value, rb_cNumeric)) goto badtype;
 

data/ext/google/protobuf_c/protobuf.c

@@ -42,12 +42,12 @@ VALUE cTypeError;
 
 const upb_FieldDef *map_field_key(const upb_FieldDef *field) {
   const upb_MessageDef *entry = upb_FieldDef_MessageSubDef(field);
-  return upb_MessageDef_FindFieldByNumberWithSize(entry, 1);
+  return upb_MessageDef_FindFieldByNumber(entry, 1);
 }
 
 const upb_FieldDef *map_field_value(const upb_FieldDef *field) {
   const upb_MessageDef *entry = upb_FieldDef_MessageSubDef(field);
-  return upb_MessageDef_FindFieldByNumberWithSize(entry, 2);
+  return upb_MessageDef_FindFieldByNumber(entry, 2);
 }
 
 // -----------------------------------------------------------------------------
@@ -193,9 +193,20 @@ const rb_data_type_t Arena_type = {
     .flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
+static void* ruby_upb_allocfunc(upb_alloc* alloc, void* ptr, size_t oldsize, size_t size) {
+  if (size == 0) {
+    xfree(ptr);
+    return NULL;
+  } else {
+    return xrealloc(ptr, size);
+  }
+}
+
+upb_alloc ruby_upb_alloc = {&ruby_upb_allocfunc};
+
 static VALUE Arena_alloc(VALUE klass) {
   Arena *arena = ALLOC(Arena);
-  arena->arena = upb_Arena_New();
+  arena->arena = upb_Arena_Init(NULL, 0, &ruby_upb_alloc);
   arena->pinned_objs = Qnil;
   return TypedData_Wrap_Struct(klass, &Arena_type, arena);
 }