Fix bootstrap after patch PR debug/30161

[pf3gnuchains/gcc-fork.git] / gcc / dwarf2out.c

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index c9c0188..0dfe4f6 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -5693,14 +5693,14 @@ static GTY(()) int label_num;
 /* Cached result of previous call to lookup_filename.  */
 static GTY(()) struct dwarf_file_data * file_table_last_lookup;
 
+static GTY(()) VEC(die_arg_entry,gc) *tmpl_value_parm_die_table;
+
 #ifdef DWARF2_DEBUGGING_INFO
 
 /* Offset from the "steady-state frame pointer" to the frame base,
    within the current function.  */
 static HOST_WIDE_INT frame_pointer_fb_offset;
 
-static GTY(()) VEC(die_arg_entry,gc) *tmpl_value_parm_die_table;
-
 /* Forward declarations for functions defined in this file.  */
 
 static int is_pseudo_reg (const_rtx);
@@ -10387,7 +10387,7 @@ make_ith_pack_parameter_name (tree name, int i)
 
   snprintf (numbuf, NUMBUF_LEN, "%i", i);
   newname_len = IDENTIFIER_LENGTH (name)
-               + strnlen (numbuf, NUMBUF_LEN) + 2;
+               + strlen (numbuf) + 2;
   newname = (char*) alloca (newname_len);
   snprintf (newname, newname_len,
            "%s#%i", IDENTIFIER_POINTER (name), i);