2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 01c7c97d4f..6386d3876a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun 11 15:53:31 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* method.h (METHOD_ENTRY_BASIC_SET): should clear last bit.
+
 Thu Jun 11 14:34:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
 	* lib/rubygems.rb: bump version to 2.4.7 and 2.4.8. these versions fixed
diff --git a/method.h b/method.h
index db4ea9350f..141e6485bc 100644
--- a/method.h
+++ b/method.h
@@ -67,7 +67,7 @@ static inline void
 METHOD_ENTRY_BASIC_SET(rb_method_entry_t *me, int basic)
 {
     VM_ASSERT(basic <= 1);
-    me->flags = me->flags | (basic << (IMEMO_FL_USHIFT+2));
+    me->flags = (me->flags & ~(IMEMO_FL_USER2                  ) | (basic << (IMEMO_FL_USHIFT+2));
 }
 static inline void
 METHOD_ENTRY_SAFE_SET(rb_method_entry_t *me, int safe)