diff mbox series

[committed] treewide: Rename TRUE/FALSE to true/false in *.cc files

Message ID CAFULd4YM0vVaVE6YHFstFormuBJ-Ff+2iG9rRj8KaaRD2i5atA@mail.gmail.com
State New
Headers show
Series [committed] treewide: Rename TRUE/FALSE to true/false in *.cc files | expand

Commit Message

Uros Bizjak Aug. 25, 2023, 8:24 a.m. UTC
gcc/c-family/ChangeLog:

    * c-format.cc (read_any_format_width):
    Rename TRUE/FALSE to true/false.

gcc/ChangeLog:

    * caller-save.cc (new_saved_hard_reg):
    Rename TRUE/FALSE to true/false.
    (setup_save_areas): Ditto.
    * gcc.cc (set_collect_gcc_options): Ditto.
    (driver::build_multilib_strings): Ditto.
    (print_multilib_info): Ditto.
    * genautomata.cc (gen_cpu_unit): Ditto.
    (gen_query_cpu_unit): Ditto.
    (gen_bypass): Ditto.
    (gen_excl_set): Ditto.
    (gen_presence_absence_set): Ditto.
    (gen_presence_set): Ditto.
    (gen_final_presence_set): Ditto.
    (gen_absence_set): Ditto.
    (gen_final_absence_set): Ditto.
    (gen_automaton): Ditto.
    (gen_regexp_repeat): Ditto.
    (gen_regexp_allof): Ditto.
    (gen_regexp_oneof): Ditto.
    (gen_regexp_sequence): Ditto.
    (process_decls): Ditto.
    (reserv_sets_are_intersected): Ditto.
    (initiate_excl_sets): Ditto.
    (form_reserv_sets_list): Ditto.
    (check_presence_pattern_sets): Ditto.
    (check_absence_pattern_sets): Ditto.
    (check_regexp_units_distribution): Ditto.
    (check_unit_distributions_to_automata): Ditto.
    (create_ainsns): Ditto.
    (output_insn_code_cases): Ditto.
    (output_internal_dead_lock_func): Ditto.
    (form_important_insn_automata_lists): Ditto.
    * gengtype-state.cc (read_state_files_list): Ditto.
    * gengtype.cc (main): Ditto.
    * gimple-array-bounds.cc (array_bounds_checker::check_array_bounds):
    Ditto.
    * gimple.cc (gimple_build_call_from_tree): Ditto.
    (preprocess_case_label_vec_for_gimple): Ditto.
    * gimplify.cc (gimplify_call_expr): Ditto.
    * ordered-hash-map-tests.cc (test_map_of_int_to_strings): Ditto.

gcc/cp/ChangeLog:

    * call.cc (build_conditional_expr):
    Rename TRUE/FALSE to true/false.
    (build_new_op): Ditto.

Bootstrapped and regression tested on x86_64-linux-gnu {,-m32}.

Uros.
diff mbox series

Patch

diff --git a/gcc/c-family/c-format.cc b/gcc/c-family/c-format.cc
index b3ef2d44ce9..b9906ecc171 100644
--- a/gcc/c-family/c-format.cc
+++ b/gcc/c-family/c-format.cc
@@ -2325,13 +2325,13 @@  read_any_format_width (tree &params,
     {
       /* Possibly read a numeric width.  If the width is zero,
 	 we complain if appropriate.  */
-      int non_zero_width_char = FALSE;
-      int found_width = FALSE;
+      int non_zero_width_char = false;
+      int found_width = false;
       while (ISDIGIT (*format_chars))
 	{
-	  found_width = TRUE;
+	  found_width = true;
 	  if (*format_chars != '0')
-	    non_zero_width_char = TRUE;
+	    non_zero_width_char = true;
 	  ++format_chars;
 	}
       if (found_width && !non_zero_width_char &&
diff --git a/gcc/caller-save.cc b/gcc/caller-save.cc
index b8915dab128..9ddf9b70b21 100644
--- a/gcc/caller-save.cc
+++ b/gcc/caller-save.cc
@@ -342,7 +342,7 @@  new_saved_hard_reg (int regno, int call_freq)
   saved_reg->num = saved_regs_num++;
   saved_reg->hard_regno = regno;
   saved_reg->call_freq = call_freq;
-  saved_reg->first_p = FALSE;
+  saved_reg->first_p = false;
   saved_reg->next = -1;
 }
 
@@ -558,7 +558,7 @@  setup_save_areas (void)
 					+ saved_reg2->num]
 		      = saved_reg_conflicts[saved_reg2->num * saved_regs_num
 					    + saved_reg->num]
-		      = TRUE;
+		      = true;
 		  }
 	    }
 	}
