2 files changed, 28 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b4aaa4c65e..db1cb63340 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Mon Aug 19 20:55:12 2013  Koichi Sasada  <[email protected]>
+
+	* gc.c: fix around GC_DEBUG.
+
+	* gc.c (RVALUE::line): should be VALUE. On some environment
+	  (such as mswin64), `int' introduces alignment mismatch.
+
+	* gc.c (newobj_of): add an assertion to check VALUE alignment.
+
+	* gc.c (aligned_malloc): `&' is low priority than `=='.
+
+	* gc.c: define GC_DEBUG everytime and use it as value 0 or 1.
+
 Mon Aug 19 17:43:44 2013  Koichi Sasada  <[email protected]>
 
 	* test/ruby/test_fiber.rb: collect garbage fibers immediately.
diff --git a/gc.c b/gc.c
index 52b8aa7417..3486e51b2c 100644
--- a/gc.c
+++ b/gc.c
@@ -90,6 +90,13 @@ static ruby_gc_params_t initial_params = {
 #endif
 };
 
+/* GC_DEBUG:
+ *  enable to embed GC debugging information.
+ */
+#ifndef GC_DEBUG
+#define GC_DEBUG 0
+#endif
+
 #if USE_RGENGC
 /* RGENGC_DEBUG:
  * 1: basic information
@@ -230,9 +237,9 @@ typedef struct RVALUE {
 	    VALUE v3;
 	} values;
     } as;
-#ifdef GC_DEBUG
+#if GC_DEBUG
     const char *file;
-    int   line;
+    VALUE line;
 #endif
 } RVALUE;
 
@@ -979,9 +986,10 @@ newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3)
     RANY(obj)->as.values.v2 = v2;
     RANY(obj)->as.values.v3 = v3;
 
-#ifdef GC_DEBUG
+#if GC_DEBUG
     RANY(obj)->file = rb_sourcefile();
     RANY(obj)->line = rb_sourceline();
+    assert(!SPECIAL_CONST_P(obj)); /* check alignment */
 #endif
 
 #if RGENGC_PROFILE
@@ -3339,7 +3347,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
 	break;
 
       default:
-#ifdef GC_DEBUG
+#if GC_DEBUG
 	rb_gcdebug_print_obj_condition((VALUE)obj);
 #endif
 	if (BUILTIN_TYPE(obj) == T_NONE)   rb_bug("rb_gc_mark(): %p is T_NONE", (void *)obj);
@@ -4619,9 +4627,9 @@ aligned_malloc(size_t alignment, size_t size)
     res = (void*)aligned;
 #endif
 
-#if defined(_DEBUG) || defined(GC_DEBUG)
+#if defined(_DEBUG) || GC_DEBUG
     /* alignment must be a power of 2 */
-    assert((alignment - 1) & alignment == 0);
+    assert(((alignment - 1) & alignment) == 0);
     assert(alignment % sizeof(void*) == 0);
 #endif
     return res;
@@ -5640,7 +5648,7 @@ obj_type_name(VALUE obj)
     return type_name(TYPE(obj), obj);
 }
 
-#ifdef GC_DEBUG
+#if GC_DEBUG
 
 void
 rb_gcdebug_print_obj_condition(VALUE obj)