3 files changed, 58 insertions, 23 deletions
@@ -83,7 +83,7 @@ describe 'Kernel#caller_locations' do
 end
 end
- ruby_version_is "3.4" do
 it "includes core library methods defined in Ruby" do
 file, line = Kernel.instance_method(:tap).source_location
 file.should.start_with?('<internal:')
@@ -94,5 +94,17 @@ describe 'Kernel#caller_locations' do
 loc.path.should.start_with? "<internal:"
 end
 end
 end
 end
@@ -84,13 +84,26 @@ describe 'Kernel#caller' do
 end
 guard -> { Kernel.instance_method(:tap).source_location } do
- it "includes core library methods defined in Ruby" do
- file, line = Kernel.instance_method(:tap).source_location
- file.should.start_with?('<internal:')
- loc = nil
- tap { loc = caller(1, 1)[0] }
- loc.should =~ /\A<internal:.*in [`'](?:Kernel#)?tap'\z/
 end
 end
 end
@@ -262,6 +262,15 @@ retry:
 }
 }
 // Return true if a given location is a C method or supposed to behave like one.
 static inline bool
 location_cfunc_p(rb_backtrace_location_t *loc)
@@ -272,7 +281,7 @@ location_cfunc_p(rb_backtrace_location_t *loc)
 case VM_METHOD_TYPE_CFUNC:
 return true;
 case VM_METHOD_TYPE_ISEQ:
- return rb_iseq_attr_p(loc->cme->def->body.iseq.iseqptr, BUILTIN_ATTR_C_TRACE);
 default:
 return false;
 }
@@ -605,15 +614,6 @@ backtrace_size(const rb_execution_context_t *ec)
 }
 static bool
-is_internal_location(const rb_control_frame_t *cfp)
-{
- static const char prefix[] = "<internal:";
- const size_t prefix_len = sizeof(prefix) - 1;
- VALUE file = rb_iseq_path(cfp->iseq);
- return strncmp(prefix, RSTRING_PTR(file), prefix_len) == 0;
-}
-
-static bool
 is_rescue_or_ensure_frame(const rb_control_frame_t *cfp)
 {
 enum rb_iseq_type type = ISEQ_BODY(cfp->iseq)->type;
@@ -691,16 +691,26 @@ rb_ec_partial_backtrace_object(const rb_execution_context_t *ec, long start_fram
 if (start_frame > 0) {
 start_frame--;
 }
- else if (!(skip_internal && is_internal_location(cfp))) {
 if (!skip_next_frame) {
 const rb_iseq_t *iseq = cfp->iseq;
 const VALUE *pc = cfp->pc;
 loc = &bt->backtrace[bt->backtrace_size++];
 RB_OBJ_WRITE(btobj, &loc->cme, rb_vm_frame_method_entry(cfp));
- // Ruby methods with `Primitive.attr! :c_trace` should behave like C methods
- if (rb_iseq_attr_p(cfp->iseq, BUILTIN_ATTR_C_TRACE)) {
- loc->iseq = NULL;
- loc->pc = NULL;
 back_counter++;
 }
 else {
@@ -736,7 +746,7 @@ rb_ec_partial_backtrace_object(const rb_execution_context_t *ec, long start_fram
 // is the one of the caller Ruby frame, so if the last entry is a C frame we find the caller Ruby frame here.
 if (back_counter > 0) {
 for (; cfp != end_cfp; cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp)) {
- if (cfp->iseq && cfp->pc && !(skip_internal && is_internal_location(cfp))) {
 VM_ASSERT(!skip_next_frame); // ISEQ_TYPE_RESCUE/ISEQ_TYPE_ENSURE should have a caller Ruby ISEQ, not a cfunc
 bt_back_loc(back_counter, loc, cfp->iseq, cfp->pc);
 RB_OBJ_WRITTEN(btobj, Qundef, cfp->iseq);