From ae1a466401fc056ad91150dae94930e822a4ddd1 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 14 Dec 2013 02:11:37 +0000
Subject: [PATCH] object.c: fix r44189

* object.c (rb_mod_const_get): already interned junk name may be
  valid nested class path.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 ++++-
 object.c  | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 48c4203e74..95d4e1aaae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sat Dec 14 01:31:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Dec 14 11:11:34 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_const_get): already interned junk name may be
+	  valid nested class path.
 
 	* eval.c (rb_rescue2): reuse tags pushed for body proc to protect
 	  rescue proc too.
diff --git a/object.c b/object.c
index fce1ea3c36..a7dd8c6685 100644
--- a/object.c
+++ b/object.c
@@ -2083,12 +2083,14 @@ rb_mod_const_get(int argc, VALUE *argv, VALUE mod)
 	rb_scan_args(argc, argv, "11", &name, &recur);
     }
 
-    id = rb_check_id(&name);
-    if (id) {
+    if (SYMBOL_P(name)) {
+	id = ID2SYM(name);
 	if (!rb_is_const_id(id)) goto wrong_id;
 	return RTEST(recur) ? rb_const_get(mod, id) : rb_const_get_at(mod, id);
     }
 
+    name = StringValue(name);
+
     enc = rb_enc_get(name);
     path = RSTRING_PTR(name);