vm.c: reduce branches for always-set VM fields

thgroup_default, mark_object_ary, load_path, load_path_snapshot,
expanded_load_path, loaded_features, loaded_features_snapshot,
top_self, defined_module_hash are always defined at process startup.

This makes it wasteful to have extra branches in an an effort to
skip the function call to `rb_gc_mark'.

This reduces binary size a small amount on x86-64:

   text	   data	    bss	    dec	    hex	filename
2830738	  22672	  71584	2924994	 2ca1c2	ruby.orig
2830234	  22672	  71584	2924490	 2c9fca	ruby.after

More similar changes coming when I'm bored enough to notice...

* vm.c (rb_vm_mark): reduce branches for always-set VM fields
  (rb_vm_add_root_module): ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 12 insertions, 12 deletions

diff --git a/vm.c b/vm.c
index 06719ad55b..36d5c8b42a 100644
--- a/vm.c
+++ b/vm.c
@@ -1816,17 +1816,17 @@ rb_vm_mark(void *ptr)
 	list_for_each(&vm->living_threads, th, vmlt_node) {
 	    rb_gc_mark(th->self);
 	}
-	RUBY_MARK_UNLESS_NULL(vm->thgroup_default);
-	RUBY_MARK_UNLESS_NULL(vm->mark_object_ary);
-	RUBY_MARK_UNLESS_NULL(vm->load_path);
-	RUBY_MARK_UNLESS_NULL(vm->load_path_snapshot);
+	rb_gc_mark(vm->thgroup_default);
+	rb_gc_mark(vm->mark_object_ary);
+	rb_gc_mark(vm->load_path);
+	rb_gc_mark(vm->load_path_snapshot);
 	RUBY_MARK_UNLESS_NULL(vm->load_path_check_cache);
-	RUBY_MARK_UNLESS_NULL(vm->expanded_load_path);
-	RUBY_MARK_UNLESS_NULL(vm->loaded_features);
-	RUBY_MARK_UNLESS_NULL(vm->loaded_features_snapshot);
-	RUBY_MARK_UNLESS_NULL(vm->top_self);
+	rb_gc_mark(vm->expanded_load_path);
+	rb_gc_mark(vm->loaded_features);
+	rb_gc_mark(vm->loaded_features_snapshot);
+	rb_gc_mark(vm->top_self);
 	RUBY_MARK_UNLESS_NULL(vm->coverages);
-	RUBY_MARK_UNLESS_NULL(vm->defined_module_hash);
+	rb_gc_mark(vm->defined_module_hash);
 
 	if (vm->loading_table) {
 	    rb_mark_tbl(vm->loading_table);
@@ -1858,9 +1858,9 @@ int
 rb_vm_add_root_module(ID id, VALUE module)
 {
     rb_vm_t *vm = GET_VM();
-    if (vm->defined_module_hash) {
-	rb_hash_aset(vm->defined_module_hash, ID2SYM(id), module);
-    }
+
+    rb_hash_aset(vm->defined_module_hash, ID2SYM(id), module);
+
     return TRUE;
 }