nobu	2015-09-07 16:50:11 +0900 (Mon, 07 Sep 2015)

  New Revision: 51782

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

  Log:
    vm_core.h: objspace always
    
    * vm_core.h (rb_vm_struct): define objspace always regardless
      ENABLE_VM_OBJSPACE.

  Modified files:
    trunk/ChangeLog
    trunk/gc.c
    trunk/vm.c
    trunk/vm_core.h
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 51781)
+++ ChangeLog	(revision 51782)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Sep  7 16:50:07 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm_core.h (rb_vm_struct): define objspace always regardless
+	  ENABLE_VM_OBJSPACE.
+
+Mon Sep  7 16:49:30 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm_core.h (rb_vm_struct): define objspace always regardless
+	  ENABLE_VM_OBJSPACE.
+
 Mon Sep  7 15:54:58 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby_atomic.h (ATOMIC_VALUE_CAS): fix typo.
Index: vm_core.h
===================================================================
--- vm_core.h	(revision 51781)
+++ vm_core.h	(revision 51782)
@@ -409,10 +409,9 @@ enum ruby_basic_operators { https://github.com/ruby/ruby/blob/trunk/vm_core.h#L409
 #define GetVMPtr(obj, ptr) \
   GetCoreDataFromValue((obj), rb_vm_t, (ptr))
 
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
 struct rb_objspace;
+struct rb_objspace *rb_objspace_alloc(void);
 void rb_objspace_free(struct rb_objspace *);
-#endif
 
 typedef struct rb_hook_list_struct {
     struct rb_event_hook_struct *hooks;
@@ -476,9 +475,7 @@ typedef struct rb_vm_struct { https://github.com/ruby/ruby/blob/trunk/vm_core.h#L475
 
     VALUE defined_module_hash;
 
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
     struct rb_objspace *objspace;
-#endif
 
     /*
      * @shyouhei notes that this is not for storing normal Ruby
Index: gc.c
===================================================================
--- gc.c	(revision 51781)
+++ gc.c	(revision 51782)
@@ -184,9 +184,7 @@ static ruby_gc_params_t gc_params = { https://github.com/ruby/ruby/blob/trunk/gc.c#L184
     GC_OLDMALLOC_LIMIT_MIN,
     GC_OLDMALLOC_LIMIT_MAX,
     GC_OLDMALLOC_LIMIT_GROWTH_FACTOR,
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
     FALSE,
-#endif
 };
 
 /* GC_DEBUG:
@@ -1267,9 +1265,7 @@ rb_objspace_alloc(void) https://github.com/ruby/ruby/blob/trunk/gc.c#L1265
 
     return objspace;
 }
-#endif
 
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
 static void free_stack_chunks(mark_stack_t *);
 static void heap_page_free(rb_objspace_t *objspace, struct heap_page *page);
 
Index: vm.c
===================================================================
--- vm.c	(revision 51781)
+++ vm.c	(revision 51782)
@@ -2784,10 +2784,6 @@ rb_vm_set_progname(VALUE filename) https://github.com/ruby/ruby/blob/trunk/vm.c#L2784
     RB_OBJ_WRITE(cfp->iseq, &cfp->iseq->body->location.path, filename);
 }
 
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
-struct rb_objspace *rb_objspace_alloc(void);
-#endif
-
 extern const struct st_hash_type rb_fstring_hash_type;
 
 void

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