gcc/ChangeLog:

2018-09-24  Martin Liska  <mli...@suse.cz>

        PR fortran/87394
        * dbgcnt.c (dbg_cnt_process_single_pair): Return false
        instead of NULL.
        * dumpfile.c (dump_enable_all): Remove extra parenthesis.
        * gcov-tool.c: Declare the function with ATTRIBUTE_NORETURN.
        * godump.c (go_format_type): Remove extra parenthesis.

gcc/fortran/ChangeLog:

2018-09-24  Martin Liska  <mli...@suse.cz>

        PR fortran/87394
        * decl.c (add_hidden_procptr_result): Simplify condition
        as we are in branch witch 'case1 || case2'.
---
 gcc/dbgcnt.c       | 2 +-
 gcc/dumpfile.c     | 4 ++--
 gcc/fortran/decl.c | 2 +-
 gcc/gcov-tool.c    | 2 +-
 gcc/godump.c       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcc/dbgcnt.c b/gcc/dbgcnt.c
index ddb0e8e76d9..1eea65889a8 100644
--- a/gcc/dbgcnt.c
+++ b/gcc/dbgcnt.c
@@ -138,7 +138,7 @@ dbg_cnt_process_single_pair (const char *arg)
   int high, low;
 
   if (value1 == NULL)
-    return NULL;
+    return false;
 
   if (value2 == NULL)
     {
diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c
index a81ab3ed3c6..54f86237561 100644
--- a/gcc/dumpfile.c
+++ b/gcc/dumpfile.c
@@ -1511,7 +1511,7 @@ dump_enable_all (dump_kind dkind, dump_flags_t flags, const char *filename)
 
   for (i = TDI_none + 1; i < (size_t) TDI_end; i++)
     {
-      if ((dump_files[i].dkind == dkind))
+      if (dump_files[i].dkind == dkind)
         {
           const char *old_filename = dump_files[i].pfilename;
           dump_files[i].pstate = -1;
@@ -1532,7 +1532,7 @@ dump_enable_all (dump_kind dkind, dump_flags_t flags, const char *filename)
 
   for (i = 0; i < m_extra_dump_files_in_use; i++)
     {
-      if ((m_extra_dump_files[i].dkind == dkind))
+      if (m_extra_dump_files[i].dkind == dkind)
         {
           const char *old_filename = m_extra_dump_files[i].pfilename;
           m_extra_dump_files[i].pstate = -1;
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 91a1f34d7f1..7f79811d152 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -6463,7 +6463,7 @@ add_hidden_procptr_result (gfc_symbol *sym)
       gfc_symtree *stree;
       if (case1)
 	gfc_get_sym_tree ("ppr@", gfc_current_ns, &stree, false);
-      else if (case2)
+      else
 	{
 	  gfc_symtree *st2;
 	  gfc_get_sym_tree ("ppr@", gfc_current_ns->parent, &stree, false);
diff --git a/gcc/gcov-tool.c b/gcc/gcov-tool.c
index 88539f9647f..173ed5e5af2 100644
--- a/gcc/gcov-tool.c
+++ b/gcc/gcov-tool.c
@@ -438,7 +438,7 @@ static const struct option overlap_options[] =
 
 /* Print overlap usage and exit.  */
 
-static void
+static void ATTRIBUTE_NORETURN
 overlap_usage (void)
 {
   fnotice (stderr, "Overlap subcomand usage:");
diff --git a/gcc/godump.c b/gcc/godump.c
index 88e1a7782f1..baf21e27eec 100644
--- a/gcc/godump.c
+++ b/gcc/godump.c
@@ -961,7 +961,7 @@ go_format_type (struct godump_container *container, tree type,
 		   unions.  */
 		if (!is_anon_substructure)
 		  {
-		    if ((DECL_NAME (field) == NULL))
+		    if (DECL_NAME (field) == NULL)
 		      *p_art_i = go_append_artificial_name (ob, *p_art_i);
 		    else
 		      go_append_decl_name

Reply via email to