@@ -608,7 +608,7 @@  setup_save_areas (void)
 	    }
 	  if (j == i)
 	    {
-	      saved_reg->first_p = TRUE;
+	      saved_reg->first_p = true;
 	      for (best_slot_num = -1, j = 0; j < prev_save_slots_num; j++)
 		{
 		  slot = prev_save_slots[j];
diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc
index 673ec91d60e..23e458d3252 100644
--- a/gcc/cp/call.cc
+++ b/gcc/cp/call.cc
@@ -6058,7 +6058,7 @@  build_conditional_expr (const op_location_t &loc,
           if (complain & tf_error)
             {
               auto_diagnostic_group d;
-              op_error (loc, COND_EXPR, NOP_EXPR, arg1, arg2, arg3, FALSE);
+	      op_error (loc, COND_EXPR, NOP_EXPR, arg1, arg2, arg3, false);
               print_z_candidates (loc, candidates);
             }
 	  return error_mark_node;
@@ -7129,7 +7129,7 @@  build_new_op (const op_location_t &loc, enum tree_code code, int flags,
 		    /* ... Otherwise, report the more generic
 		       "no matching operator found" error */
 		    auto_diagnostic_group d;
-		    op_error (loc, code, code2, arg1, arg2, arg3, FALSE);
+		    op_error (loc, code, code2, arg1, arg2, arg3, false);
 		    print_z_candidates (loc, candidates);
 		  }
 	    }
@@ -7145,7 +7145,7 @@  build_new_op (const op_location_t &loc, enum tree_code code, int flags,
 	  if (complain & tf_error)
 	    {
 	      auto_diagnostic_group d;
-	      op_error (loc, code, code2, arg1, arg2, arg3, TRUE);
+	      op_error (loc, code, code2, arg1, arg2, arg3, true);
 	      print_z_candidates (loc, candidates);
 	    }
 	  result = error_mark_node;
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
index fdfac0b4fe4..a9dd0eb655c 100644
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -5533,7 +5533,7 @@  set_collect_gcc_options (void)
   obstack_grow (&collect_obstack, "COLLECT_GCC_OPTIONS=",
 		sizeof ("COLLECT_GCC_OPTIONS=") - 1);
 
-  first_time = TRUE;
+  first_time = true;
   for (i = 0; (int) i < n_switches; i++)
     {
       const char *const *args;
@@ -5541,7 +5541,7 @@  set_collect_gcc_options (void)
       if (!first_time)
 	obstack_grow (&collect_obstack, " ", 1);
 
-      first_time = FALSE;
+      first_time = false;
 
       /* Ignore elided switches.  */
       if ((switches[i].live_cond
@@ -5579,7 +5579,7 @@  set_collect_gcc_options (void)
     {
       if (!first_time)
 	obstack_grow (&collect_obstack, " ", 1);
-      first_time = FALSE;
+      first_time = false;
 
       obstack_grow (&collect_obstack, "'-dumpdir' '", 12);
       const char *p, *q;
@@ -8332,7 +8332,7 @@  driver::build_multilib_strings () const
     obstack_1grow (&multilib_obstack, 0);
     multilib_reuse = XOBFINISH (&multilib_obstack, const char *);
 
-    need_space = FALSE;
+    need_space = false;
     for (size_t i = 0; i < ARRAY_SIZE (multilib_defaults_raw); i++)
       {
 	if (need_space)
@@ -8340,7 +8340,7 @@  driver::build_multilib_strings () const
 	obstack_grow (&multilib_obstack,
 		      multilib_defaults_raw[i],
 		      strlen (multilib_defaults_raw[i]));
-	need_space = TRUE;
+	need_space = true;
       }
 
     obstack_1grow (&multilib_obstack, 0);
@@ -10176,19 +10176,19 @@  print_multilib_info (void)
 	  /* If there are extra options, print them now.  */
 	  if (multilib_extra && *multilib_extra)
 	    {
-	      int print_at = TRUE;
+	      int print_at = true;
 	      const char *q;
 
 	      for (q = multilib_extra; *q != '\0'; q++)
 		{
 		  if (*q == ' ')
-		    print_at = TRUE;
+		    print_at = true;
 		  else
 		    {
 		      if (print_at)
 			putchar ('@');
 		      putchar (*q);
-		      print_at = FALSE;
+		      print_at = false;
 		    }
 		}
 	    }
diff --git a/gcc/genautomata.cc b/gcc/genautomata.cc
index bf2dcdf2967..72f01686d6b 100644
--- a/gcc/genautomata.cc
+++ b/gcc/genautomata.cc
@@ -1251,7 +1251,7 @@  gen_cpu_unit (md_rtx_info *info)
   int i;
 
   rtx def = info->def;
-  str_cpu_units = get_str_vect (XSTR (def, 0), &vect_length, ',', FALSE);
+  str_cpu_units = get_str_vect (XSTR (def, 0), &vect_length, ',', false);
   if (str_cpu_units == NULL)
     fatal_at (info->loc, "invalid string `%s' in %s",
 	      XSTR (def, 0), GET_RTX_NAME (GET_CODE (def)));
@@ -1283,7 +1283,7 @@  gen_query_cpu_unit (md_rtx_info *info)
 
   rtx def = info->def;
   str_cpu_units = get_str_vect (XSTR (def, 0), &vect_length, ',',
-				FALSE);
+				false);
   if (str_cpu_units == NULL)
     fatal_at (info->loc, "invalid string `%s' in %s",
 	      XSTR (def, 0), GET_RTX_NAME (GET_CODE (def)));
@@ -1315,11 +1315,11 @@  gen_bypass (md_rtx_info *info)
   int i, j;
 
   rtx def = info->def;
-  out_patterns = get_str_vect (XSTR (def, 1), &out_length, ',', FALSE);
+  out_patterns = get_str_vect (XSTR (def, 1), &out_length, ',', false);
   if (out_patterns == NULL)
     fatal_at (info->loc, "invalid string `%s' in %s",
 	      XSTR (def, 1), GET_RTX_NAME (GET_CODE (def)));
-  in_patterns = get_str_vect (XSTR (def, 2), &in_length, ',', FALSE);
+  in_patterns = get_str_vect (XSTR (def, 2), &in_length, ',', false);
   if (in_patterns == NULL)
     fatal_at (info->loc, "invalid string `%s' in %s",
 	      XSTR (def, 2), GET_RTX_NAME (GET_CODE (def)));
@@ -1354,12 +1354,12 @@  gen_excl_set (md_rtx_info *info)
 
   rtx def = info->def;
   first_str_cpu_units
-    = get_str_vect (XSTR (def, 0), &first_vect_length, ',', FALSE);
+    = get_str_vect (XSTR (def, 0), &first_vect_length, ',', false);
   if (first_str_cpu_units == NULL)
     fatal_at (info->loc, "invalid string `%s' in %s",
 	      XSTR (def, 0), GET_RTX_NAME (GET_CODE (def)));
   second_str_cpu_units = get_str_vect (XSTR (def, 1), &length, ',',
-				       FALSE);
+				       false);
   if (second_str_cpu_units == NULL)
     fatal_at (info->loc, "invalid string `%s' in %s",
 	      XSTR (def, 1), GET_RTX_NAME (GET_CODE (def)));
@@ -1399,12 +1399,12 @@  gen_presence_absence_set (md_rtx_info *info, int presence_p, int final_p)
 
   rtx def = info->def;
   str_cpu_units = get_str_vect (XSTR (def, 0), &cpu_units_length, ',',
-				FALSE);
+				false);
   if (str_cpu_units == NULL)
     fatal_at (info->loc, "invalid string `%s' in %s",
 	      XSTR (def, 0), GET_RTX_NAME (GET_CODE (def)));
   str_pattern_lists = get_str_vect (XSTR (def, 1),
-				    &patterns_length, ',', FALSE);
+				    &patterns_length, ',', false);
   if (str_pattern_lists == NULL)
     fatal_at (info->loc, "invalid string `%s' in %s",
 	      XSTR (def, 1), GET_RTX_NAME (GET_CODE (def)));
@@ -1412,7 +1412,7 @@  gen_presence_absence_set (md_rtx_info *info, int presence_p, int final_p)
   for (i = 0; i < patterns_length; i++)
     {
       str_patterns [i] = get_str_vect (str_pattern_lists [i],
-				       &length, ' ', FALSE);
+				       &length, ' ', false);
       gcc_assert (str_patterns [i]);
     }
   decl = XCREATENODE (struct decl);
@@ -1446,7 +1446,7 @@  gen_presence_absence_set (md_rtx_info *info, int presence_p, int final_p)
 static void
 gen_presence_set (md_rtx_info *info)
 {
-  gen_presence_absence_set (info, TRUE, FALSE);
+  gen_presence_absence_set (info, true, false);
 }
 
 /* Process a FINAL_PRESENCE_SET.
@@ -1457,7 +1457,7 @@  gen_presence_set (md_rtx_info *info)
 static void
 gen_final_presence_set (md_rtx_info *info)
 {
-  gen_presence_absence_set (info, TRUE, TRUE);
+  gen_presence_absence_set (info, true, true);
 }
 
 /* Process an ABSENCE_SET.
@@ -1468,7 +1468,7 @@  gen_final_presence_set (md_rtx_info *info)
 static void
 gen_absence_set (md_rtx_info *info)
 {
-  gen_presence_absence_set (info, FALSE, FALSE);
+  gen_presence_absence_set (info, false, false);
 }
 
 /* Process a FINAL_ABSENCE_SET.
@@ -1479,7 +1479,7 @@  gen_absence_set (md_rtx_info *info)
 static void
 gen_final_absence_set (md_rtx_info *info)
 {
-  gen_presence_absence_set (info, FALSE, TRUE);
+  gen_presence_absence_set (info, false, true);
 }
 
 /* Process a DEFINE_AUTOMATON.
@@ -1496,7 +1496,7 @@  gen_automaton (md_rtx_info *info)
   int i;
 
   rtx def = info->def;
-  str_automata = get_str_vect (XSTR (def, 0), &vect_length, ',', FALSE);
+  str_automata = get_str_vect (XSTR (def, 0), &vect_length, ',', false);
   if (str_automata == NULL)
     fatal_at (info->loc, "invalid string `%s' in %s",
 	      XSTR (def, 0), GET_RTX_NAME (GET_CODE (def)));
@@ -1590,7 +1590,7 @@  gen_regexp_repeat (const char *str)
   int els_num;
   int i;
 
-  repeat_vect = get_str_vect (str, &els_num, '*', TRUE);
+  repeat_vect = get_str_vect (str, &els_num, '*', true);
   if (repeat_vect == NULL)
     fatal ("invalid `%s' in reservation `%s'", str, reserv_str);
   if (els_num > 1)
@@ -1622,7 +1622,7 @@  gen_regexp_allof (const char *str)
   int els_num;
   int i;
 
-  allof_vect = get_str_vect (str, &els_num, '+', TRUE);
+  allof_vect = get_str_vect (str, &els_num, '+', true);
   if (allof_vect == NULL)
     fatal ("invalid `%s' in reservation `%s'", str, reserv_str);
   if (els_num > 1)
@@ -1648,7 +1648,7 @@  gen_regexp_oneof (const char *str)
   int els_num;
   int i;
 
-  oneof_vect = get_str_vect (str, &els_num, '|', TRUE);
+  oneof_vect = get_str_vect (str, &els_num, '|', true);
   if (oneof_vect == NULL)
     fatal ("invalid `%s' in reservation `%s'", str, reserv_str);
   if (els_num > 1)
@@ -1674,7 +1674,7 @@  gen_regexp_sequence (const char *str)
   int els_num;
   int i;
 
-  sequence_vect = get_str_vect (str, &els_num, ',', TRUE);
+  sequence_vect = get_str_vect (str, &els_num, ',', true);
   if (els_num == -1)
     fatal ("unbalanced parentheses in reservation `%s'", str);
   if (sequence_vect == NULL)
@@ -2686,14 +2686,14 @@  process_decls (void)
 	  unit_set_el_list
             = process_presence_absence_names
 	      (DECL_PRESENCE (decl)->names, DECL_PRESENCE (decl)->names_num,
-	       decl->pos, TRUE, DECL_PRESENCE (decl)->final_p);
+	       decl->pos, true, DECL_PRESENCE (decl)->final_p);
 	  pattern_set_el_list
 	    = process_presence_absence_patterns
 	      (DECL_PRESENCE (decl)->patterns,
 	       DECL_PRESENCE (decl)->patterns_num,
-	       decl->pos, TRUE, DECL_PRESENCE (decl)->final_p);
+	       decl->pos, true, DECL_PRESENCE (decl)->final_p);
 	  add_presence_absence (unit_set_el_list, pattern_set_el_list,
-				decl->pos, TRUE,
+				decl->pos, true,
 				DECL_PRESENCE (decl)->final_p);
 	}
     }
@@ -2710,14 +2710,14 @@  process_decls (void)
 	  unit_set_el_list
             = process_presence_absence_names
 	      (DECL_ABSENCE (decl)->names, DECL_ABSENCE (decl)->names_num,
-	       decl->pos, FALSE, DECL_ABSENCE (decl)->final_p);
+	       decl->pos, false, DECL_ABSENCE (decl)->final_p);
 	  pattern_set_el_list
 	    = process_presence_absence_patterns
 	      (DECL_ABSENCE (decl)->patterns,
 	       DECL_ABSENCE (decl)->patterns_num,
-	       decl->pos, FALSE, DECL_ABSENCE (decl)->final_p);
+	       decl->pos, false, DECL_ABSENCE (decl)->final_p);
 	  add_presence_absence (unit_set_el_list, pattern_set_el_list,
-				decl->pos, FALSE,
+				decl->pos, false,
 				DECL_ABSENCE (decl)->final_p);
 	}
     }
@@ -3597,16 +3597,16 @@  reserv_sets_are_intersected (reserv_sets_t operand_1,
 	   el_ptr_1++, el_ptr_2++)
 	if (*el_ptr_1 & *el_ptr_2)
 	  return 1;
-      if (!check_presence_pattern_sets (cycle_ptr_1, cycle_ptr_2, FALSE))
+      if (!check_presence_pattern_sets (cycle_ptr_1, cycle_ptr_2, false))
 	return 1;
       if (!check_presence_pattern_sets (temp_reserv + (cycle_ptr_2
 						       - operand_2),
-					cycle_ptr_2, TRUE))
+					cycle_ptr_2, true))
 	return 1;
-      if (!check_absence_pattern_sets (cycle_ptr_1, cycle_ptr_2, FALSE))
+      if (!check_absence_pattern_sets (cycle_ptr_1, cycle_ptr_2, false))
 	return 1;
       if (!check_absence_pattern_sets (temp_reserv + (cycle_ptr_2 - operand_2),
-				       cycle_ptr_2, TRUE))
+				       cycle_ptr_2, true))
 	return 1;
     }
   return 0;
@@ -4272,7 +4272,7 @@  initiate_excl_sets (void)
 	       el = el->next_unit_set_el)
 	    {
 	      bitmap_set_bit (unit_excl_set, el->unit_decl->unit_num);
-	      el->unit_decl->in_set_p = TRUE;
+	      el->unit_decl->in_set_p = true;
 	    }
           unit_excl_set_table [DECL_UNIT (decl)->unit_num] = unit_excl_set;
         }
@@ -4337,7 +4337,7 @@  form_reserv_sets_list (pattern_set_el_t pattern_list)
       for (i = 0; i < el->units_num; i++)
 	{
 	  bitmap_set_bit (curr->reserv, el->unit_decls [i]->unit_num);
-	  el->unit_decls [i]->in_set_p = TRUE;
+	  el->unit_decls [i]->in_set_p = true;
 	}
       if (prev != NULL)
 	prev->next_pattern_reserv = curr;
@@ -4414,7 +4414,7 @@  check_presence_pattern_sets (reserv_sets_t checked_set,
 		|| (!final_p
 		    && unit_presence_set_table [start_unit_num] == NULL))
 	      continue;
-	    presence_p = FALSE;
+	    presence_p = false;
 	    for (pat_reserv = (final_p
 			       ? unit_final_presence_set_table [start_unit_num]
 			       : unit_presence_set_table [start_unit_num]);
@@ -4428,9 +4428,9 @@  check_presence_pattern_sets (reserv_sets_t checked_set,
 		presence_p = presence_p || unit_num >= els_in_cycle_reserv;
 	      }
 	    if (!presence_p)
-	      return FALSE;
+	      return false;
 	  }
-  return TRUE;
+  return true;
 }
 
 /* The function checks that CHECKED_SET satisfies all absence pattern
@@ -4467,10 +4467,10 @@  check_absence_pattern_sets (reserv_sets_t checked_set,
 		      && pat_reserv->reserv [unit_num])
 		    break;
 		if (unit_num >= els_in_cycle_reserv)
-		  return FALSE;
+		  return false;
 	      }
 	  }
-  return TRUE;
+  return true;
 }
 
 
@@ -5284,7 +5284,7 @@  check_regexp_units_distribution (const char *insn_reserv_name,
 		  error ("The following units do not satisfy units-automata distribution rule");
 		  error ("(Unit presence on one alt and its absence on other alt\n");
 		  error (" result in different other automata reservations)");
-		  annotation_message_reported_p = TRUE;
+		  annotation_message_reported_p = true;
 		}
 	      if (! annotation_reservation_message_reported_p)
 		{
@@ -5319,7 +5319,7 @@  check_unit_distributions_to_automata (void)
     }
   if (automaton_decls.length () > 1)
     {
-      annotation_message_reported_p = FALSE;
+      annotation_message_reported_p = false;
       for (i = 0; i < description->decls_num; i++)
 	{
 	  decl = description->decls [i];
@@ -6638,7 +6638,7 @@  create_ainsns (automaton_t automaton)
 	{
 	  curr_ainsn = XCREATENODE (struct ainsn);
 	  curr_ainsn->insn_reserv_decl = DECL_INSN_RESERV (decl);
-	  curr_ainsn->important_p = FALSE;
+	  curr_ainsn->important_p = false;
 	  curr_ainsn->next_ainsn = NULL;
 	  if (prev_ainsn == NULL)
 	    first_ainsn = curr_ainsn;
@@ -7897,7 +7897,7 @@  output_insn_code_cases (void (*output_automata_list_code)
     {
       decl = description->decls [i];
       if (decl->mode == dm_insn_reserv)
-	DECL_INSN_RESERV (decl)->processed_p = FALSE;
+	DECL_INSN_RESERV (decl)->processed_p = false;
     }
   for (i = 0; i < description->decls_num; i++)
     {
@@ -7912,7 +7912,7 @@  output_insn_code_cases (void (*output_automata_list_code)
 		  && (DECL_INSN_RESERV (decl2)->important_automata_list
 		      == DECL_INSN_RESERV (decl)->important_automata_list))
 		{
-		  DECL_INSN_RESERV (decl2)->processed_p = TRUE;
+		  DECL_INSN_RESERV (decl2)->processed_p = true;
 		  fprintf (output_file, "    case %d: /* %s */\n",
 			   DECL_INSN_RESERV (decl2)->insn_num,
 			   DECL_INSN_RESERV (decl2)->name);
@@ -8247,9 +8247,9 @@  output_internal_dead_lock_func (void)
 	output_dead_lock_vect_name (output_file, automaton);
 	fprintf (output_file, " [%s->", CHIP_PARAMETER_NAME);
 	output_chip_member_name (output_file, automaton);
-	fprintf (output_file, "])\n    return 1/* TRUE */;\n");
+	fprintf (output_file, "])\n    return 1 /* TRUE */;\n");
       }
