diff options
author | wanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-11 09:33:37 +0000 |
---|---|---|
committer | wanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-11 09:33:37 +0000 |
commit | 760f0b06476729184aec1715d8da21788e9c8be1 (patch) | |
tree | adef7687a9ff39ac9652ec001c4645391156fb60 | |
parent | a3973ab1ba9fe5b836553ba39522307e29929976 (diff) | |
download | ruby-760f0b06476729184aec1715d8da21788e9c8be1.tar.gz |
* vm_insnhelper.h (GET_BLOCK_PTR): return 0 when in class frame.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | vm_insnhelper.h | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Mon Jan 11 18:16:38 2010 wanabe <s.wanabe@gmail.com> + + * vm_insnhelper.h (GET_BLOCK_PTR): return 0 when in class frame. + Mon Jan 11 16:52:05 2010 NARUSE, Yui <naruse@ruby-lang.org> * string.c (rb_str_strlen): added. [ruby-dev:40028] diff --git a/vm_insnhelper.h b/vm_insnhelper.h index 79eb8856ff..095b4170e0 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -168,7 +168,8 @@ extern VALUE ruby_vm_const_missing_count; } while (0) #define GET_BLOCK_PTR() \ - ((rb_block_t *)(GC_GUARDED_PTR_REF(GET_LFP()[0]))) + ((rb_block_t *)(GC_GUARDED_PTR_REF(GET_LFP()[0] & \ + ((GET_LFP()[0] & 0x02) - 0x02)))) /**********************************************************/ /* deal with control flow 3: exception */ |