google-protobuf 3.16.0-universal-darwin → 3.17.0.rc.1-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52766610ef21901c0a97bc126ee685fc56181b6fb15a3e69e5556d0c146b4d58
-  data.tar.gz: 654fb7c9d106544ec053c7c468a9f077fecc01da24256beaf85ec1ba9f5772a3
+  metadata.gz: cdcd06dc3e388c249383c183f33f812bc1fbcf56d40226c866af813b650ee511
+  data.tar.gz: 3472c063effded1340c101794bcd7f3c823ed7f6fc52de36111a987ef1d47dc1
 SHA512:
-  metadata.gz: 10d3e0739c1a6c789b65a311f216110c7560df623ef493e7ceb1b0005933802931d7399235cd5c00c00f653e9e6b64927848399557bd32c7f28d728b15b8194d
-  data.tar.gz: 31bee69516e03661a4f99ff81b918b3bf5b89e43a702dda1bf1b14af14cfee3ec0417ffdd0201440813acbd3785b7ae62261bd07d63f3f205e2e80e294876a3f
+  metadata.gz: 8d48cd2a30dfbdb628549cc58a32e7cbabf7da62dad5961c19c3caf3d881f020ebb69dda56928e709f5630acceeb141bfb98e9bdf64a50719703883631b19087
+  data.tar.gz: 2662146181f09fbafbf97a84e03b4ea9096233826d66442ec9dae9a90e5bc218685828a93cefb16fb838220db5f684b7d3ec3baf2e20620a7f40f219b32d9a3c

data/ext/google/protobuf_c/extconf.rb

@@ -17,4 +17,5 @@ end
 $objs = ["protobuf.o", "convert.o", "defs.o", "message.o",
          "repeated_field.o", "map.o", "ruby-upb.o", "wrap_memcpy.o"]
 
+find_header('third_party/wyhash/wyhash.h', '../../../..')
 create_makefile("google/protobuf_c")

data/ext/google/protobuf_c/message.c

@@ -734,7 +734,10 @@ uint64_t Message_Hash(const upb_msg* msg, const upb_msgdef* m, uint64_t seed) {
  */
 static VALUE Message_hash(VALUE _self) {
   Message* self = ruby_to_Message(_self);
-  return INT2FIX(Message_Hash(self->msg, self->msgdef, 0));
+  uint64_t hash_value = Message_Hash(self->msg, self->msgdef, 0);
+  // RUBY_FIXNUM_MAX should be one less than a power of 2.
+  assert((RUBY_FIXNUM_MAX & (RUBY_FIXNUM_MAX + 1)) == 0);
+  return INT2FIX(hash_value & RUBY_FIXNUM_MAX);
 }
 
 /*

data/ext/google/protobuf_c/protobuf.c

@@ -238,8 +238,16 @@ void Arena_register(VALUE module) {
 // We use WeakMap for the cache. For Ruby <2.7 we also need a secondary Hash
 // to store WeakMap keys because Ruby <2.7 WeakMap doesn't allow non-finalizable
 // keys.
-
-#if RUBY_API_VERSION_CODE >= 20700
+//
+// We also need the secondary Hash if sizeof(long) < sizeof(VALUE), because this
+// means it may not be possible to fit a pointer into a Fixnum. Keys are
+// pointers, and if they fit into a Fixnum, Ruby doesn't collect them, but if
+// they overflow and require allocating a Bignum, they could get collected
+// prematurely, thus removing the cache entry. This happens on 64-bit Windows,
+// on which pointers are 64 bits but longs are 32 bits. In this case, we enable
+// the secondary Hash to hold the keys and prevent them from being collected.
+
+#if RUBY_API_VERSION_CODE >= 20700 && SIZEOF_LONG >= SIZEOF_VALUE
 #define USE_SECONDARY_MAP 0
 #else
 #define USE_SECONDARY_MAP 1
@@ -326,7 +334,7 @@ static VALUE SecondaryMap_Get(VALUE key, bool create) {
   VALUE ret = rb_hash_lookup(secondary_map, key);
   if (ret == Qnil && create) {
     SecondaryMap_MaybeGC();
-    ret = rb_eval_string("Object.new");
+    ret = rb_class_new_instance(0, NULL, rb_cObject);
     rb_hash_aset(secondary_map, key, ret);
   }
   return ret;
@@ -336,11 +344,9 @@ static VALUE SecondaryMap_Get(VALUE key, bool create) {
 
 // Requires: secondary_map_mutex is held by this thread iff create == true.
 static VALUE ObjectCache_GetKey(const void* key, bool create) {
-  char buf[sizeof(key)];
-  memcpy(&buf, &key, sizeof(key));
-  intptr_t key_int = (intptr_t)key;
-  PBRUBY_ASSERT((key_int & 3) == 0);
-  VALUE ret = LL2NUM(key_int >> 2);
+  VALUE key_val = (VALUE)key;
+  PBRUBY_ASSERT((key_val & 3) == 0);
+  VALUE ret = LL2NUM(key_val >> 2);
 #if USE_SECONDARY_MAP
   ret = SecondaryMap_Get(ret, create);
 #endif

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.16.0
+  version: 3.17.0.rc.1
 platform: universal-darwin
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
@@ -128,7 +128,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.16.0/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.17.0-rc1/ruby
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -143,9 +143,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.1.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.17
 signing_key: