aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-15 07:59:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-15 07:59:33 +0000
commit1be7c799e6ed39f7ac41906c05db149e8c391add (patch)
tree2ab44f11d701eac5dd9a3b60390d816d4f180f29
parent3f3a0fcc8e8fa2bfdf06efca7a11ddc88957d170 (diff)
downloadruby-1be7c799e6ed39f7ac41906c05db149e8c391add.tar.gz
* vm_core.h (exec_event_hooks): skips RubyVM::FrozenCore.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--vm_core.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9760eb3b68..949050ece4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Fri Aug 15 15:30:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Aug 15 16:59:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_core.h (exec_event_hooks): skips RubyVM::FrozenCore.
* vm.c (Init_VM): get rid of SEGV in a trace proc.
diff --git a/vm_core.h b/vm_core.h
index 829ac4593e..2e8462422b 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -714,6 +714,7 @@ void rb_thread_execute_interrupts(rb_thread_t *);
static inline void
exec_event_hooks(rb_event_hook_t *hook, rb_event_flag_t flag, VALUE self, ID id, VALUE klass)
{
+ if (self == rb_mRubyVMFrozenCore) return;
while (hook) {
if (flag & hook->flag) {
(*hook->func)(flag, hook->data, self, id, klass);