* 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
This commit is contained in:
parent
270fbd9c05
commit
a3d9672407
@ -1,3 +1,12 @@
|
|||||||
|
Tue Dec 25 19:09:51 2012 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
|
* 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]
|
||||||
|
|
||||||
Tue Dec 25 18:53:35 2012 Koichi Sasada <ko1@atdot.net>
|
Tue Dec 25 18:53:35 2012 Koichi Sasada <ko1@atdot.net>
|
||||||
|
|
||||||
* vm_core.h, eval_intern.h (CHECK_STACK_OVERFLOW): move
|
* vm_core.h, eval_intern.h (CHECK_STACK_OVERFLOW): move
|
||||||
|
2
bignum.c
2
bignum.c
@ -1710,7 +1710,7 @@ rb_big_eq(VALUE x, VALUE y)
|
|||||||
* 68719476736.eql?(68719476736.0) #=> false
|
* 68719476736.eql?(68719476736.0) #=> false
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static VALUE
|
VALUE
|
||||||
rb_big_eql(VALUE x, VALUE y)
|
rb_big_eql(VALUE x, VALUE y)
|
||||||
{
|
{
|
||||||
if (!RB_TYPE_P(y, T_BIGNUM)) return Qfalse;
|
if (!RB_TYPE_P(y, T_BIGNUM)) return Qfalse;
|
||||||
|
@ -124,6 +124,7 @@ VALUE rb_dbl2big(double);
|
|||||||
double rb_big2dbl(VALUE);
|
double rb_big2dbl(VALUE);
|
||||||
VALUE rb_big_cmp(VALUE, VALUE);
|
VALUE rb_big_cmp(VALUE, VALUE);
|
||||||
VALUE rb_big_eq(VALUE, VALUE);
|
VALUE rb_big_eq(VALUE, VALUE);
|
||||||
|
VALUE rb_big_eql(VALUE, VALUE);
|
||||||
VALUE rb_big_plus(VALUE, VALUE);
|
VALUE rb_big_plus(VALUE, VALUE);
|
||||||
VALUE rb_big_minus(VALUE, VALUE);
|
VALUE rb_big_minus(VALUE, VALUE);
|
||||||
VALUE rb_big_mul(VALUE, VALUE);
|
VALUE rb_big_mul(VALUE, VALUE);
|
||||||
|
17
thread.c
17
thread.c
@ -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.
|
* in the recursion list.
|
||||||
* Assumes the recursion list is valid.
|
* Assumes the recursion list is valid.
|
||||||
*/
|
*/
|
||||||
@ -4607,17 +4607,24 @@ recursive_list_access(void)
|
|||||||
static VALUE
|
static VALUE
|
||||||
recursive_check(VALUE list, VALUE obj_id, VALUE paired_obj_id)
|
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);
|
VALUE pair_list = rb_hash_lookup2(list, obj_id, Qundef);
|
||||||
if (pair_list == Qundef)
|
if (pair_list == Qundef)
|
||||||
return Qfalse;
|
return Qfalse;
|
||||||
if (paired_obj_id) {
|
if (paired_obj_id) {
|
||||||
if (!RB_TYPE_P(pair_list, T_HASH)) {
|
if (!RB_TYPE_P(pair_list, T_HASH)) {
|
||||||
if (pair_list != paired_obj_id)
|
if (!OBJ_ID_EQL(paired_obj_id, pair_list))
|
||||||
return Qfalse;
|
return Qfalse;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (NIL_P(rb_hash_lookup(pair_list, paired_obj_id)))
|
if (NIL_P(rb_hash_lookup(pair_list, paired_obj_id)))
|
||||||
return Qfalse;
|
return Qfalse;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Qtrue;
|
return Qtrue;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user