Remove unreachable returns

This removes unreachable return statements as diagnosed by
the -Wunreachable-code patch.  Some cases are more obviously
an improvement than others - in fact some may get you the idea
to replace them with gcc_unreachable () instead, leading to
cases of the 'Remove unreachable gcc_unreachable () at the end
of functions' patch.

2021-11-25  Richard Biener  <rguenther@suse.de>

	* vec.c (qsort_chk): Do not return the void return value
	from the noreturn qsort_chk_error.
	* ccmp.c (expand_ccmp_expr_1): Remove unreachable return.
	* df-scan.c (df_ref_equal_p): Likewise.
	* dwarf2out.c (is_base_type): Likewise.
	(add_const_value_attribute): Likewise.
	* fixed-value.c (fixed_arithmetic): Likewise.
	* gimple-fold.c (gimple_fold_builtin_fputs): Likewise.
	* gimple-ssa-strength-reduction.c (stmt_cost): Likewise.
	* graphite-isl-ast-to-gimple.c
	(gcc_expression_from_isl_expr_op): Likewise.
	(gcc_expression_from_isl_expression): Likewise.
	* ipa-fnsummary.c (will_be_nonconstant_expr_predicate):
	Likewise.
	* lto-streamer-in.c (lto_input_mode_table): Likewise.

gcc/c-family/
	* c-opts.c (c_common_post_options): Remove unreachable return.
	* c-pragma.c (handle_pragma_target): Likewise.
	(handle_pragma_optimize): Likewise.

gcc/c/
	* c-typeck.c (c_tree_equal): Remove unreachable return.
	* c-parser.c (get_matching_symbol): Likewise.

libgomp/
	* oacc-plugin.c (GOMP_PLUGIN_acc_default_dim): Remove unreachable
	return.

diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index 2030eb1a4cd9196d995ee0e2caa8442a8b0de055..93845d57deef982376e56322afd0101b6f40adcb 100644 (file)
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -1109,10 +1109,7 @@ c_common_post_options (const char **pfilename)
        out_stream = fopen (out_fname, "w");
 
       if (out_stream == NULL)
-       {
-         fatal_error (input_location, "opening output file %s: %m", out_fname);
-         return false;
-       }
+       fatal_error (input_location, "opening output file %s: %m", out_fname);
 
       init_pp_output (out_stream);
     }

diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c
index 3663eb1cfbbe94acf4b7433b9ef333de782b1f6e..c4ed420582033a072dda0660315a7410427150a8 100644 (file)
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@@ -916,10 +916,7 @@ handle_pragma_target(cpp_reader *ARG_UNUSED(dummy))
     }
 
   if (token != CPP_STRING)
-    {
-      GCC_BAD_AT (loc, "%<#pragma GCC option%> is not a string");
-      return;
-    }
+    GCC_BAD_AT (loc, "%<#pragma GCC option%> is not a string");
 
   /* Strings are user options.  */
   else
@@ -991,10 +988,7 @@ handle_pragma_optimize (cpp_reader *ARG_UNUSED(dummy))
     }
 
   if (token != CPP_STRING && token != CPP_NUMBER)
-    {
-      GCC_BAD ("%<#pragma GCC optimize%> is not a string or number");
-      return;
-    }
+    GCC_BAD ("%<#pragma GCC optimize%> is not a string or number");
 
   /* Strings/numbers are user options.  */
   else

diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index f312630448fd6feeb93b9ab743c49fc4ba30b3ab..af2bb5bc8cc7c6de7895023cc96c1bd0aa48f339 100644 (file)
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -1132,7 +1132,6 @@ get_matching_symbol (enum cpp_ttype type)
     {
     default:
       gcc_unreachable ();
-      return "";
     case CPP_CLOSE_PAREN:
       return "(";
     case CPP_CLOSE_BRACE:

diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index b71358e182147dec473ee60bf936b3b1a32ac083..7524304f2bd3be9de506f6d55d9073338f9f5f9c 100644 (file)
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -15984,8 +15984,6 @@ c_tree_equal (tree t1, tree t2)
     default:
       gcc_unreachable ();
     }
