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

Initialize memo pointer and use it consistently to silence gcc 7+

Browse source
This commit is contained in:
Nobuyoshi Nakada 2020-08-01 14:48:04 +09:00
parent 32bec658c1
commit b6e6807993
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
array.c
View file

@ -6931,7 +6931,7 @@ flatten(VALUE ary, int level)
{ {
long i; long i;
VALUE stack, result, tmp = 0, elt, vmemo; VALUE stack, result, tmp = 0, elt, vmemo;
st_table *memo; st_table *memo = 0;
st_data_t id; st_data_t id;
for (i = 0; i < RARRAY_LEN(ary); i++) { for (i = 0; i < RARRAY_LEN(ary); i++) {
@ -6974,7 +6974,7 @@ flatten(VALUE ary, int level)
} }
tmp = rb_check_array_type(elt); tmp = rb_check_array_type(elt);
if (RBASIC(result)->klass) { if (RBASIC(result)->klass) {
if (level < 0) { if (memo) {
RB_GC_GUARD(vmemo); RB_GC_GUARD(vmemo);
st_clear(memo); st_clear(memo);
} }
@ -6984,7 +6984,7 @@ flatten(VALUE ary, int level)
rb_ary_push(result, elt); rb_ary_push(result, elt);
} }
else { else {
if (level < 0) { if (memo) {
id = (st_data_t)tmp; id = (st_data_t)tmp;
if (st_is_member(memo, id)) { if (st_is_member(memo, id)) {
st_clear(memo); st_clear(memo);
@ -7001,7 +7001,7 @@ flatten(VALUE ary, int level)
if (RARRAY_LEN(stack) == 0) { if (RARRAY_LEN(stack) == 0) {
break; break;
} }
if (level < 0) { if (memo) {
id = (st_data_t)ary; id = (st_data_t)ary;
st_delete(memo, &id, 0); st_delete(memo, &id, 0);
} }
@ -7010,7 +7010,7 @@ flatten(VALUE ary, int level)
ary = rb_ary_pop(stack); ary = rb_ary_pop(stack);
} }
if (level < 0) { if (memo) {
st_clear(memo); st_clear(memo);
} }