diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-18 04:35:25 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-18 04:35:25 +0000 |
commit | 20685cdc85ff218093194176a20b9568c98254e7 (patch) | |
tree | 173c7711b791dbd6cca60d7448094e968d8e8f88 /gc.c | |
parent | 593d9786464c94db9c776a5a968dcf65cbc1d9d4 (diff) | |
download | ruby-20685cdc85ff218093194176a20b9568c98254e7.tar.gz |
Get rid of shadowing local variables
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -5202,11 +5202,13 @@ gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj) int zombie_objects = 0; for (i=0; i<page->total_slots; i++) { - VALUE obj = (VALUE)&page->start[i]; - if (RBASIC(obj) == 0) free_objects++; - if (BUILTIN_TYPE(obj) == T_ZOMBIE) zombie_objects++; - if (RVALUE_PAGE_UNCOLLECTIBLE(page, obj) && RVALUE_PAGE_WB_UNPROTECTED(page, obj)) has_remembered_shady = TRUE; - if (RVALUE_PAGE_MARKING(page, obj)) { + VALUE val = (VALUE)&page->start[i]; + if (RBASIC(val) == 0) free_objects++; + if (BUILTIN_TYPE(val) == T_ZOMBIE) zombie_objects++; + if (RVALUE_PAGE_UNCOLLECTIBLE(page, val) && RVALUE_PAGE_WB_UNPROTECTED(page, val)) { + has_remembered_shady = TRUE; + } + if (RVALUE_PAGE_MARKING(page, val)) { has_remembered_old = TRUE; rememberd_old_objects++; } @@ -5216,9 +5218,9 @@ gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj) page->flags.has_remembered_objects == FALSE && has_remembered_old == TRUE) { for (i=0; i<page->total_slots; i++) { - VALUE obj = (VALUE)&page->start[i]; - if (RVALUE_PAGE_MARKING(page, obj)) { - fprintf(stderr, "marking -> %s\n", obj_info(obj)); + VALUE val = (VALUE)&page->start[i]; + if (RVALUE_PAGE_MARKING(page, val)) { + fprintf(stderr, "marking -> %s\n", obj_info(val)); } } rb_bug("page %p's has_remembered_objects should be false, but there are remembered old objects (%d). %s", |