From 8833bfbd0bd46809144199fd5d9141e60b4ec3e2 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 25 Sep 2016 07:36:06 +0000
Subject: merge revision(s) 56111: [Backport #12738]

	* array.c (flatten): use rb_obj_class instead of rb_class_of
	  because rb_class_of may return a singleton class.
	  [ruby-dev:49781] [Bug #12738]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 array.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'array.c')

diff --git a/array.c b/array.c
index dd14837b76..729de9c081 100644
--- a/array.c
+++ b/array.c
@@ -4461,7 +4461,7 @@ flatten(VALUE ary, int level, int *modified)
 
     st_free_table(memo);
 
-    RBASIC_SET_CLASS(result, rb_class_of(ary));
+    RBASIC_SET_CLASS(result, rb_obj_class(ary));
     return result;
 }
 
-- 
cgit v1.2.3