nagachika	2011-12-08 23:47:19 +0900 (Thu, 08 Dec 2011)

  New Revision: 33987

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33987

  Log:
    * variable.c (set_const_visibility): clear inine-cache when constant's
      visibility is modified. [ruby-dev:44929]
    
    * test/ruby/test_module.rb (test_private_constants_clear_inlinecache):
      add test for it.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_module.rb
    trunk/variable.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33986)
+++ ChangeLog	(revision 33987)
@@ -1,3 +1,11 @@
+Thu Dec  8 23:38:24 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* variable.c (set_const_visibility): clear inine-cache when constant's
+	  visibility is modified. [ruby-dev:44929]
+
+	* test/ruby/test_module.rb (test_private_constants_clear_inlinecache):
+	  add test for it.
+
 Thu Dec  8 23:26:11 2011  NAKAMURA Usaku  <usa@r...>
 
 	* ext/extmk.rb (extract_makefile): should sort after map, not before
Index: variable.c
===================================================================
--- variable.c	(revision 33986)
+++ variable.c	(revision 33987)
@@ -2119,13 +2119,19 @@
 	VALUE val = argv[i];
 	id = rb_check_id(&val);
 	if (!id) {
+	    if ( i > 0 )
+		rb_clear_cache_by_class(mod);
 	    rb_name_error_str(val, "constant %s::%s not defined", rb_class2name(mod), RSTRING_PTR(val));
 	}
-	if (RCLASS_CONST_TBL(mod) && st_lookup(RCLASS_CONST_TBL(mod), (st_data_t)id, &v)) {
+	if (RCLASS_CONST_TBL(mod) &&
+	    st_lookup(RCLASS_CONST_TBL(mod), (st_data_t)id, &v)) {
 	    ((rb_const_entry_t*)v)->flag = flag;
-	    continue;
 	}
-	rb_name_error(id, "constant %s::%s not defined", rb_class2name(mod), rb_id2name(id));
+	else {
+	    if ( i > 0 )
+		rb_clear_cache_by_class(mod);
+	    rb_name_error(id, "constant %s::%s not defined", rb_class2name(mod), rb_id2name(id));
+	}
     }
     rb_clear_cache_by_class(mod);
 }
Index: test/ruby/test_module.rb
===================================================================
--- test/ruby/test_module.rb	(revision 33986)
+++ test/ruby/test_module.rb	(revision 33987)
@@ -1130,6 +1130,27 @@
     assert_in_out_err([], src, %w(Object :ok), [])
   end
 
+  def test_private_constants_clear_inlinecache
+    bug5702 = '[ruby-dev:44929]'
+    src = <<-INPUT
+    class A
+      C = :Const
+      def self.get_C
+        A::C
+      end
+      # fill cache
+      A.get_C
+      private_constant :C, :D rescue nil
+      begin
+        A.get_C
+      rescue NameError
+        puts "A.get_C"
+      end
+    end
+    INPUT
+    assert_in_out_err([], src, %w(A.get_C), [], bug5702)
+  end
+
   def test_constant_lookup_in_method_defined_by_class_eval
     src = <<-INPUT
       class A

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/