aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--vm_insnhelper.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fbe2ded9ee..b44711b5fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 */