diff options
| -rw-r--r-- | test/ruby/test_backtrace.rb | 7 | ||||
| -rw-r--r-- | vm.c | 31 |
2 files changed, 35 insertions, 3 deletions
diff --git a/test/ruby/test_backtrace.rb b/test/ruby/test_backtrace.rb index a78a2c6170..c4545239a5 100644 --- a/test/ruby/test_backtrace.rb +++ b/test/ruby/test_backtrace.rb @@ -234,4 +234,11 @@ class TestBacktrace < Test::Unit::TestCase end assert_not_match(/\Acore#/, e.backtrace_locations[0].base_label) end + + def test_core_backtrace_hash_merge + e = assert_raise(TypeError) do + {**nil} + end + assert_not_match(/\Acore#/, e.backtrace_locations[0].base_label) + end end @@ -2259,7 +2259,9 @@ m_core_set_postexe(VALUE self) return Qnil; } -static VALUE m_core_hash_merge_ary(VALUE self, VALUE hash, VALUE ary); +static VALUE core_hash_merge_ary(VALUE hash, VALUE ary); +static VALUE core_hash_from_ary(VALUE ary); +static VALUE core_hash_merge_kwd(int argc, VALUE *argv); static VALUE core_hash_merge(VALUE hash, long argc, const VALUE *argv) @@ -2276,18 +2278,33 @@ core_hash_merge(VALUE hash, long argc, const VALUE *argv) static VALUE m_core_hash_from_ary(VALUE self, VALUE ary) { + VALUE hash; + REWIND_CFP(hash = core_hash_from_ary(ary)); + return hash; +} + +static VALUE +core_hash_from_ary(VALUE ary) +{ VALUE hash = rb_hash_new(); if (RUBY_DTRACE_HASH_CREATE_ENABLED()) { RUBY_DTRACE_HASH_CREATE(RARRAY_LEN(ary), rb_sourcefile(), rb_sourceline()); } - return m_core_hash_merge_ary(self, hash, ary); + return core_hash_merge_ary(hash, ary); } static VALUE m_core_hash_merge_ary(VALUE self, VALUE hash, VALUE ary) { + REWIND_CFP(core_hash_merge_ary(hash, ary)); + return hash; +} + +static VALUE +core_hash_merge_ary(VALUE hash, VALUE ary) +{ core_hash_merge(hash, RARRAY_LEN(ary), RARRAY_CONST_PTR(ary)); return hash; } @@ -2297,7 +2314,7 @@ m_core_hash_merge_ptr(int argc, VALUE *argv, VALUE recv) { VALUE hash = argv[0]; - core_hash_merge(hash, argc-1, argv+1); + REWIND_CFP(core_hash_merge(hash, argc-1, argv+1)); return hash; } @@ -2330,6 +2347,14 @@ kwcheck_i(VALUE key, VALUE value, VALUE hash) static VALUE m_core_hash_merge_kwd(int argc, VALUE *argv, VALUE recv) { + VALUE hash; + REWIND_CFP(hash = core_hash_merge_kwd(argc, argv)); + return hash; +} + +static VALUE +core_hash_merge_kwd(int argc, VALUE *argv) +{ VALUE hash, kw; rb_check_arity(argc, 1, 2); hash = argv[0]; |