Permalink
Browse files

merge revision(s) 38595,38596: [Backport #7607]

	* 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/branches/ruby_1_9_3@38598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 2a9ac6a commit 8e095cea57a5a6d05a1e34654ad4f772c434fbe8 @unak unak committed Dec 25, 2012
Showing with 23 additions and 6 deletions.
  1. +9 −0 ChangeLog
  2. +1 −1 bignum.c
  3. +1 −0 include/ruby/intern.h
  4. +11 −4 thread.c
  5. +1 −1 version.h
View
@@ -1,3 +1,12 @@
+Tue Dec 25 20:40:47 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 09:54:31 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* gc.c (obj_id_to_ref): add a macro to treat Bignum object id.
View
@@ -1628,7 +1628,7 @@ rb_big_eq(VALUE x, VALUE y)
* 68719476736.eql?(68719476736.0) #=> false
*/
-static VALUE
+VALUE
rb_big_eql(VALUE x, VALUE y)
{
if (TYPE(y) != T_BIGNUM) return Qfalse;
@@ -122,6 +122,7 @@ VALUE rb_dbl2big(double);
double rb_big2dbl(VALUE);
VALUE rb_big_cmp(VALUE, VALUE);
VALUE rb_big_eq(VALUE, VALUE);
+VALUE rb_big_eql(VALUE, VALUE);
VALUE rb_big_plus(VALUE, VALUE);
VALUE rb_big_minus(VALUE, VALUE);
VALUE rb_big_mul(VALUE, VALUE);
View
@@ -3855,17 +3855,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 (TYPE(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;
View
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 359
+#define RUBY_PATCHLEVEL 360
#define RUBY_RELEASE_DATE "2012-12-25"
#define RUBY_RELEASE_YEAR 2012

0 comments on commit 8e095ce

Please sign in to comment.