-  fprintf (output_file, "  return 0/* FALSE */;\n}\n\n");
+  fprintf (output_file, "  return 0 /* FALSE */;\n}\n\n");
 }
 
 /* The function outputs PHR interface function `state_dead_lock_p'.  */
@@ -9382,7 +9382,7 @@  form_important_insn_automata_lists (void)
 		for (ainsn = arc->insn;
 		     ainsn != NULL;
 		     ainsn = ainsn->next_same_reservs_insn)
-		  ainsn->important_p = TRUE;
+		  ainsn->important_p = true;
 	      }
 	}
     }
diff --git a/gcc/gengtype-state.cc b/gcc/gengtype-state.cc
index 4bba37f718f..673c0613298 100644
--- a/gcc/gengtype-state.cc
+++ b/gcc/gengtype-state.cc
@@ -2494,7 +2494,7 @@  read_state_files_list (void)
       build_headers = XCNEWVEC (const char *, num_build_headers);
       for (i = 0; i < (int) num_gt_files; i++)
 	{
-	  bool issrcfile = FALSE;
+	  bool issrcfile = false;
 	  t0 = t1 = t2 = NULL;
 	  t0 = peek_state_token (0);
 	  t1 = peek_state_token (1);
diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc
index 49ddba684af..3db0a9b0769 100644
--- a/gcc/gengtype.cc
+++ b/gcc/gengtype.cc
@@ -5200,8 +5200,8 @@  main (int argc, char **argv)
   this_file = input_file_by_name (__FILE__);
   system_h_file = input_file_by_name ("system.h");
   /* Set the scalar_is_char union number for predefined scalar types.  */
-  scalar_nonchar.u.scalar_is_char = FALSE;
-  scalar_char.u.scalar_is_char = TRUE;
+  scalar_nonchar.u.scalar_is_char = false;
+  scalar_char.u.scalar_is_char = true;
 
   parse_program_options (argc, argv);
 
diff --git a/gcc/gimple-array-bounds.cc b/gcc/gimple-array-bounds.cc
index e04c8e29d5a..381ccb64b00 100644
--- a/gcc/gimple-array-bounds.cc
+++ b/gcc/gimple-array-bounds.cc
@@ -799,7 +799,7 @@  array_bounds_checker::check_array_bounds (tree *tp, int *walk_subtree,
   else
     location = gimple_location (wi->stmt);
 
-  *walk_subtree = TRUE;
+  *walk_subtree = true;
 
   bool warned = false;
   array_bounds_checker *checker = (array_bounds_checker *) wi->info;
diff --git a/gcc/gimple.cc b/gcc/gimple.cc
index e0ba42add39..f3b941e56c8 100644
--- a/gcc/gimple.cc
+++ b/gcc/gimple.cc
@@ -415,7 +415,7 @@  gimple_build_call_from_tree (tree t, tree fnptrtype)
 	  tree fntype = TREE_TYPE (fnptrtype);
 
 	  if (lookup_attribute ("nocf_check", TYPE_ATTRIBUTES (fntype)))
-	    gimple_call_set_nocf_check (call, TRUE);
+	    gimple_call_set_nocf_check (call, true);
 	}
     }
 
