From 514c11b6ef4d6c401e375d68ce7de782510968f3 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 3 Jan 2017 08:40:51 +0000
Subject: [PATCH 1/3] forwardable.rb: use defined?

* lib/forwardable.rb (_delegator_method): use defined? operator
  instead of binding and calling unbound Kernel#respond_to?.  a
  remedy for an performance bottleneck.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/forwardable.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index 0c04fb3a274fba..cc5ac15001218b 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -131,7 +131,7 @@ class << self
   #
   def instance_delegate(hash)
     hash.each{ |methods, accessor|
-      methods = [methods] unless methods.respond_to?(:each)
+      methods = [methods] unless defined?(methods.each)
       methods.each{ |method|
         def_instance_delegator(accessor, method)
       }
@@ -204,7 +204,7 @@ def self._delegator_method(obj, accessor, method, ali)
       mesg = "#{Module === obj ? obj : obj.class}\##{ali} at #{loc.path}:#{loc.lineno} forwarding to private method "
       method_call = "#{<<-"begin;"}\n#{<<-"end;".chomp}"
         begin;
-          unless ::Kernel.instance_method(:respond_to?).bind(_).call(:"#{method}")
+          unless defined? _.#{method}
             ::Kernel.warn "\#{caller_locations(1)[0]}: "#{mesg.dump}"\#{_.class}"'##{method}'
             _#{method_call}
           else
@@ -262,7 +262,7 @@ module SingleForwardable
   #
   def single_delegate(hash)
     hash.each{ |methods, accessor|
-      methods = [methods] unless methods.respond_to?(:each)
+      methods = [methods] unless defined?(methods.each)
       methods.each{ |method|
         def_single_delegator(accessor, method)
       }

From 8682fc7cbf0d46b45f3b358c213a67c6f231c5e2 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 3 Jan 2017 09:35:26 +0000
Subject: [PATCH 2/3] forwardable.rb: use defined?

* lib/forwardable.rb (_delegator_method): use defined? operator
  instead of binding and calling unbound Kernel#respond_to?.  a
  remedy for an performance bottleneck.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/forwardable.rb | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index cc5ac15001218b..ef2cf743702920 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -130,12 +130,13 @@ class << self
   #    delegate [method, method, ...] => accessor
   #
   def instance_delegate(hash)
-    hash.each{ |methods, accessor|
-      methods = [methods] unless defined?(methods.each)
-      methods.each{ |method|
-        def_instance_delegator(accessor, method)
-      }
-    }
+    hash.each do |methods, accessor|
+      if defined?(methods.each)
+        def_instance_delegator(accessor, methods)
+      else
+        methods.each {|method| def_instance_delegator(accessor, method)}
+      end
+    end
   end
 
   #
@@ -261,12 +262,13 @@ module SingleForwardable
   #    delegate [method, method, ...] => accessor
   #
   def single_delegate(hash)
-    hash.each{ |methods, accessor|
-      methods = [methods] unless defined?(methods.each)
-      methods.each{ |method|
-        def_single_delegator(accessor, method)
-      }
-    }
+    hash.each do |methods, accessor|
+      if defined?(methods.each)
+        def_single_delegator(accessor, methods)
+      else
+        methods.each {|method| def_single_delegator(accessor, method)}
+      end
+    end
   end
 
   #

From f3229e37b9a22d33ef07f906e7d7971d5e76ef85 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 3 Jan 2017 09:47:16 +0000
Subject: [PATCH 3/3] forwardable.rb: fix branches

* lib/forwardable.rb (instance_delegate, single_delegate): fix
  inverted branches.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/forwardable.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index ef2cf743702920..3662f56011cb1f 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -131,7 +131,7 @@ class << self
   #
   def instance_delegate(hash)
     hash.each do |methods, accessor|
-      if defined?(methods.each)
+      unless defined?(methods.each)
         def_instance_delegator(accessor, methods)
       else
         methods.each {|method| def_instance_delegator(accessor, method)}
@@ -263,7 +263,7 @@ module SingleForwardable
   #
   def single_delegate(hash)
     hash.each do |methods, accessor|
-      if defined?(methods.each)
+      unless defined?(methods.each)
         def_single_delegator(accessor, methods)
       else
         methods.each {|method| def_single_delegator(accessor, method)}