crash printing non-local variable from nested subprogram

[deliverable/binutils-gdb.git] / gdb / mdebugread.c

diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index 5344d2f887caf4a36caf8ca9394df4f59c4acdc4..f8338f418bf8a2bc88bff1f435c7276231fe1b1a 100644 (file)
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -436,7 +436,7 @@ push_parse_stack (void)
   if (top_stack && top_stack->prev)
     newobj = top_stack->prev;
   else
-    newobj = (struct parse_stack *) xzalloc (sizeof (struct parse_stack));
+    newobj = XCNEW (struct parse_stack);
   /* Initialize new frame with previous content.  */
   if (top_stack)
     {
@@ -2395,8 +2395,7 @@ parse_partial_symbols (struct objfile *objfile)
   /* Allocate the map FDR -> PST.
      Minor hack: -O3 images might claim some global data belongs
      to FDR -1.  We`ll go along with that.  */
-  fdr_to_pst = (struct pst_map *)
-    xzalloc ((hdr->ifdMax + 1) * sizeof *fdr_to_pst);
+  fdr_to_pst = XCNEWVEC (struct pst_map, hdr->ifdMax + 1);
   old_chain = make_cleanup (xfree, fdr_to_pst);
   fdr_to_pst++;
   {
@@ -2415,7 +2414,7 @@ parse_partial_symbols (struct objfile *objfile)
          hdr->ifdMax * sizeof (struct mdebug_pending *));
 
   /* Pass 0 over external syms: swap them in.  */
-  ext_block = (EXTR *) xmalloc (hdr->iextMax * sizeof (EXTR));
+  ext_block = XNEWVEC (EXTR, hdr->iextMax);
   make_cleanup (xfree, ext_block);
 
   ext_out = (char *) debug_info->external_ext;
@@ -3110,7 +3109,7 @@ parse_partial_symbols (struct objfile *objfile)
                        add_psymbol_to_list (namestring, p - namestring, 1,
                                             VAR_DOMAIN, LOC_STATIC,
                                             &objfile->static_psymbols,
-                                            0, sh.value,
+                                            sh.value,
                                             psymtab_language, objfile);
                        continue;
                      case 'G':
@@ -3122,7 +3121,7 @@ parse_partial_symbols (struct objfile *objfile)
                        add_psymbol_to_list (namestring, p - namestring, 1,
                                             VAR_DOMAIN, LOC_STATIC,
                                             &objfile->global_psymbols,
-                                            0, sh.value,
+                                            sh.value,
                                             psymtab_language, objfile);
                        continue;
 
@@ -3140,8 +3139,7 @@ parse_partial_symbols (struct objfile *objfile)
                            add_psymbol_to_list (namestring, p - namestring, 1,
                                                 STRUCT_DOMAIN, LOC_TYPEDEF,
                                                 &objfile->static_psymbols,
-                                                sh.value, 0,
-                                                psymtab_language, objfile);
+                                                0, psymtab_language, objfile);
                            if (p[2] == 't')
                              {
                                /* Also a typedef with the same name.  */
@@ -3149,8 +3147,7 @@ parse_partial_symbols (struct objfile *objfile)
                                                     p - namestring, 1,
                                                     VAR_DOMAIN, LOC_TYPEDEF,
                                                     &objfile->static_psymbols,
-                                                    sh.value, 0,
-                                                    psymtab_language,
+                                                    0, psymtab_language,
                                                     objfile);
                                p += 1;
                              }
@@ -3163,8 +3160,7 @@ parse_partial_symbols (struct objfile *objfile)
                            add_psymbol_to_list (namestring, p - namestring, 1,
                                                 VAR_DOMAIN, LOC_TYPEDEF,
                                                 &objfile->static_psymbols,
-                                                sh.value, 0,
-                                                psymtab_language, objfile);
+                                                0, psymtab_language, objfile);
                          }
                      check_enum:
                        /* If this is an enumerated type, we need to add
@@ -3228,7 +3224,7 @@ parse_partial_symbols (struct objfile *objfile)
                                add_psymbol_to_list (p, q - p, 1,
                                                     VAR_DOMAIN, LOC_CONST,
                                                     &objfile->static_psymbols,
-                                                    0, 0, psymtab_language,
+                                                    0, psymtab_language,
                                                     objfile);
                                /* Point past the name.  */
                                p = q;
@@ -3246,8 +3242,7 @@ parse_partial_symbols (struct objfile *objfile)
                        add_psymbol_to_list (namestring, p - namestring, 1,
                                             VAR_DOMAIN, LOC_CONST,
                                             &objfile->static_psymbols,
-                                            sh.value, 0, psymtab_language,
-                                            objfile);
+                                            0, psymtab_language, objfile);
                        continue;
 
                      case 'f':
