diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:49:00 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:49:00 +0000 |
commit | 67ea4f900a92133164aef310bb57469ed6db3d3d (patch) | |
tree | 270ef0047e6b0e64fdc14d5d6f35024b79959f7f /proc.c | |
parent | af4c9b7a4f0c533051f28f85ed4a949a4e8581c3 (diff) |
merges r20250 from trunk into ruby_1_9_1.
* proc.c (proc_eq): equivalence check should not done by pointer
comparison, but should be based on iseq contents. [ruby-dev:37101]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -666,12 +666,15 @@ proc_eq(VALUE self, VALUE other) } else { if (TYPE(other) == T_DATA && - RBASIC(other)->klass == rb_cProc && - CLASS_OF(self) == CLASS_OF(other)) { + RDATA(other)->dmark == proc_mark) { rb_proc_t *p1, *p2; GetProcPtr(self, p1); GetProcPtr(other, p2); - if (p1->block.iseq == p2->block.iseq && p1->envval == p2->envval) { + if (p1->envval == p2->envval && + p1->block.iseq->iseq_size == p2->block.iseq->iseq_size && + p1->block.iseq->local_size == p2->block.iseq->local_size && + MEMCMP(p1->block.iseq->iseq, p2->block.iseq->iseq, VALUE, + p1->block.iseq->iseq_size) == 0) { return Qtrue; } } |