archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) cbe4f75ef8: [Backport #16834]

Browse source 
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.
This commit is contained in:
nagachika 2020-07-25 14:17:35 +09:00
parent be359442cb
commit 12391cdbe1
3 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

40
test/-ext-/debug/test_profile_frames.rb
View file

@ -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)

2
version.h
View file

@ -2,7 +2,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 110
#define RUBY_PATCHLEVEL 111
#define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 7

2
vm_backtrace.c
View file

@ -1425,7 +1425,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);