From 97c2a48960bbe993b2ed94ea9dfb76d5075a93fa Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 21 May 2014 06:11:25 +0000 Subject: 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 --- test/ruby/test_backtrace.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'test/ruby') 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 -- cgit v1.2.3