@@ -3266,7 +3261,7 @@ parse_partial_symbols (struct objfile *objfile)
                        add_psymbol_to_list (namestring, p - namestring, 1,
                                             VAR_DOMAIN, LOC_BLOCK,
                                             &objfile->static_psymbols,
-                                            0, sh.value,
+                                            sh.value,
                                             psymtab_language, objfile);
                        continue;
 
@@ -3290,7 +3285,7 @@ parse_partial_symbols (struct objfile *objfile)
                        add_psymbol_to_list (namestring, p - namestring, 1,
                                             VAR_DOMAIN, LOC_BLOCK,
                                             &objfile->global_psymbols,
-                                            0, sh.value,
+                                            sh.value,
                                             psymtab_language, objfile);
                        continue;
 
@@ -3533,12 +3528,12 @@ parse_partial_symbols (struct objfile *objfile)
                    add_psymbol_to_list (name, strlen (name), 1,
                                         VAR_DOMAIN, LOC_BLOCK,
                                         &objfile->global_psymbols,
-                                   0, sh.value, psymtab_language, objfile);
+                                        sh.value, psymtab_language, objfile);
                  else
                    add_psymbol_to_list (name, strlen (name), 1,
                                         VAR_DOMAIN, LOC_BLOCK,
                                         &objfile->static_psymbols,
-                                   0, sh.value, psymtab_language, objfile);
+                                        sh.value, psymtab_language, objfile);
 
                  procaddr = sh.value;
 
@@ -3605,8 +3600,7 @@ parse_partial_symbols (struct objfile *objfile)
                      add_psymbol_to_list (name, strlen (name), 1,
                                           STRUCT_DOMAIN, LOC_TYPEDEF,
                                           &objfile->static_psymbols,
-                                          0, (CORE_ADDR) 0,
-                                          psymtab_language, objfile);
+                                          0, psymtab_language, objfile);
                    }
                  handle_psymbol_enumerators (objfile, fh, sh.st, sh.value);
 
@@ -3646,7 +3640,7 @@ parse_partial_symbols (struct objfile *objfile)
              add_psymbol_to_list (name, strlen (name), 1,
                                   VAR_DOMAIN, theclass,
                                   &objfile->static_psymbols,
-                                  0, sh.value, psymtab_language, objfile);
+                                  sh.value, psymtab_language, objfile);
            skip:
              cur_sdx++;        /* Go to next file symbol.  */
            }
@@ -3726,8 +3720,7 @@ parse_partial_symbols (struct objfile *objfile)
              add_psymbol_to_list (name, strlen (name), 1,
                                   VAR_DOMAIN, theclass,
                                   &objfile->global_psymbols,
-                                  0, svalue,
-                                  psymtab_language, objfile);
+                                  svalue, psymtab_language, objfile);
            }
        }
 
@@ -3891,8 +3884,8 @@ handle_psymbol_enumerators (struct objfile *objfile, FDR *fh, int stype,
          in psymtabs, just in symtabs.  */
       add_psymbol_to_list (name, strlen (name), 1,
                           VAR_DOMAIN, LOC_CONST,
-                          &objfile->static_psymbols, 0,
-                          (CORE_ADDR) 0, psymtab_language, objfile);
+                          &objfile->static_psymbols,
+                          0, psymtab_language, objfile);
       ext_sym += external_sym_size;
     }
 }
@@ -4141,7 +4134,7 @@ psymtab_to_symtab_1 (struct objfile *objfile,
          PDR *pdr_in;
          PDR *pdr_in_end;
 
-         pr_block = (PDR *) xmalloc (fh->cpd * sizeof (PDR));
+         pr_block = XNEWVEC (PDR, fh->cpd);
          old_chain = make_cleanup (xfree, pr_block);
 
          pdr_ptr = ((char *) debug_info->external_pdr
@@ -4244,7 +4237,7 @@ psymtab_to_symtab_1 (struct objfile *objfile,
              PDR *pdr_in;
              PDR *pdr_in_end;
 
-             pr_block = (PDR *) xmalloc (fh->cpd * sizeof (PDR));
+             pr_block = XNEWVEC (PDR, fh->cpd);
 
              old_chain = make_cleanup (xfree, pr_block);
 
@@ -4383,7 +4376,7 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp,
   int xref_fd;
   struct mdebug_pending *pend;
 
-  *tpp = (struct type *) NULL;
+  *tpp = NULL;
 
   (*debug_swap->swap_rndx_in) (bigend, &ax->a_rndx, rn);
 
@@ -4837,7 +4830,7 @@ new_block (enum block_type type)
   /* FIXME: carlton/2003-09-11: This should use allocate_block to
      allocate the block.  Which, in turn, suggests that the block
      should be allocated on an obstack.  */
-  struct block *retval = xzalloc (sizeof (struct block));
+  struct block *retval = XCNEW (struct block);
 
   if (type == FUNCTION_BLOCK)
     BLOCK_DICT (retval) = dict_create_linear_expandable ();