-  /* We can get here with --disable-checking.  */
-  return false;
 }
 
 /* Returns true when the function declaration FNDECL is implicit,

diff --git a/gcc/ccmp.c b/gcc/ccmp.c
index d581cfadf0667ef73236885bde2b7ddc882c365e..616fe035e79c3d7d7ddb768b5b33ed1234fc5c49 100644 (file)
--- a/gcc/ccmp.c
+++ b/gcc/ccmp.c
@@ -273,8 +273,6 @@ expand_ccmp_expr_1 (gimple *g, rtx_insn **prep_seq, rtx_insn **gen_seq)
        return NULL_RTX;
       return expand_ccmp_next (op1, code, tmp, prep_seq, gen_seq);
     }
-
-  return NULL_RTX;
 }
 
 /* Main entry to expand conditional compare statement G.

diff --git a/gcc/df-scan.c b/gcc/df-scan.c
index 3dbda7aa52cc7fd46371c285aa9cbca963a28440..1baa6e7350baa9f1965ac33850b9425e76e1bc87 100644 (file)
--- a/gcc/df-scan.c
+++ b/gcc/df-scan.c
@@ -2059,7 +2059,6 @@ df_ref_equal_p (df_ref ref1, df_ref ref2)
     default:
       gcc_unreachable ();
     }
-  return false;
 }
 
 

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index e1d6a79ecd7be60315f30b87999142fcb77f2d90..1677923a439663551e1579e4d38be12be408e143 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -13359,8 +13359,6 @@ is_base_type (tree type)
        return 0;
       gcc_unreachable ();
     }
-
-  return 0;
 }
 
 /* Given a pointer to a tree node, assumed to be some kind of a ..._TYPE
@@ -20240,7 +20238,6 @@ add_const_value_attribute (dw_die_ref die, machine_mode mode, rtx rtl)
       /* No other kinds of rtx should be possible here.  */
       gcc_unreachable ();
     }
