usa	2012-12-25 10:01:33 +0900 (Tue, 25 Dec 2012)

  New Revision: 38588

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38588

  Log:
    merge revision(s) 38548:
    
    * gc.c (obj_id_to_ref): add a macro to treat Bignum object id.
      This follows the change r38493.
    
    * gc.c (id2ref): fix for working fine with Bignum object id on x64
      Windows.
    
    * gc.c (wmap_finalize): ditto.

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/gc.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 38587)
+++ ruby_1_9_3/ChangeLog	(revision 38588)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Tue Dec 25 09:54:31 2012  Hiroshi Shirosaki  <h.shirosaki@g...>
+
+	* gc.c (obj_id_to_ref): add a macro to treat Bignum object id.
+	  This follows the change r38493.
+
+	* gc.c (id2ref): fix for working fine with Bignum object id on x64
+	  Windows.
+	* gc.c (wmap_finalize): ditto.
+
 Sat Dec 22 00:33:28 2012  NAKAMURA Usaku  <usa@r...>
 
 	* object.c (rb_obj_hash): shouldn't assume object_id can be long.
Index: ruby_1_9_3/gc.c
===================================================================
--- ruby_1_9_3/gc.c	(revision 38587)
+++ ruby_1_9_3/gc.c	(revision 38588)
@@ -101,8 +101,11 @@ ruby_gc_params_t initial_params = { https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/gc.c#L101
 
 #if SIZEOF_LONG == SIZEOF_VOIDP
 # define nonspecial_obj_id(obj) (VALUE)((SIGNED_VALUE)(obj)|FIXNUM_FLAG)
+# define obj_id_to_ref(objid) ((objid) ^ FIXNUM_FLAG) /* unset FIXNUM_FLAG */
 #elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
 # define nonspecial_obj_id(obj) LL2NUM((SIGNED_VALUE)(obj) / 2)
+# define obj_id_to_ref(objid) (FIXNUM_P(objid) ? \
+   ((objid) ^ FIXNUM_FLAG) : (NUM2PTR(objid) << 1))
 #else
 # error not supported
 #endif
@@ -3208,7 +3211,7 @@ id2ref(VALUE obj, VALUE objid) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/gc.c#L3211
     if (ptr == Qfalse) return Qfalse;
     if (ptr == Qnil) return Qnil;
     if (FIXNUM_P(ptr)) return (VALUE)ptr;
-    ptr = objid ^ FIXNUM_FLAG;	/* unset FIXNUM_FLAG */
+    ptr = obj_id_to_ref(objid);
 
     if ((ptr % sizeof(RVALUE)) == (4 << 2)) {
         ID symid = ptr / sizeof(RVALUE);
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38587)
+++ ruby_1_9_3/version.h	(revision 38588)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 358
+#define RUBY_PATCHLEVEL 359
 
-#define RUBY_RELEASE_DATE "2012-12-22"
+#define RUBY_RELEASE_DATE "2012-12-25"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 25
 
 #include "ruby/version.h"
 

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r38548


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/