From: Nathan Sidwell <nathan@acm.org>
Date: Thu, 24 Oct 2019 16:03:26 +0000 (+0000)
Subject: [dump] small source cleanup
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=84d2160d5d1d2fb7bcba2402d20cbfb570b34dbd;p=gcc.git

[dump] small source cleanup

https://gcc.gnu.org/ml/gcc-patches/2019-10/msg01760.html
	* dumpfile.c (dump_begin): Reorder decls to use RAII.

From-SVN: r277415
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 977b592817f..fb00aa65b79 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-24  Nathan Sidwell  <nathan@acm.org>
+
+	* dumpfile.c (dump_begin): Reorder decls to use RAII.
+
 2019-10-24  Martin Liska  <mliska@suse.cz>
 
 	* symbol-summary.h (gt_pch_nx): Mark all functions
diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c
index 5263d3a2134..7ea8f85c9bd 100644
--- a/gcc/dumpfile.c
+++ b/gcc/dumpfile.c
@@ -1532,21 +1532,17 @@ FILE *
 gcc::dump_manager::
 dump_begin (int phase, dump_flags_t *flag_ptr, int part)
 {
-  char *name;
-  struct dump_file_info *dfi;
-  FILE *stream;
-
   if (phase == TDI_none || !dump_phase_enabled_p (phase))
     return NULL;
 
-  name = get_dump_file_name (phase, part);
+  char *name = get_dump_file_name (phase, part);
   if (!name)
     return NULL;
-  dfi = get_dump_file_info (phase);
+  struct dump_file_info *dfi = get_dump_file_info (phase);
 
   /* We do not support re-opening of dump files with parts.  This would require
      tracking pstate per part of the dump file.  */
-  stream = dump_open (name, part != -1 || dfi->pstate < 0);
+  FILE *stream = dump_open (name, part != -1 || dfi->pstate < 0);
   if (stream)
     dfi->pstate = 1;
   free (name);