-  return false;
 }
 
 /* Determine whether the evaluation of EXPR references any variables

diff --git a/gcc/fixed-value.c b/gcc/fixed-value.c
index 78134bc510ff733c3c5f7c53b1e867759c8f14f6..fdfb700ae66bea64693a47ef0d031901f3710ed6 100644 (file)
--- a/gcc/fixed-value.c
+++ b/gcc/fixed-value.c
@@ -756,7 +756,6 @@ fixed_arithmetic (FIXED_VALUE_TYPE *f, int icode, const FIXED_VALUE_TYPE *op0,
     default:
       gcc_unreachable ();
     }
-  return false;
 }
 
 /* Compare fixed-point values by tree_code.

diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index 73f090bb14c2a1e5fea9ef623313a526e2ff2eb6..1f54219fe43d10aaaf9d7e753c2ede0d083142f6 100644 (file)
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -2993,7 +2993,6 @@ gimple_fold_builtin_fputs (gimple_stmt_iterator *gsi,
     default:
       gcc_unreachable ();
     }
-  return false;
 }
 
 /* Fold a call to the __mem{cpy,pcpy,move,set}_chk builtin.

diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c
index a92cf03c1f322733dda978dc5c31105cdda996e4..8943c57b7a9ed747c392993eb6d62c7a67c8fdd9 100644 (file)
--- a/gcc/gimple-ssa-strength-reduction.c
+++ b/gcc/gimple-ssa-strength-reduction.c
@@ -763,7 +763,6 @@ stmt_cost (gimple *gs, bool speed)
     }
   
   gcc_unreachable ();
-  return 0;
 }
 
 /* Look up the defining statement for BASE_IN and return a pointer

diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c
index 1ad68a1d4735e76b3fc8a71e12273ae1d6047587..8c5cd33f451c1ab4a5e57db23e5a1bd69e72ccb4 100644 (file)
--- a/gcc/graphite-isl-ast-to-gimple.c
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -526,8 +526,6 @@ gcc_expression_from_isl_expr_op (tree type, __isl_take isl_ast_expr *expr,
     default:
       gcc_unreachable ();
     }
-
-  return NULL_TREE;
 }
 
 /* Converts an isl AST expression E back to a GCC expression tree of
@@ -557,8 +555,6 @@ gcc_expression_from_isl_expression (tree type, __isl_take isl_ast_expr *expr,
     default:
       gcc_unreachable ();
     }
-
-  return NULL_TREE;
 }
 
 /* Creates a new LOOP corresponding to isl_ast_node_for.  Inserts an

diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c
index cb13d2e4b3c9d8455ae597ce90ced72f6f65fff6..6c1cdf17e47b7c75da47a7138e6ef463beae5771 100644 (file)
--- a/gcc/ipa-fnsummary.c
+++ b/gcc/ipa-fnsummary.c
@@ -2042,7 +2042,6 @@ will_be_nonconstant_expr_predicate (ipa_func_body_info *fbi,
       debug_tree (expr);
       gcc_unreachable ();
     }
-  return false;
 }
 
 

diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index eb8a7dc57b0041147c47aa9beaa09b5931684a41..536de3a71b710a56e97766f356ce0696991eb9b8 100644 (file)
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -1963,11 +1963,8 @@ lto_input_mode_table (struct lto_file_decl_data *file_data)
   const char *data
     = lto_get_summary_section_data (file_data, LTO_section_mode_table, &len);
   if (! data)
-    {
-      internal_error ("cannot read LTO mode table from %s",
-                     file_data->file_name);
-      return;
-    }
+    internal_error ("cannot read LTO mode table from %s",
+                   file_data->file_name);
 
   unsigned char *table = ggc_cleared_vec_alloc<unsigned char> (1 << 8);
   file_data->mode_table = table;

diff --git a/gcc/vec.c b/gcc/vec.c
index 6d767cc12c14d12682193a20eac262853cdf2430..bdbd1ad6e044437c15413591a48969dd0f02e185 100644 (file)
--- a/gcc/vec.c
+++ b/gcc/vec.c
@@ -229,23 +229,23 @@ qsort_chk (void *base, size_t n, size_t size, sort_r_cmp_fn *cmp, void *data)
        if (CMP (i1, i2))
          break;
        else if (CMP (i2, i1))
-         return ERR2 (i1, i2);
+         ERR2 (i1, i2);
       size_t lim1 = LIM (i2 - i1), lim2 = LIM (n - i2);
       /* Verify that other pairs within current span compare equal.  */
       for (i = i1 + 1; i + 1 < i2; i++)
        for (j = i + 1; j < i1 + lim1; j++)
          if (CMP (i, j))
-           return ERR3 (i, i1, j);
+           ERR3 (i, i1, j);
          else if (CMP (j, i))
-           return ERR2 (i, j);
+           ERR2 (i, j);
       /* Verify that elements within this span compare less than
          elements beyond the span.  */
       for (i = i1; i < i2; i++)
        for (j = i2; j < i2 + lim2; j++)
          if (CMP (i, j) >= 0)
-           return ERR3 (i, i1, j);
+           ERR3 (i, i1, j);
          else if (CMP (j, i) <= 0)
-           return ERR2 (i, j);
+           ERR2 (i, j);
     }
 #undef ERR3
 #undef ERR2

diff --git a/libgomp/oacc-plugin.c b/libgomp/oacc-plugin.c
index e25b462eff05110c625ca5a5d16d38aacb9cf296..98166fe5cd1413429aaa55acaa5b3fc3a2ec1697 100644 (file)
--- a/libgomp/oacc-plugin.c
+++ b/libgomp/oacc-plugin.c
@@ -62,7 +62,6 @@ GOMP_PLUGIN_acc_default_dim (unsigned int i)
   if (i >= GOMP_DIM_MAX)
     {
       gomp_fatal ("invalid dimension argument: %d", i);
-      return -1;
     }
   return goacc_default_dims[i];
 }