diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-11-07 01:02:19 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-11-07 01:02:19 +0000 |
commit | 34c4d1e6493b46cbc5532cac35d41eeefdb7fdf7 (patch) | |
tree | ceb0a4577120e6ef7a6db2c060f91662f132df8f | |
parent | e1fe294ec95f41bae2687d5ddaca6d080366bdb2 (diff) |
* eval.c (blk_orphan): a block created in a different thread is
orphan. [ruby-dev:17471]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@3028 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Thu Nov 7 09:51:37 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> + + * eval.c (blk_orphan): a block created in a different thread is + orphan. [ruby-dev:17471] + Wed Nov 8 08:12:17 2002 Yukihiro Matsumoto <matz@ruby-lang.org> * stable version 1.6.8 release candidate. @@ -6381,10 +6381,8 @@ static int blk_orphan(data) struct BLOCK *data; { - if (!(data->scope->flag & SCOPE_NOSTACK)) { - return 0; - } - if ((data->tag->flags & BLOCK_ORPHAN)) { + if ((data->tag->flags & BLOCK_ORPHAN) && + (data->scope->flag & SCOPE_NOSTACK)) { return 1; } if (data->orig_thread != rb_thread_current()) { |