diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | enum.c | 18 |
2 files changed, 17 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Sat Jul 4 14:38:43 2015 Eric Wong <[email protected]> + + * enum.c (zip_ary): remove volatile, use RB_GC_GUARD + (zip_i): ditto + Sat Jul 4 10:42:57 2015 Nobuyoshi Nakada <[email protected]> * lib/rubygems/test_case.rb (teardown): do not delete features @@ -2350,10 +2350,10 @@ static VALUE zip_ary(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval)) { struct MEMO *memo = (struct MEMO *)memoval; - volatile VALUE result = memo->v1; - volatile VALUE args = memo->v2; + VALUE result = memo->v1; + VALUE args = memo->v2; long n = memo->u3.cnt++; - volatile VALUE tmp; + VALUE tmp; int i; tmp = rb_ary_new2(RARRAY_LEN(args) + 1); @@ -2374,6 +2374,9 @@ zip_ary(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval)) else { rb_ary_push(result, tmp); } + + RB_GC_GUARD(args); + return Qnil; } @@ -2393,9 +2396,9 @@ static VALUE zip_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval)) { struct MEMO *memo = (struct MEMO *)memoval; - volatile VALUE result = memo->v1; - volatile VALUE args = memo->v2; - volatile VALUE tmp; + VALUE result = memo->v1; + VALUE args = memo->v2; + VALUE tmp; int i; tmp = rb_ary_new2(RARRAY_LEN(args) + 1); @@ -2422,6 +2425,9 @@ zip_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval)) else { rb_ary_push(result, tmp); } + + RB_GC_GUARD(args); + return Qnil; } |