Hi!

Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux
and committed to trunk as obvious.

2020-03-14  Jakub Jelinek  <ja...@redhat.com>

        * gimple-fold.c (gimple_fold_builtin_strncpy): Change
        "a an" to "an" in a comment.
        * hsa-common.h (is_a_helper): Likewise.
        * tree-ssa-strlen.c (maybe_diag_stxncpy_trunc): Likewise.
        * config/arc/arc.c (arc600_corereg_hazard): Likewise.
        * config/s390/s390.c (s390_indirect_branch_via_thunk): Likewise.

        * logic.cc (formula::formula): Change "a an" to "an" in a comment.
        * parser.c (cp_debug_parser): Change "a an" to "an" in a string
        literal.

--- gcc/gimple-fold.c.jj        2020-02-25 13:54:02.057091561 +0100
+++ gcc/gimple-fold.c   2020-03-12 17:04:12.401075393 +0100
@@ -1857,7 +1857,7 @@ gimple_fold_builtin_strncpy (gimple_stmt
   /* If the LEN parameter is zero, return DEST.  */
   if (integer_zerop (len))
     {
-      /* Avoid warning if the destination refers to a an array/pointer
+      /* Avoid warning if the destination refers to an array/pointer
         decorate with attribute nonstring.  */
       if (!nonstring)
        {
--- gcc/hsa-common.h.jj 2020-01-12 11:54:36.645409908 +0100
+++ gcc/hsa-common.h    2020-03-12 17:05:40.473785394 +0100
@@ -199,7 +199,7 @@ private:
   void operator delete (void *) {}
 };
 
-/* Report whether or not P is a an immediate operand.  */
+/* Report whether or not P is an immediate operand.  */
 
 template <>
 template <>
--- gcc/tree-ssa-strlen.c.jj    2020-03-06 11:35:46.305074549 +0100
+++ gcc/tree-ssa-strlen.c       2020-03-12 17:05:54.426581031 +0100
@@ -3081,7 +3081,7 @@ maybe_diag_stxncpy_trunc (gimple_stmt_it
        return false;
     }
 
-  /* Likewise, if the destination refers to a an array/pointer declared
+  /* Likewise, if the destination refers to an array/pointer declared
      nonstring return early.  */
   if (get_attr_nonstring_decl (dstdecl, &ref))
     return false;
--- gcc/config/arc/arc.c.jj     2020-03-03 10:41:26.572509949 +0100
+++ gcc/config/arc/arc.c        2020-03-12 17:06:20.022206131 +0100
@@ -9353,7 +9353,7 @@ arc600_corereg_hazard (rtx_insn *pred, r
          continue;
        }
       rtx dest = XEXP (x, 0);
-      /* Check if this sets a an extension register.  N.B. we use 61 for the
+      /* Check if this sets an extension register.  N.B. we use 61 for the
         condition codes, which is definitely not an extension register.  */
       if (REG_P (dest) && REGNO (dest) >= 32 && REGNO (dest) < 61
          /* Check if the same register is used by the PAT.  */
--- gcc/config/s390/s390.c.jj   2020-03-05 07:58:02.565137872 +0100
+++ gcc/config/s390/s390.c      2020-03-12 17:06:27.271099958 +0100
@@ -13252,7 +13252,7 @@ s390_output_mi_thunk (FILE *file, tree t
   assemble_end_function (thunk, fnname);
 }
 
-/* Output either an indirect jump or a an indirect call
+/* Output either an indirect jump or an indirect call
    (RETURN_ADDR_REGNO != INVALID_REGNUM) with target register REGNO
    using a branch trampoline disabling branch target prediction.  */
 
--- gcc/cp/logic.cc.jj  2020-01-12 11:54:36.486412307 +0100
+++ gcc/cp/logic.cc     2020-03-12 17:06:05.146424015 +0100
@@ -238,7 +238,7 @@ struct formula
 
   formula (tree t)
   {
-    /* This should call emplace_back(). There's a an extra copy being
+    /* This should call emplace_back(). There's an extra copy being
        invoked by using push_back().  */
     m_clauses.push_back (t);
     m_current = m_clauses.begin ();
--- gcc/cp/parser.c.jj  2020-03-02 13:33:10.909495163 +0100
+++ gcc/cp/parser.c     2020-03-12 17:06:14.001294319 +0100
@@ -556,7 +556,7 @@ cp_debug_parser (FILE *file, cp_parser *
                              parser->in_statement & IN_SWITCH_STMT);
   cp_debug_print_flag (file, "Parsing a structured OpenMP block",
                              parser->in_statement & IN_OMP_BLOCK);
-  cp_debug_print_flag (file, "Parsing a an OpenMP loop",
+  cp_debug_print_flag (file, "Parsing an OpenMP loop",
                              parser->in_statement & IN_OMP_FOR);
   cp_debug_print_flag (file, "Parsing an if statement",
                              parser->in_statement & IN_IF_STMT);

        Jakub

Reply via email to