1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* gc.c (gc_page_sweep): Fix compile warning from last commit.

* hash.c (hash_aset_str): Re-use existing variable to avoid
  unnecessary pointer dereferencing.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tmm1 2013-11-27 06:24:37 +00:00
parent da65a3d906
commit 23178d1044
3 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
Wed Nov 27 15:21:17 2013 Aman Gupta <ruby@tmm1.net>
* gc.c (gc_page_sweep): Fix compile warning from last commit.
* hash.c (hash_aset_str): Re-use existing variable to avoid
unnecessary pointer dereferencing.
Wed Nov 27 15:12:55 2013 Koichi Sasada <ko1@atdot.net> Wed Nov 27 15:12:55 2013 Koichi Sasada <ko1@atdot.net>
* gc.c (gc_page_sweep): disable debug print. * gc.c (gc_page_sweep): disable debug print.

2
gc.c
View file

@ -2745,7 +2745,7 @@ gc_page_sweep(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *sweep_
if (0) fprintf(stderr, "gc_page_sweep(%d): freed?: %d, limt: %d, freed_slots: %d, empty_slots: %d, final_slots: %d\n", if (0) fprintf(stderr, "gc_page_sweep(%d): freed?: %d, limt: %d, freed_slots: %d, empty_slots: %d, final_slots: %d\n",
(int)rb_gc_count(), (int)rb_gc_count(),
final_slots + freed_slots + empty_slots == sweep_page->limit, final_slots + freed_slots + empty_slots == sweep_page->limit,
(int)sweep_page->limit, (int)freed_slots, (int)empty_slots, final_slots); (int)sweep_page->limit, (int)freed_slots, (int)empty_slots, (int)final_slots);
if (heap_pages_deferred_final && !finalizing) { if (heap_pages_deferred_final && !finalizing) {
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();

2
hash.c
View file

@ -1264,7 +1264,7 @@ hash_aset_str(st_data_t *key, st_data_t *val, struct update_arg *arg, int existi
if (!existing) { if (!existing) {
VALUE str = (VALUE)*key; VALUE str = (VALUE)*key;
if (!OBJ_FROZEN(str)) if (!OBJ_FROZEN(str))
*key = rb_fstring((VALUE)*key); *key = rb_fstring(str);
} }
return hash_aset(key, val, arg, existing); return hash_aset(key, val, arg, existing);
} }