diff options
| author | Jason Merrill <jason@redhat.com> | 2011-11-04 08:54:08 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-11-04 08:54:08 -0400 |
| commit | b25dd954c41bf75d2bc892c7e9114908eaa7d314 (patch) | |
| tree | 2aea6e5048d38c60ba565aa04710e5fa10eeeadd /libiberty/cp-demangle.c | |
| parent | 5972791c345f8e0a750ab5e5cde189ba5064d118 (diff) | |
| download | gcc-b25dd954c41bf75d2bc892c7e9114908eaa7d314.tar.gz | |
re PR c++/48370 (G++ fails to extend reference temporary lifetime in some situations)
PR c++/48370
* call.c (extend_ref_init_temps, extend_ref_init_temps_1): New.
(set_up_extended_ref_temp): Use it. Change cleanup parm to VEC.
(initialize_reference): Just call convert_like.
* decl.c (grok_reference_init): Just call initialize_reference.
(build_init_list_var_init): Remove.
(check_initializer): Change cleanup parm to VEC. Handle references
like other types. Call perform_implicit_conversion instead
of build_init_list_var_init. Don't use build_aggr_init for
aggregate initialization of arrays.
(cp_finish_decl): Change cleanup to VEC.
* typeck2.c (store_init_value): Call extend_ref_init_temps.
Use build_vec_init for non-constant arrays.
* init.c (expand_aggr_init_1): Adjust.
(build_vec_init): Avoid re-converting an initializer
that's already digested.
* mangle.c (mangle_ref_init_variable): Add a discriminator.
* cp-tree.h: Adjust.
* typeck.c (convert_for_initialization): Adjust.
* decl2.c (maybe_emit_vtables): Adjust.
From-SVN: r180944
Diffstat (limited to 'libiberty/cp-demangle.c')
| -rw-r--r-- | libiberty/cp-demangle.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index c7afef01f6d..d0f57b7fcce 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -1846,8 +1846,11 @@ d_special_name (struct d_info *di) return d_make_comp (di, DEMANGLE_COMPONENT_GUARD, d_name (di), NULL); case 'R': - return d_make_comp (di, DEMANGLE_COMPONENT_REFTEMP, d_name (di), - NULL); + { + struct demangle_component *name = d_name (di); + return d_make_comp (di, DEMANGLE_COMPONENT_REFTEMP, name, + d_number_component (di)); + } case 'A': return d_make_comp (di, DEMANGLE_COMPONENT_HIDDEN_ALIAS, @@ -3921,7 +3924,9 @@ d_print_comp (struct d_print_info *dpi, int options, return; case DEMANGLE_COMPONENT_REFTEMP: - d_append_string (dpi, "reference temporary for "); + d_append_string (dpi, "reference temporary #"); + d_print_comp (dpi, options, d_right (dc)); + d_append_string (dpi, " for "); d_print_comp (dpi, options, d_left (dc)); return; |