* insns.def (defineclass), vm_insnhelper.c (vm_get_cvar_base): see

  also inherited constants for classes without superclass and
  modules.  [ruby-core:37698] [Bug #3423]


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

5 files changed, 39 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index c5c3b62c05..58c5477271 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep  1 17:31:22 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (defineclass), vm_insnhelper.c (vm_get_cvar_base): see
+	  also inherited constants for classes without superclass and
+	  modules.  [ruby-core:37698] [Bug #3423]
+
 Thu Sep  1 16:18:44 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
 
 	* Release GVL while OpenSSL's public key generation.
diff --git a/insns.def b/insns.def
index 32cb650b16..13fc8d89f6 100644
--- a/insns.def
+++ b/insns.def
@@ -895,6 +895,7 @@ defineclass
 (VALUE val)
 {
     VALUE klass;
+    int newclass = 1;
 
     switch ((int)define_type) {
       case 0: /* scoped:   class Foo::Bar */
@@ -903,15 +904,16 @@ defineclass
 
 	if (super == Qnil) {
 	    super = rb_cObject;
+	    newclass = 0;
 	}
 
 	vm_check_if_namespace(cbase);
 
 	/* find klass */
 	rb_autoload_load(cbase, id);
-	if (rb_const_defined_at(cbase, id)) {
+	if (vm_const_defined_at(cbase, id, newclass)) {
 	    /* already exist */
-	    klass = define_type == 0 ? rb_public_const_get(cbase, id) : rb_const_get_at(cbase, id);
+	    klass = define_type == 0 ? rb_public_const_get(cbase, id) : rb_const_get_from(cbase, id);
 	    if (TYPE(klass) != T_CLASS) {
 		rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
 	    }
@@ -947,8 +949,8 @@ defineclass
 	vm_check_if_namespace(cbase);
 
 	/* find klass */
-	if (rb_const_defined_at(cbase, id)) {
-	    klass = define_type == 2 ? rb_public_const_get(cbase, id) : rb_const_get_at(cbase, id);
+	if (vm_const_defined_at(cbase, id, 0)) {
+	    klass = define_type == 2 ? rb_public_const_get(cbase, id) : rb_const_get_from(cbase, id);
 	    /* already exist */
 	    if (TYPE(klass) != T_MODULE) {
 		rb_raise(rb_eTypeError, "%s is not a module", rb_id2name(id));
diff --git a/test/ruby/test_autoload.rb b/test/ruby/test_autoload.rb
index a3a4c5df1a..2b37e44c3f 100644
--- a/test/ruby/test_autoload.rb
+++ b/test/ruby/test_autoload.rb
@@ -140,7 +140,9 @@ p Foo::Bar
       t = Thread.new { AutoloadTest }
       sleep 0.1
       # override it
-      eval %q(AutoloadTest = 1)
+      EnvUtil.suppress_warning {
+        eval %q(AutoloadTest = 1)
+      }
       t.join
       assert_equal(1, AutoloadTest)
     ensure
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index a51681d29b..7ba71852db 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -545,6 +545,20 @@ class TestModule < Test::Unit::TestCase
     INPUT
   end
 
+  def test_const_in_module
+    bug3423 = '[ruby-core:37698]'
+    assert_in_out_err([], <<-INPUT, %w[ok], [], bug3423)
+module LangModuleSpecInObject
+  module LangModuleTop
+  end
+end
+include LangModuleSpecInObject
+module LangModuleTop
+end
+puts "ok" if LangModuleSpecInObject::LangModuleTop == LangModuleTop
+INPUT
+  end
+
   def test_class_variable_get
     c = Class.new
     c.class_eval('@@foo = :foo')
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index e79d4a092d..91c335c99b 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1253,6 +1253,16 @@ vm_get_cvar_base(NODE *cref)
     return klass;
 }
 
+static int
+vm_const_defined_at(VALUE cbase, ID id, int newclass)
+{
+    int ret = rb_const_defined_at(cbase, id);
+    if (!ret && !newclass) {
+	while ((cbase = RCLASS_SUPER(cbase)) != 0 && cbase != rb_cObject &&
+	       !(ret = rb_const_defined_at(cbase, id)));
+    }
+    return ret;
+}
 
 #ifndef USE_IC_FOR_IVAR
 #define USE_IC_FOR_IVAR 1