From 53b28abf8e4ba37e47d3bb05476e0a80ae761567 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 14 Mar 2020 08:15:08 +0100 Subject: [PATCH] Fix doubled indefinite articles, mostly in comments. 2020-03-14 Jakub Jelinek * 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/ChangeLog | 9 +++++++++ gcc/config/arc/arc.c | 2 +- gcc/config/s390/s390.c | 2 +- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/logic.cc | 2 +- gcc/cp/parser.c | 2 +- gcc/gimple-fold.c | 2 +- gcc/hsa-common.h | 2 +- gcc/tree-ssa-strlen.c | 2 +- 9 files changed, 22 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2daa351..0f79a7c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2020-03-14 Jakub Jelinek + + * 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. + 2020-03-13 Aaron Sawdey PR target/92379 diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c index c98bd6c..537af79 100644 --- a/gcc/config/arc/arc.c +++ b/gcc/config/arc/arc.c @@ -9353,7 +9353,7 @@ arc600_corereg_hazard (rtx_insn *pred, rtx_insn *succ) 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. */ diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index ae2be36..b6bc334 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -13252,7 +13252,7 @@ s390_output_mi_thunk (FILE *file, tree thunk ATTRIBUTE_UNUSED, 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. */ diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eea795d..79434c9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2020-03-14 Jakub Jelinek + + * 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. + 2020-03-13 Patrick Palka PR c++/67960 diff --git a/gcc/cp/logic.cc b/gcc/cp/logic.cc index e0ffbd8..4e376fd 100644 --- a/gcc/cp/logic.cc +++ b/gcc/cp/logic.cc @@ -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 (); diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 24f7167..0c7db8b 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -556,7 +556,7 @@ cp_debug_parser (FILE *file, cp_parser *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); diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index fa7a396..9e45cc5 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -1857,7 +1857,7 @@ gimple_fold_builtin_strncpy (gimple_stmt_iterator *gsi, /* 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) { diff --git a/gcc/hsa-common.h b/gcc/hsa-common.h index e12ffb1..ffeaaba 100644 --- a/gcc/hsa-common.h +++ b/gcc/hsa-common.h @@ -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 <> diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c index 8815cdb..0d70f3c 100644 --- a/gcc/tree-ssa-strlen.c +++ b/gcc/tree-ssa-strlen.c @@ -3081,7 +3081,7 @@ maybe_diag_stxncpy_trunc (gimple_stmt_iterator gsi, tree src, tree cnt) 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; -- 2.7.4