ruby-prof 1.7.0-x64-mingw-ucrt → 1.7.1-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 198226d7967ceb0af37f6dc43d890354c521474b7f02fe1d19a866053f869ef2
-  data.tar.gz: 52d7b29fc8bf481c97a8bef077a3129b36e6193b3ac0be25cb23f2f93ad8c398
+  metadata.gz: ba9fdbefdcab7553104af5763078c46cd88ed39982ea198845adeb2f90548e21
+  data.tar.gz: 3b1cfbcaceea7fabcdc397c4902e945b652b743e136448832f6ea754391f39db
 SHA512:
-  metadata.gz: 29d57e83c9371e760440cedd04e654d39a59e79c7f5371016b6d0d7437a74f1a9834c1fe6608c150a6969841e261b4ad5b8a0c3d9f95f2118426fdaae4ccd762
-  data.tar.gz: c315879411b1f27a291ed3a94a59911f3cd38c2b063cf6176238fe350776cec8c92e35a0d6f5dcfb6188ead64c294dc960eb368d793479278c41c2921b4750e6
+  metadata.gz: 7afa2075057d5a428b3508ad089f095c5d0a9d8eb7f8889e4cfbd883364784f1e699aee368676e5cd5be6002865cc142a7a8477f6f02a5dc491fe5433af0b496
+  data.tar.gz: 0e7d856d100cc275a606d5192f181a6879de9e4631bfa479daff39e40f812784e9f516ec6c153edc6a69ce670c9254a1037d7037e2bf707669f62b469231dd1b

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: x64-mingw-ucrt
 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
@@ -83,7 +97,6 @@ files:
 - ext/ruby_prof/ruby_prof.h
 - ext/ruby_prof/vc/ruby_prof.sln
 - ext/ruby_prof/vc/ruby_prof.vcxproj
-- lib/3.2/ruby_prof.so
 - lib/3.3/ruby_prof.so
 - lib/ruby-prof.rb
 - lib/ruby-prof/assets/call_stack_printer.html.erb
@@ -169,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:
@@ -185,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