summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/ruby/test_settracefunc.rb16
-rw-r--r--version.h2
-rw-r--r--vm_trace.c3
3 files changed, 20 insertions, 1 deletions
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index fa1601b0e3..0e77d22b03 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -93,6 +93,22 @@ class TestSetTraceFunc < Test::Unit::TestCase
assert_equal([[:req]], parameters)
end
+ def test_c_call_aliased_method
+ # [Bug #20915]
+ klass = Class.new do
+ alias_method :new_method, :method
+ end
+
+ instance = klass.new
+ parameters = nil
+
+ TracePoint.new(:c_call) do |tp|
+ parameters = tp.parameters
+ end.enable { instance.new_method(:to_s) }
+
+ assert_equal([[:req]], parameters)
+ end
+
def test_call
events = []
name = "#{self.class}\##{__method__}"
diff --git a/version.h b/version.h
index 3e58ef691d..ff01117867 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 242
+#define RUBY_PATCHLEVEL 243
#include "ruby/version.h"
#include "ruby/internal/abi.h"
diff --git a/vm_trace.c b/vm_trace.c
index 00c1ba5c16..eeb64df49b 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -916,6 +916,9 @@ rb_tracearg_parameters(rb_trace_arg_t *trace_arg)
const rb_method_entry_t *me;
VALUE iclass = Qnil;
me = rb_method_entry_without_refinements(trace_arg->klass, trace_arg->called_id, &iclass);
+ if (!me) {
+ me = rb_method_entry_without_refinements(trace_arg->klass, trace_arg->id, &iclass);
+ }
return rb_unnamed_parameters(rb_method_entry_arity(me));
}
break;