@@ -3187,7 +3187,7 @@  preprocess_case_label_vec_for_gimple (vec<tree> &labels,
       tree elt = labels[i];
       tree low = CASE_LOW (elt);
       tree high = CASE_HIGH (elt);
-      bool remove_element = FALSE;
+      bool remove_element = false;
 
       if (low)
 	{
@@ -3211,7 +3211,7 @@  preprocess_case_label_vec_for_gimple (vec<tree> &labels,
 		 into a simple (one-value) case.  */
 	      int cmp = tree_int_cst_compare (high, low);
 	      if (cmp < 0)
-		remove_element = TRUE;
+		remove_element = true;
 	      else if (cmp == 0)
 		high = NULL_TREE;
 	    }
@@ -3223,7 +3223,7 @@  preprocess_case_label_vec_for_gimple (vec<tree> &labels,
 		   && tree_int_cst_compare (low, min_value) < 0)
 		  || (TREE_CODE (max_value) == INTEGER_CST
 		      && tree_int_cst_compare (low, max_value) > 0))
-		remove_element = TRUE;
+		remove_element = true;
 	      else
 		low = fold_convert (index_type, low);
 	    }
@@ -3234,7 +3234,7 @@  preprocess_case_label_vec_for_gimple (vec<tree> &labels,
 		   && tree_int_cst_compare (high, min_value) < 0)
 		  || (TREE_CODE (max_value) == INTEGER_CST
 		      && tree_int_cst_compare (low, max_value) > 0))
