* lib/forwardable (def_instance_delegator, def_single_delegator):

  rescue ::Exception instead of Exception in case Exception is
  defined under the target class.
  [ruby-core:71175] [Ruby trunk - Bug #11615]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 16 insertions, 0 deletions

diff --git a/test/test_forwardable.rb b/test/test_forwardable.rb
index c04c78577b..9b26019893 100644
--- a/test/test_forwardable.rb
+++ b/test/test_forwardable.rb
@@ -94,6 +94,22 @@ class TestForwardable < Test::Unit::TestCase
     end
   end
 
+  class Foo
+    extend Forwardable
+
+    def_delegator :bar, :baz
+
+    class Exception
+    end
+  end
+
+  def test_backtrace_adjustment
+    e = assert_raise(NameError) {
+      Foo.new.baz
+    }
+    assert_not_match(/\/forwardable\.rb/, e.backtrace[0])
+  end
+
   private
 
   def forwardable_class(&block)