1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vm.c: rewind cfp

Browse Source 
* vm.c (m_core_hash_{from_ary,merge_{ary,ptr,kwd}}): rewind cfp to
  show proper backtrace.  [ruby-dev:35820] [Bug #416]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-05-21 06:11:25 +00:00
parent abf2980b7a
commit 97c2a48960
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/ruby/test_backtrace.rb
View File

@ -234,4 +234,11 @@ class TestBacktrace < Test::Unit::TestCase
end end
assert_not_match(/\Acore#/, e.backtrace_locations[0].base_label) assert_not_match(/\Acore#/, e.backtrace_locations[0].base_label)
end 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 end

31
vm.c
View File

@ -2259,7 +2259,9 @@ m_core_set_postexe(VALUE self)
return Qnil; 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 static VALUE
core_hash_merge(VALUE hash, long argc, const VALUE *argv) core_hash_merge(VALUE hash, long argc, const VALUE *argv)
@ -2275,6 +2277,14 @@ core_hash_merge(VALUE hash, long argc, const VALUE *argv)
static VALUE static VALUE
m_core_hash_from_ary(VALUE self, VALUE ary) 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(); VALUE hash = rb_hash_new();
@ -2282,11 +2292,18 @@ m_core_hash_from_ary(VALUE self, VALUE ary)
RUBY_DTRACE_HASH_CREATE(RARRAY_LEN(ary), rb_sourcefile(), rb_sourceline()); 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 static VALUE
m_core_hash_merge_ary(VALUE self, VALUE hash, VALUE ary) 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)); core_hash_merge(hash, RARRAY_LEN(ary), RARRAY_CONST_PTR(ary));
return hash; return hash;
@ -2297,7 +2314,7 @@ m_core_hash_merge_ptr(int argc, VALUE *argv, VALUE recv)
{ {
VALUE hash = argv[0]; VALUE hash = argv[0];
core_hash_merge(hash, argc-1, argv+1); REWIND_CFP(core_hash_merge(hash, argc-1, argv+1));
return hash; return hash;
} }
@ -2329,6 +2346,14 @@ kwcheck_i(VALUE key, VALUE value, VALUE hash)
static VALUE static VALUE
m_core_hash_merge_kwd(int argc, VALUE *argv, VALUE recv) 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; VALUE hash, kw;
rb_check_arity(argc, 1, 2); rb_check_arity(argc, 1, 2);