ruby-prof 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f40a85c075fc8776559aecc558adf70e1e5c402e38edc463784658bb881e8612
-  data.tar.gz: c41f3e88dfdb16a8717899f21cf0064265186513fad685ed67b493752e182f86
+  metadata.gz: 0fbaeec67f3e4771202c58f1902376076dc8e9185e0923e0bad648f6fdaae8a5
+  data.tar.gz: be5b6c0740418aae93dc7cbe90d13d992b71ffe822cf7332075c1930f3cb6501
 SHA512:
-  metadata.gz: c32318e39c2db99f0581a283c8dfd2742eb3f19ffd6e115e90b45d26ddbefdc2a3827be06874ec56f52478f0ca6d709006e4314e38d7dcf5676c5d9ed801051b
-  data.tar.gz: 27d6dd29863604626eab6d27a8471e5feee6660739568e334c04b9b79aa153933945436a1a1a9b9ddc7cfd4e53d8240032f4b94fd552a5c4dd565e0a5cb81395
+  metadata.gz: 40403f7f034a87120c6a7328057ff9ad2e922f0c1c8aa080720c6f70c8ae84a08bc71bfaecfe040f38f5ebdfb38497326c84136fe2e5ce6f7e4fd775f368739f
+  data.tar.gz: e5e9def95a8b0240ce330f1d093f549ea9555cfb491d45ba06647c3112dd55229244fb8d42ec871b81cad0b72bb1c9a5e49df1db0ff8008060a197d381acbe8e

data/CHANGES

@@ -1,3 +1,7 @@
+1.7.1 (2024-10-19)
+=====================
+* Fix crashes when calling merge due to inconsistent method keys (Chris Heald)
+
 1.7.0 (2024-01-07)
 =====================
 * Add support for ruby 3.3.*  (Charlie Savage)

data/ext/ruby_prof/rp_method.c

@@ -101,19 +101,8 @@ VALUE resolve_klass_name(VALUE klass, unsigned int* klass_flags)
 
 st_data_t method_key(VALUE klass, VALUE msym)
 {
-    VALUE resolved_klass = klass;
-
-    /* Is this an include for a module?  If so get the actual
-        module class since we want to combine all profiling
-        results for that module. */
-    if (klass == 0 || klass == Qnil)
-    {
-        resolved_klass = Qnil;
-    }
-    else if (BUILTIN_TYPE(klass) == T_ICLASS)
-    {
-        resolved_klass = RBASIC_CLASS(klass);
-    }
+    unsigned int klass_flags = 0;
+    VALUE resolved_klass = resolve_klass(klass, &klass_flags);
 
     st_data_t hash = rb_hash_start(0);
     hash = rb_hash_uint(hash, resolved_klass);

data/lib/ruby-prof/version.rb

@@ -1,3 +1,3 @@
 module RubyProf
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

data/ruby-prof.gemspec

@@ -59,6 +59,7 @@ EOF
   spec.required_ruby_version = '>= 3.0.0'
   spec.date = Time.now.strftime('%Y-%m-%d')
   spec.homepage = 'https://github.com/ruby-prof/ruby-prof'
+  spec.add_development_dependency("base64")
   spec.add_development_dependency('minitest')
   spec.add_development_dependency('rake-compiler')
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-07 00:00:00.000000000 Z
+date: 2024-10-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +182,7 @@ metadata:
   bug_tracker_uri: https://github.com/ruby-prof/ruby-prof/issues
   changelog_uri: https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES
   documentation_uri: https://ruby-prof.github.io/
-  source_code_uri: https://github.com/ruby-prof/ruby-prof/tree/v1.7.0
+  source_code_uri: https://github.com/ruby-prof/ruby-prof/tree/v1.7.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -184,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Fast Ruby profiler