From 5421cea25246b62fd86700777aa21469629a98b0 Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 11 Jun 2015 06:54:49 +0000 Subject: * method.h (METHOD_ENTRY_BASIC_SET): should clear last bit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ method.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * method.h (METHOD_ENTRY_BASIC_SET): should clear last bit. + Thu Jun 11 14:34:45 2015 SHIBATA Hiroshi * 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) -- cgit v1.2.3