diff --git a/gcc/cobol/genapi.cc b/gcc/cobol/genapi.cc index bdd16530de9c19804ca34c5c6693cfba35c534b8..c6a258d91f2355a9ee1b645b8dc5d2d3f1f53852 100644 --- a/gcc/cobol/genapi.cc +++ b/gcc/cobol/genapi.cc @@ -3711,20 +3711,8 @@ parser_symbol_add_FldLiteralN(struct cbl_field_t *field ) tree var_type; - gg_variable_scope_t our_scope; - if( field->attr & (intermediate_e | temporary_e) ) - { - //our_scope = vs_stack; - our_scope = vs_static; - } - else - { - our_scope = vs_static; - } - if( field->data.capacity == 16 ) { - /* GCC-13 has no provision for an int128 constructor. So, we use a union for our necessary __int128. @@ -3774,7 +3762,7 @@ parser_symbol_add_FldLiteralN(struct cbl_field_t *field ) tree new_var_decl = gg_define_variable( var_type, base_name, - our_scope); + vs_static); DECL_INITIAL(new_var_decl) = union_constructor; field->data_decl_node = member(new_var_decl, "sval128"); @@ -3785,7 +3773,7 @@ parser_symbol_add_FldLiteralN(struct cbl_field_t *field ) sprintf(id_string, ".%ld", ++our_index); strcpy(base_name, field->name); strcat(base_name, id_string); - field->literal_decl_node = gg_define_variable(DOUBLE, id_string, our_scope); + field->literal_decl_node = gg_define_variable(DOUBLE, id_string, vs_static); TREE_READONLY(field->literal_decl_node) = 1; TREE_CONSTANT(field->literal_decl_node) = 1; char ach[128]; @@ -3803,7 +3791,7 @@ parser_symbol_add_FldLiteralN(struct cbl_field_t *field ) field->attr & signable_e); tree new_var_decl = gg_define_variable( var_type, base_name, - our_scope); + vs_static); DECL_INITIAL(new_var_decl) = build_int_cst_type(var_type, value); field->data_decl_node = new_var_decl; } diff --git a/gcc/cobol/genutil.cc b/gcc/cobol/genutil.cc index e675bcf054e1d83b0f4895d7e88da9564c68ef85..803e0c2e97c5aedbab233d48ee4792ba085158d9 100644 --- a/gcc/cobol/genutil.cc +++ b/gcc/cobol/genutil.cc @@ -2581,15 +2581,14 @@ build_array_of_cblc_refer( size_t N, cbl_refer_t *refers) { // We create and populate an array of cblc_refer_t - static size_t cblc_refer_size = gg_sizeof(cblc_refer_type_node); - tree refers_p = gg_define_variable(cblc_refer_p_type_node, vs_static); - tree walker = gg_define_variable(cblc_refer_p_type_node, vs_static); + tree refers_p = gg_define_variable(cblc_refer_p_type_node, vs_stack); + tree walker = gg_define_variable(cblc_refer_p_type_node, vs_stack); if( N ) { - refers_p = gg_define_variable(cblc_refer_p_type_node, vs_static); + refers_p = gg_define_variable(cblc_refer_p_type_node, vs_stack); gg_assign( refers_p, gg_cast(cblc_refer_p_type_node, gg_malloc( N * cblc_refer_size))); gg_assign( walker, refers_p); @@ -2618,7 +2617,7 @@ build_array_of_cblc_size_t( size_t N, size_t *values) { // We create and populate an array of size_t values - tree values_p = gg_define_variable(build_pointer_type(SIZE_T), vs_static); + tree values_p = gg_define_variable(build_pointer_type(SIZE_T), vs_stack); if( N ) { gg_assign( values_p,