merge revision(s) 41175: [Backport #8502]

	* class.c (include_modules_at): invalidate method cache if included
	  module contains constants

	* test/ruby/test_module.rb: add test


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

1 files changed, 2 insertions, 0 deletions

diff --git a/class.c b/class.c
index f9f5dd84c2..25e732ac2e 100644
--- a/class.c
+++ b/class.c
@@ -761,6 +761,8 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module)
 	}
 	if (RMODULE_M_TBL(module) && RMODULE_M_TBL(module)->num_entries)
 	    changed = 1;
+	if (RMODULE_CONST_TBL(module) && RMODULE_CONST_TBL(module)->num_entries)
+	    changed = 1;
       skip:
 	module = RCLASS_SUPER(module);
     }