merge revision(s) 57407: [Backport #13145]

	object.c: no TypeError at Symbol

	* object.c (special_object_p): uninterned Symbol also should not
	  raise a TypeError but return itself instead, as well as interned
	  Symbols.  [ruby-core:79216] [Bug #13145]

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

3 files changed, 6 insertions, 1 deletions

diff --git a/object.c b/object.c
index 5f0055fb5a..98d2197c2d 100644
--- a/object.c
+++ b/object.c
@@ -304,6 +304,7 @@ special_object_p(VALUE obj)
     switch (BUILTIN_TYPE(obj)) {
       case T_BIGNUM:
       case T_FLOAT:
+      case T_SYMBOL:
 	return TRUE;
       default:
 	return FALSE;
diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb
index c1721de39c..7c1b98f76e 100644
--- a/test/ruby/test_object.rb
+++ b/test/ruby/test_object.rb
@@ -23,6 +23,8 @@ class TestObject < Test::Unit::TestCase
     assert_equal true, true.dup
     assert_equal nil, nil.dup
     assert_equal false, false.dup
+    x = :x; assert_equal x, x.dup
+    x = "bug13145".intern; assert_equal x, x.dup
     x = 1 << 64; assert_equal x, x.dup
     x = 1.72723e-77; assert_equal x, x.dup
 
@@ -51,6 +53,8 @@ class TestObject < Test::Unit::TestCase
     assert_equal true, true.clone
     assert_equal nil, nil.clone
     assert_equal false, false.clone
+    x = :x; assert_equal x, x.dup
+    x = "bug13145".intern; assert_equal x, x.dup
     x = 1 << 64; assert_equal x, x.clone
     x = 1.72723e-77; assert_equal x, x.clone
     assert_raise(ArgumentError) {1.clone(freeze: false)}
diff --git a/version.h b/version.h
index 56c05cf830..3e752aec8f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-12"
-#define RUBY_PATCHLEVEL 34
+#define RUBY_PATCHLEVEL 35
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3