summaryrefslogtreecommitdiff
path: root/test/ruby
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 /test/ruby
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 'test/ruby')
-rw-r--r--test/ruby/test_backtrace.rb7
1 files changed, 7 insertions, 0 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