diff options
| -rw-r--r-- | ext/-test-/bug-14834/bug-14384.c | 35 | ||||
| -rw-r--r-- | ext/-test-/bug-14834/depend | 13 | ||||
| -rw-r--r-- | ext/-test-/bug-14834/extconf.rb | 2 | ||||
| -rw-r--r-- | gc.c | 7 | ||||
| -rw-r--r-- | test/-ext-/test_bug-14834.rb | 12 | ||||
| -rw-r--r-- | version.h | 2 |
6 files changed, 68 insertions, 3 deletions
diff --git a/ext/-test-/bug-14834/bug-14384.c b/ext/-test-/bug-14834/bug-14384.c new file mode 100644 index 0000000000..58abd6d435 --- /dev/null +++ b/ext/-test-/bug-14834/bug-14384.c @@ -0,0 +1,35 @@ +#include <ruby/ruby.h> +#include <ruby/debug.h> + +static NOINLINE(VALUE f(VALUE)); +static NOINLINE(void g(VALUE, void*)); +extern NOINLINE(void Init_bug_14384(void)); + +void +Init_bug_14834(void) +{ + VALUE q = rb_define_module("Bug"); + rb_define_module_function(q, "bug_14834", f, 0); +} + +VALUE +f(VALUE q) +{ + int w[] = { 0, 1024 }; + VALUE e = rb_tracepoint_new(Qnil, RUBY_INTERNAL_EVENT_NEWOBJ, g, w); + + rb_tracepoint_enable(e); + return rb_ensure(rb_yield, q, rb_tracepoint_disable, e); +} + +void +g(MAYBE_UNUSED(VALUE q), void* w) +{ + const int *e = (const int *)w; + const int r = *e++; + const int t = *e++; + VALUE y[t]; + int u[t]; + + rb_profile_frames(r, t, y, u); +} diff --git a/ext/-test-/bug-14834/depend b/ext/-test-/bug-14834/depend new file mode 100644 index 0000000000..e25ed1aa1a --- /dev/null +++ b/ext/-test-/bug-14834/depend @@ -0,0 +1,13 @@ +# AUTOGENERATED DEPENDENCIES START +bug-14384.o: $(RUBY_EXTCONF_H) +bug-14384.o: $(arch_hdrdir)/ruby/config.h +bug-14384.o: $(hdrdir)/ruby/backward.h +bug-14384.o: $(hdrdir)/ruby/debug.h +bug-14384.o: $(hdrdir)/ruby/defines.h +bug-14384.o: $(hdrdir)/ruby/intern.h +bug-14384.o: $(hdrdir)/ruby/missing.h +bug-14384.o: $(hdrdir)/ruby/ruby.h +bug-14384.o: $(hdrdir)/ruby/st.h +bug-14384.o: $(hdrdir)/ruby/subst.h +bug-14384.o: bug-14384.c +# AUTOGENERATED DEPENDENCIES END diff --git a/ext/-test-/bug-14834/extconf.rb b/ext/-test-/bug-14834/extconf.rb new file mode 100644 index 0000000000..e8f3f1f437 --- /dev/null +++ b/ext/-test-/bug-14834/extconf.rb @@ -0,0 +1,2 @@ +# frozen_string_literal: true +create_makefile("-test-/bug_14834") @@ -1800,8 +1800,11 @@ rb_objspace_set_event_hook(const rb_event_flag_t event) static void gc_event_hook_body(rb_execution_context_t *ec, rb_objspace_t *objspace, const rb_event_flag_t event, VALUE data) { - /* increment PC because source line is calculated with PC-1 */ - const VALUE *pc = ec->cfp->pc++; + const VALUE *pc = ec->cfp->pc; + if (pc && VM_FRAME_RUBYFRAME_P(ec->cfp)) { + /* increment PC because source line is calculated with PC-1 */ + ec->cfp->pc++; + } EXEC_EVENT_HOOK(ec, event, ec->cfp->self, 0, 0, 0, data); ec->cfp->pc = pc; } diff --git a/test/-ext-/test_bug-14834.rb b/test/-ext-/test_bug-14834.rb new file mode 100644 index 0000000000..a3623b8adc --- /dev/null +++ b/test/-ext-/test_bug-14834.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class Test_BUG_14834 < Test::Unit::TestCase + def test + assert_ruby_status [], <<~'end;', '[ruby-core:87449] [Bug #14834]' + require '-test-/bug_14834' + Bug.bug_14834 do + [123].group_by {} + end + end; + end +end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.3" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 95 +#define RUBY_PATCHLEVEL 96 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 8 |