diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2021-04-04 22:50:22 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2021-04-04 22:50:22 +0000 |
commit | ae1573ac739cc075cd5823c6ac512449ca5707d4 (patch) | |
tree | 3e8217379d7f9eb8385503c63522284910721d95 | |
parent | fe85a3d5271c4e3aeda42ec32e9c3f9ee02b6897 (diff) |
merge revision(s) 12391cdbe11f3fbeb3b04c30b944139e5bbd9ea6: [Backport #16834]
merge revision(s) cbe4f75ef802f13d05f94e42274b65a062bd3666: [Backport
#16834]
Fix rb_profile_frame_classpath to handle module singletons
Right now `SomeClass.method` is properly named, but `SomeModule.method`
is displayed as `#<Module:0x000055eb5d95adc8>.method` which makes
profiling annoying.
---
test/-ext-/debug/test_profile_frames.rb | 40 ++++++++++++++++++++++++++++-----
version.h | 2 +-
vm_backtrace.c | 2 +-
3 files changed, 36 insertions(+), 8 deletions(-)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/-ext-/debug/test_profile_frames.rb | 40 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | vm_backtrace.c | 2 |
3 files changed, 36 insertions, 8 deletions
diff --git a/test/-ext-/debug/test_profile_frames.rb b/test/-ext-/debug/test_profile_frames.rb index 5ea506046e..0335267ee9 100644 --- a/test/-ext-/debug/test_profile_frames.rb +++ b/test/-ext-/debug/test_profile_frames.rb @@ -3,6 +3,16 @@ require 'test/unit' require '-test-/debug' class SampleClassForTestProfileFrames + class << self + attr_accessor :sample4 + end + + self.sample4 = Module.new do + def self.corge(block) + Sample2.new.baz(block) + end + end + class Sample2 def baz(block) instance_eval "def zab(block) block.call end" @@ -10,8 +20,16 @@ class SampleClassForTestProfileFrames end end + module Sample3 + class << self + def qux(block) + SampleClassForTestProfileFrames.sample4.corge(block) + end + end + end + def self.bar(block) - Sample2.new.baz(block) + Sample3.qux(block) end def foo(block) @@ -29,6 +47,8 @@ class TestProfileFrames < Test::Unit::TestCase "test_profile_frames", "zab", "baz", + "corge", + "qux", "bar", "foo", "test_profile_frames", @@ -37,6 +57,8 @@ class TestProfileFrames < Test::Unit::TestCase "test_profile_frames", "zab", "baz", + "corge", + "qux", "bar", "foo", "test_profile_frames", @@ -45,6 +67,8 @@ class TestProfileFrames < Test::Unit::TestCase "TestProfileFrames#test_profile_frames", "#{obj.inspect}.zab", "SampleClassForTestProfileFrames::Sample2#baz", + "#{SampleClassForTestProfileFrames.sample4.inspect}.corge", + "SampleClassForTestProfileFrames::Sample3.qux", "SampleClassForTestProfileFrames.bar", "SampleClassForTestProfileFrames#foo", "TestProfileFrames#test_profile_frames", @@ -53,17 +77,21 @@ class TestProfileFrames < Test::Unit::TestCase TestProfileFrames, obj, SampleClassForTestProfileFrames::Sample2, + SampleClassForTestProfileFrames.sample4, + SampleClassForTestProfileFrames::Sample3, SampleClassForTestProfileFrames, # singleton method SampleClassForTestProfileFrames, TestProfileFrames, ] singleton_method_p = [ - false, true, false, true, false, false, false, + false, true, false, true, true, true, false, false, false, ] method_names = [ "test_profile_frames", "zab", "baz", + "corge", + "qux", "bar", "foo", "test_profile_frames", @@ -72,14 +100,14 @@ class TestProfileFrames < Test::Unit::TestCase "TestProfileFrames#test_profile_frames", "#{obj.inspect}.zab", "SampleClassForTestProfileFrames::Sample2#baz", + "#{SampleClassForTestProfileFrames.sample4.inspect}.corge", + "SampleClassForTestProfileFrames::Sample3.qux", "SampleClassForTestProfileFrames.bar", "SampleClassForTestProfileFrames#foo", "TestProfileFrames#test_profile_frames", ] - paths = [ file=__FILE__, "(eval)", file, file, file, file ] - absolute_paths = [ file, nil, file, file, file, file ] - - # pp frames + paths = [ file=__FILE__, "(eval)", file, file, file, file, file, file ] + absolute_paths = [ file, nil, file, file, file, file, file, file ] assert_equal(labels.size, frames.size) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.7" #define RUBY_RELEASE_DATE "2021-04-05" -#define RUBY_PATCHLEVEL 177 +#define RUBY_PATCHLEVEL 178 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 4 diff --git a/vm_backtrace.c b/vm_backtrace.c index 8264018da0..2a6c5bde30 100644 --- a/vm_backtrace.c +++ b/vm_backtrace.c @@ -1402,7 +1402,7 @@ rb_profile_frame_classpath(VALUE frame) } else if (FL_TEST(klass, FL_SINGLETON)) { klass = rb_ivar_get(klass, id__attached__); - if (!RB_TYPE_P(klass, T_CLASS)) + if (!RB_TYPE_P(klass, T_CLASS) && !RB_TYPE_P(klass, T_MODULE)) return rb_sprintf("#<%s:%p>", rb_class2name(rb_obj_class(klass)), (void*)klass); } return rb_class_path(klass); |