summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-21 06:11:25 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-21 06:11:25 +0000
commit97c2a48960bbe993b2ed94ea9dfb76d5075a93fa (patch)
tree362573b623e83be7a8c544f6f2fdec928fcf31fe /vm.c
parentabf2980b7a34d73ee93b9f5ee2a3d528df3b851f (diff)
vm.c: rewind cfp
* 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
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c31
1 files changed, 28 insertions, 3 deletions
diff --git a/vm.c b/vm.c
index 0cff543..1fa76af 100644
--- a/vm.c
+++ b/vm.c
@@ -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];