diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/delegate.rb | 23 |
2 files changed, 14 insertions, 15 deletions
@@ -1,3 +1,9 @@ +Wed Sep 9 11:08:59 2015 Zachary Scott <zzak@ruby-lang.org> + + * lib/delegate.rb: Remove backtrace cleaning for delegated methods + This patch was provided by Rafael França and greatly improves + performance when an exception is raised. [Bug #11461] + Wed Sep 9 10:05:41 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> * test/rubygems/test_config.rb: fix broken tests for Windows platform. diff --git a/lib/delegate.rb b/lib/delegate.rb index a326fa1fda..7a6a2a7a7b 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -77,16 +77,13 @@ class Delegator < BasicObject def method_missing(m, *args, &block) r = true target = self.__getobj__ {r = false} - begin - if r && target.respond_to?(m) - target.__send__(m, *args, &block) - elsif ::Kernel.respond_to?(m, true) - ::Kernel.instance_method(m).bind(self).(*args, &block) - else - super(m, *args, &block) - end - ensure - $@.delete_if {|t| %r"\A#{Regexp.quote(__FILE__)}:(?:#{[__LINE__-7, __LINE__-5, __LINE__-3].join('|')}):"o =~ t} if $@ + + if r && target.respond_to?(m) + target.__send__(m, *args, &block) + elsif ::Kernel.respond_to?(m, true) + ::Kernel.instance_method(m).bind(self).(*args, &block) + else + super(m, *args, &block) end end @@ -340,11 +337,7 @@ end def Delegator.delegating_block(mid) # :nodoc: lambda do |*args, &block| target = self.__getobj__ - begin - target.__send__(mid, *args, &block) - ensure - $@.delete_if {|t| /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}:/o =~ t} if $@ - end + target.__send__(mid, *args, &block) end end |