diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-25 10:14:12 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-25 10:14:12 +0000 |
commit | a3d9672407b77c2a26af7e15a82d1f91e762b602 (patch) | |
tree | c452c7e48500290f6819a72f00511214492f31e2 /thread.c | |
parent | 270fbd9c058fc2a36dc7c44243f4a20c91143481 (diff) | |
download | ruby-a3d9672407b77c2a26af7e15a82d1f91e762b602.tar.gz |
* bignum.c, include/ruby/intern.h (rb_big_eql): exported.
* thread.c (recursive_check): object_id maybe a Bignum, not Fixnum on
LLP64. see also r38493 and r38548.
reported by Heesob Park at [ruby-core:51083] [Bug #7607], and patched
by shirosaki at [ruby-core:51095]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -4599,7 +4599,7 @@ recursive_list_access(void) } /* - * Returns Qtrue iff obj_id (or the pair <obj, paired_obj>) is already + * Returns Qtrue if obj_id (or the pair <obj, paired_obj>) is already * in the recursion list. * Assumes the recursion list is valid. */ @@ -4607,17 +4607,24 @@ recursive_list_access(void) static VALUE recursive_check(VALUE list, VALUE obj_id, VALUE paired_obj_id) { +#if SIZEOF_LONG == SIZEOF_VOIDP + #define OBJ_ID_EQL(obj_id, other) ((obj_id) == (other)) +#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP + #define OBJ_ID_EQL(obj_id, other) (RB_TYPE_P((obj_id), T_BIGNUM) ? \ + rb_big_eql((obj_id), (other)) : ((obj_id) == (other))) +#endif + VALUE pair_list = rb_hash_lookup2(list, obj_id, Qundef); if (pair_list == Qundef) return Qfalse; if (paired_obj_id) { if (!RB_TYPE_P(pair_list, T_HASH)) { - if (pair_list != paired_obj_id) - return Qfalse; + if (!OBJ_ID_EQL(paired_obj_id, pair_list)) + return Qfalse; } else { - if (NIL_P(rb_hash_lookup(pair_list, paired_obj_id))) - return Qfalse; + if (NIL_P(rb_hash_lookup(pair_list, paired_obj_id))) + return Qfalse; } } return Qtrue; |