-		remove_element = TRUE;
+		remove_element = true;
 	      else
 		{
 		  /* If the lower bound is less than the index type's
@@ -3269,7 +3269,7 @@  preprocess_case_label_vec_for_gimple (vec<tree> &labels,
 	     is NULL, we do not remove the default case (it would
 	     be completely lost).  */
 	  if (default_casep)
-	    remove_element = TRUE;
+	    remove_element = true;
 	}
 
       if (remove_element)
diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc
index 9a9919e2f2f..1e90daad990 100644
--- a/gcc/gimplify.cc
+++ b/gcc/gimplify.cc
@@ -3663,7 +3663,7 @@  gimplify_call_expr (tree *expr_p, gimple_seq *pre_p, bool want_value)
 
       case BUILT_IN_VA_START:
         {
-	  builtin_va_start_p = TRUE;
+	  builtin_va_start_p = true;
 	  if (call_expr_nargs (*expr_p) < 2)
 	    {
 	      error ("too few arguments to function %<va_start%>");
diff --git a/gcc/ordered-hash-map-tests.cc b/gcc/ordered-hash-map-tests.cc
index 55894c25fa0..c2516b8cf3b 100644
--- a/gcc/ordered-hash-map-tests.cc
+++ b/gcc/ordered-hash-map-tests.cc
@@ -152,7 +152,7 @@  test_map_of_int_to_strings ()
   ASSERT_EQ (*m.get (6), ant);
   ASSERT_EQ (*m.get (8), spider);
   ASSERT_EQ (m.get_or_insert (750, &existed), millipede);
-  ASSERT_EQ (existed, TRUE);
+  ASSERT_EQ (existed, true);
   ASSERT_EQ (*m.get (3), eric);
 
   /* Verify that the order of insertion is preserved.  */