2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index baa44c9da2..5ccf00f543 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 20 03:46:58 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* array.c: use rb_equal_opt() for performance improvement.
+	           [ruby-core:64954] [Feature #10227]
+
 Sun Sep 21 11:16:56 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (rbtime2vtdate, vtdate2rbtime): fix
diff --git a/array.c b/array.c
index 6b551dbe24..4775472221 100644
--- a/array.c
+++ b/array.c
@@ -3846,9 +3846,15 @@ VALUE
 rb_ary_includes(VALUE ary, VALUE item)
 {
     long i;
+    VALUE e;
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	if (rb_equal(RARRAY_AREF(ary, i), item)) {
+	e = RARRAY_AREF(ary, i);
+	switch (rb_equal_opt(e, item)) {
+	  case Qundef:
+	    if (rb_equal(e, item)) return Qtrue;
+	    break;
+	  case Qtrue:
 	    return Qtrue;
 	}
     }