gcov-tool.c (do_merge): Refactore to remove int ret.

	* gcov-tool.c (do_merge): Refactore to remove int ret.
	* ipa-icf.c (sem_item::hash_referenced_symbol_properties): Change
	!type == FUNC to type != FUNC.
	* reload.h (struct target_reload): Changee to type of
	x_spill_indirect_levels from bool to unsigned char.

From-SVN: r222884

gcc/ChangeLog

+2015-05-06  Aditya Kumar  <hiraditya@msn.com>
+
+	* gcov-tool.c (do_merge): Refactore to remove int ret.
+	* ipa-icf.c (sem_item::hash_referenced_symbol_properties): Change
+	!type == FUNC to type != FUNC.
+	* reload.h (struct target_reload): Changee to type of
+	x_spill_indirect_levels from bool to unsigned char.
+
 2015-05-07  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* rtl.h (always_void_p): New function.

gcc/gcov-tool.c

@@ -193,7 +193,6 @@ static int
 do_merge (int argc, char **argv)
 {
   int opt;
-  int ret;
   const char *output_dir = 0;
   int w1 = 1, w2 = 1;
 
@@ -222,12 +221,10 @@ do_merge (int argc, char **argv)
   if (output_dir == NULL)
     output_dir = "merged_profile";
 
-  if (argc - optind == 2)
-    ret = profile_merge (argv[optind], argv[optind+1], output_dir, w1, w2);
-  else
+  if (argc - optind != 2)
     merge_usage ();
 
-  return ret;
+  return profile_merge (argv[optind], argv[optind+1], output_dir, w1, w2);
 }
 
 /* If N_VAL is no-zero, normalize the profile by setting the largest counter

gcc/ipa-icf.c

@@ -505,7 +505,7 @@ sem_item::hash_referenced_symbol_properties (symtab_node *ref,
 {
   if (is_a <cgraph_node *> (ref))
     {
-      if ((!type == FUNC || address || !opt_for_fn (decl, optimize_size))
+      if ((type != FUNC || address || !opt_for_fn (decl, optimize_size))
 	  && !opt_for_fn (ref->decl, optimize_size)
 	  && !DECL_UNINLINABLE (ref->decl))
 	{

gcc/reload.h

@@ -168,7 +168,7 @@ struct target_reload {
      value indicates the level of indirect addressing supported, e.g., two
      means that (MEM (MEM (REG n))) is also valid if (REG n) does not get
      a hard register.  */
-  bool x_spill_indirect_levels;
+  unsigned char x_spill_indirect_levels;
 
   /* True if caller-save has been reinitialized.  */
   bool x_caller_save_initialized_p;