From d5029d45940e8c12b425b4d1a23081b4155caa61 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 18 Mar 2020 12:56:26 +0100 Subject: [PATCH] Fix up duplicated duplicated words in comments Another set of duplicated word fixes for things I've missed last time. These include e.g. *.cc files I forgot about, or duplicated words at the start or end of line. 2020-03-18 Jakub Jelinek * asan.c (get_mem_refs_of_builtin_call): Fix up duplicated word issue in a comment. * config/arc/arc.c (frame_stack_add): Likewise. * gimple-loop-versioning.cc (loop_versioning::analyze_arbitrary_term): Likewise. * ipa-predicate.c (predicate::remap_after_inlining): Likewise. * tree-ssa-strlen.h (handle_printf_call): Likewise. * tree-ssa-strlen.c (is_strlen_related_p): Likewise. * optinfo-emit-json.cc (optrecord_json_writer::add_record): Likewise. analyzer/ * sm-malloc.cc (malloc_state_machine::on_stmt): Fix up duplicated word issue in a comment. * region-model.cc (region_model::make_region_for_unexpected_tree_code, region_model::delete_region_and_descendents): Likewise. * engine.cc (class exploded_cluster): Likewise. * diagnostic-manager.cc (class path_builder): Likewise. cp/ * constraint.cc (resolve_function_concept_check, subsumes_constraints, strictly_subsumes): Fix up duplicated word issue in a comment. * coroutines.cc (build_init_or_final_await, captures_temporary): Likewise. * logic.cc (dnf_size_r, cnf_size_r): Likewise. * pt.c (append_type_to_template_for_access_check): Likewise. d/ * expr.cc (ExprVisitor::visit (CatAssignExp *)): Fix up duplicated word issue in a comment. * d-target.cc (Target::FPTypeProperties::max): Likewise. fortran/ * class.c (generate_finalization_wrapper): Fix up duplicated word issue in a comment. * trans-types.c (gfc_get_nodesc_array_type): Likewise. --- gcc/ChangeLog | 12 ++++++++++++ gcc/analyzer/ChangeLog | 9 +++++++++ gcc/analyzer/diagnostic-manager.cc | 2 +- gcc/analyzer/engine.cc | 2 +- gcc/analyzer/region-model.cc | 4 ++-- gcc/analyzer/sm-malloc.cc | 2 +- gcc/asan.c | 2 +- gcc/config/arc/arc.c | 2 +- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/constraint.cc | 6 +++--- gcc/cp/coroutines.cc | 4 ++-- gcc/cp/logic.cc | 8 ++++---- gcc/cp/pt.c | 2 +- gcc/d/ChangeLog | 6 ++++++ gcc/d/d-target.cc | 2 +- gcc/d/expr.cc | 2 +- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/class.c | 2 +- gcc/fortran/trans-types.c | 2 +- gcc/gimple-loop-versioning.cc | 2 +- gcc/ipa-predicate.c | 2 +- gcc/optinfo-emit-json.cc | 2 +- gcc/tree-ssa-strlen.c | 2 +- gcc/tree-ssa-strlen.h | 2 +- 24 files changed, 66 insertions(+), 26 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5eb23b57037..283ad1dde85 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2020-03-18 Jakub Jelinek + + * asan.c (get_mem_refs_of_builtin_call): Fix up duplicated word issue + in a comment. + * config/arc/arc.c (frame_stack_add): Likewise. + * gimple-loop-versioning.cc (loop_versioning::analyze_arbitrary_term): + Likewise. + * ipa-predicate.c (predicate::remap_after_inlining): Likewise. + * tree-ssa-strlen.h (handle_printf_call): Likewise. + * tree-ssa-strlen.c (is_strlen_related_p): Likewise. + * optinfo-emit-json.cc (optrecord_json_writer::add_record): Likewise. + 2020-03-18 Duan bo PR target/94201 diff --git a/gcc/analyzer/ChangeLog b/gcc/analyzer/ChangeLog index 8fc5dc4448f..a5c8b27c522 100644 --- a/gcc/analyzer/ChangeLog +++ b/gcc/analyzer/ChangeLog @@ -1,3 +1,12 @@ +2020-03-18 Jakub Jelinek + + * sm-malloc.cc (malloc_state_machine::on_stmt): Fix up duplicated word + issue in a comment. + * region-model.cc (region_model::make_region_for_unexpected_tree_code, + region_model::delete_region_and_descendents): Likewise. + * engine.cc (class exploded_cluster): Likewise. + * diagnostic-manager.cc (class path_builder): Likewise. + 2020-03-13 David Malcolm PR analyzer/94099 diff --git a/gcc/analyzer/diagnostic-manager.cc b/gcc/analyzer/diagnostic-manager.cc index bea566da9fc..9bd018a3aac 100644 --- a/gcc/analyzer/diagnostic-manager.cc +++ b/gcc/analyzer/diagnostic-manager.cc @@ -110,7 +110,7 @@ saved_diagnostic::operator== (const saved_diagnostic &other) const /* State for building a checker_path from a particular exploded_path. In particular, this precomputes reachability information: the set of - source enodes for which a a path be found to the diagnostic enode. */ + source enodes for which a path be found to the diagnostic enode. */ class path_builder { diff --git a/gcc/analyzer/engine.cc b/gcc/analyzer/engine.cc index 2431ae34474..a8037c6a3c7 100644 --- a/gcc/analyzer/engine.cc +++ b/gcc/analyzer/engine.cc @@ -2988,7 +2988,7 @@ exploded_path::dump () const cluster, each supernode gets its own cluster. Hence all enodes relating to a particular function with a particular - callstring will be be in a cluster together; all enodes for the same + callstring will be in a cluster together; all enodes for the same function but with a different callstring will be in a different cluster. */ diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc index 45a190299ea..9cc6560ee72 100644 --- a/gcc/analyzer/region-model.cc +++ b/gcc/analyzer/region-model.cc @@ -4871,7 +4871,7 @@ region_model::get_lvalue_1 (path_var pv, region_model_context *ctxt) } } -/* If we see a tree code we we don't know how to handle, rather than +/* If we see a tree code we don't know how to handle, rather than ICE or generate bogus results, create a dummy region, and notify CTXT so that it can mark the new state as being not properly modelled. The exploded graph can then stop exploring that path, @@ -6607,7 +6607,7 @@ region_model::get_descendents (region_id rid, region_id_set *out, } /* Delete RID and all descendent regions. - Find any pointers to such regions; convert convert them to + Find any pointers to such regions; convert them to poisoned values of kind PKIND. Accumulate stats on purged entities into STATS. */ diff --git a/gcc/analyzer/sm-malloc.cc b/gcc/analyzer/sm-malloc.cc index aaef6959362..38a2f1eea0c 100644 --- a/gcc/analyzer/sm-malloc.cc +++ b/gcc/analyzer/sm-malloc.cc @@ -655,7 +655,7 @@ malloc_state_machine::on_stmt (sm_context *sm_ctxt, sm_ctxt->on_transition (node, stmt, arg, m_nonnull, m_freed); /* Keep state "null" as-is, rather than transitioning to "free"; - we don't want want to complain about double-free of NULL. */ + we don't want to complain about double-free of NULL. */ /* freed -> stop, with warning. */ sm_ctxt->warn_for_state (node, stmt, arg, m_freed, diff --git a/gcc/asan.c b/gcc/asan.c index 00d0e678a0e..cc8f9122e3d 100644 --- a/gcc/asan.c +++ b/gcc/asan.c @@ -795,7 +795,7 @@ get_mem_refs_of_builtin_call (gcall *call, handle_builtin_alloca (call, iter); break; /* And now the __atomic* and __sync builtins. - These are handled differently from the classical memory memory + These are handled differently from the classical memory access builtins above. */ case BUILT_IN_ATOMIC_LOAD_1: diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c index 537af791bbe..922ccc5c9f9 100644 --- a/gcc/config/arc/arc.c +++ b/gcc/config/arc/arc.c @@ -2607,7 +2607,7 @@ frame_stack_add (HOST_WIDE_INT offset) register. During compilation of a function the frame size is evaluated - multiple times, it is not until the reload pass is complete the the + multiple times, it is not until the reload pass is complete the frame size is considered fixed (it is at this point that space for all spills has been allocated). However the frame_pointer_needed variable is not set true until the register allocation pass, as a diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9aaa81a17bb..938504b9c59 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,12 @@ 2020-03-18 Jakub Jelinek + * constraint.cc (resolve_function_concept_check, subsumes_constraints, + strictly_subsumes): Fix up duplicated word issue in a comment. + * coroutines.cc (build_init_or_final_await, captures_temporary): + Likewise. + * logic.cc (dnf_size_r, cnf_size_r): Likewise. + * pt.c (append_type_to_template_for_access_check): Likewise. + PR c++/91759 * decl.c (grokfndecl): Restore old diagnostics about deduction guide declared in different scope if in_namespace is NULL_TREE. diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc index 21769782bf0..5e434be815f 100644 --- a/gcc/cp/constraint.cc +++ b/gcc/cp/constraint.cc @@ -316,7 +316,7 @@ resolve_function_concept_overload (tree ovl, tree args) return cands; } -/* Determine if the the call expression CALL is a constraint check, and +/* Determine if the call expression CALL is a constraint check, and return the concept declaration and arguments being checked. If CALL does not denote a constraint check, return NULL. */ @@ -2958,7 +2958,7 @@ equivalently_constrained (tree d1, tree d2) Partial ordering of constraints ---------------------------------------------------------------------------*/ -/* Returns true when the the constraints in A subsume those in B. */ +/* Returns true when the constraints in A subsume those in B. */ bool subsumes_constraints (tree a, tree b) @@ -2968,7 +2968,7 @@ subsumes_constraints (tree a, tree b) return subsumes (a, b); } -/* Returns true when the the constraints in CI (with arguments +/* Returns true when the constraints in CI (with arguments ARGS) strictly subsume the associated constraints of TMPL. */ bool diff --git a/gcc/cp/coroutines.cc b/gcc/cp/coroutines.cc index f70b3ab69ab..a943ba01de6 100644 --- a/gcc/cp/coroutines.cc +++ b/gcc/cp/coroutines.cc @@ -2466,7 +2466,7 @@ build_init_or_final_await (location_t loc, bool is_final) return error_mark_node; /* So build the co_await for this */ - /* For initial/final suspends the call is is "a" per [expr.await] 3.2. */ + /* For initial/final suspends the call is "a" per [expr.await] 3.2. */ return build_co_await (loc, setup_call, (is_final ? FINAL_SUSPEND_POINT : INITIAL_SUSPEND_POINT)); } @@ -2547,7 +2547,7 @@ static tree captures_temporary (tree *stmt, int *do_subtree, void *d) { /* Stop recursing if we see an await expression, the subtrees - of that will be handled when it it processed. */ + of that will be handled when it is processed. */ if (TREE_CODE (*stmt) == CO_AWAIT_EXPR || TREE_CODE (*stmt) == CO_YIELD_EXPR) { *do_subtree = 0; diff --git a/gcc/cp/logic.cc b/gcc/cp/logic.cc index 4e376fd6e2f..194b743192d 100644 --- a/gcc/cp/logic.cc +++ b/gcc/cp/logic.cc @@ -355,7 +355,7 @@ atomic_p (tree t) /* Recursively count the number of clauses produced when converting T to DNF. Returns a pair containing the number of clauses and a bool - value signifying that the the tree would be rewritten as a result of + value signifying that the tree would be rewritten as a result of distributing. In general, a conjunction for which this flag is set is considered a disjunction for the purpose of counting. */ @@ -421,7 +421,7 @@ dnf_size_r (tree t) /* Matches constraints of the form P /\ Q, possibly resulting in the distribution of one side over the other. When both P and Q are disjunctions, the number of clauses are multiplied. - When only one of P and Q is a disjunction, the the number of + When only one of P and Q is a disjunction, the number of clauses are added. Otherwise, neither side is a disjunction and no clauses are created. */ if (disjunction_p (lhs)) @@ -463,7 +463,7 @@ dnf_size_r (tree t) /* Recursively count the number of clauses produced when converting T to CNF. Returns a pair containing the number of clauses and a bool - value signifying that the the tree would be rewritten as a result of + value signifying that the tree would be rewritten as a result of distributing. In general, a disjunction for which this flag is set is considered a conjunction for the purpose of counting. */ @@ -488,7 +488,7 @@ cnf_size_r (tree t) /* Matches constraints of the form P \/ Q, possibly resulting in the distribution of one side over the other. When both P and Q are conjunctions, the number of clauses are multiplied. - When only one of P and Q is a conjunction, the the number of + When only one of P and Q is a conjunction, the number of clauses are added. Otherwise, neither side is a conjunction and no clauses are created. */ if (disjunction_p (lhs)) diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c57d5707cfe..03a8dfbd37c 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -29078,7 +29078,7 @@ append_type_to_template_for_access_check_1 (tree t, } /* Append TYPE_DECL to the template TEMPL. - TEMPL is either a class type, a FUNCTION_DECL or a a TEMPLATE_DECL. + TEMPL is either a class type, a FUNCTION_DECL or a TEMPLATE_DECL. At TEMPL instanciation time, TYPE_DECL will be checked to see if it can be accessed through SCOPE. LOCATION is the location of the usage point of TYPE_DECL. diff --git a/gcc/d/ChangeLog b/gcc/d/ChangeLog index ea43e3e82bd..32856f17504 100644 --- a/gcc/d/ChangeLog +++ b/gcc/d/ChangeLog @@ -1,3 +1,9 @@ +2020-03-18 Jakub Jelinek + + * expr.cc (ExprVisitor::visit (CatAssignExp *)): Fix up duplicated + word issue in a comment. + * d-target.cc (Target::FPTypeProperties::max): Likewise. + 2020-03-16 Iain Buclaw PR d/92309 diff --git a/gcc/d/d-target.cc b/gcc/d/d-target.cc index 4c51b430dca..7e11bd64abb 100644 --- a/gcc/d/d-target.cc +++ b/gcc/d/d-target.cc @@ -53,7 +53,7 @@ bool Target::cppExceptions; int Target::classinfosize; unsigned long long Target::maxStaticDataSize; -/* Floating-point constants for for .max, .min, and other properties. */ +/* Floating-point constants for .max, .min, and other properties. */ template real_t Target::FPTypeProperties::max; template real_t Target::FPTypeProperties::min_normal; template real_t Target::FPTypeProperties::nan; diff --git a/gcc/d/expr.cc b/gcc/d/expr.cc index 59777e203b3..fcf9bc5880a 100644 --- a/gcc/d/expr.cc +++ b/gcc/d/expr.cc @@ -836,7 +836,7 @@ public: } /* Build a concat assignment expression. The right operand is appended - to the the left operand. */ + to the left operand. */ void visit (CatAssignExp *e) { diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 99b13db8431..db79f05d73f 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2020-03-18 Jakub Jelinek + + * class.c (generate_finalization_wrapper): Fix up duplicated word + issue in a comment. + * trans-types.c (gfc_get_nodesc_array_type): Likewise. + 2020-03-17 Jakub Jelinek * array.c (gfc_check_iter_variable): Fix up duplicated word issue diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c index 45fd5cbecaa..9aa3eb7282c 100644 --- a/gcc/fortran/class.c +++ b/gcc/fortran/class.c @@ -1574,7 +1574,7 @@ generate_finalization_wrapper (gfc_symbol *derived, gfc_namespace *ns, } /* No wrapper of the ancestor and no own FINAL subroutines and allocatable - components: Return a NULL() expression; we defer this a bit to have have + components: Return a NULL() expression; we defer this a bit to have an interface declaration. */ if ((!ancestor_wrapper || ancestor_wrapper->expr_type == EXPR_NULL) && !derived->attr.alloc_comp diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c index 8a4c8eef4a1..b7712dc74d1 100644 --- a/gcc/fortran/trans-types.c +++ b/gcc/fortran/trans-types.c @@ -1595,7 +1595,7 @@ gfc_get_nodesc_array_type (tree etype, gfc_array_spec * as, gfc_packed packed, mpz_init_set_ui (stride, 1); mpz_init (delta); - /* We don't use build_array_type because this does not include include + /* We don't use build_array_type because this does not include lang-specific information (i.e. the bounds of the array) when checking for duplicates. */ if (as->rank) diff --git a/gcc/gimple-loop-versioning.cc b/gcc/gimple-loop-versioning.cc index c424b3a636e..ff6c561f9e2 100644 --- a/gcc/gimple-loop-versioning.cc +++ b/gcc/gimple-loop-versioning.cc @@ -1070,7 +1070,7 @@ loop_versioning::analyze_arbitrary_term (address_info &address, where nothing in the way "x" and "y" are set gives a hint as to whether "i" iterates over the innermost dimension of the array. - In these situations it seems reasonable to assume the the + In these situations it seems reasonable to assume the programmer has nested the loops appropriately (although of course there are examples like GEMM in which this assumption doesn't hold for all accesses in the loop). diff --git a/gcc/ipa-predicate.c b/gcc/ipa-predicate.c index 367baf7fe07..27dabf2dc6a 100644 --- a/gcc/ipa-predicate.c +++ b/gcc/ipa-predicate.c @@ -497,7 +497,7 @@ predicate::remap_after_duplication (clause_t possible_truths) is summary of function predicate P is from. OPERAND_MAP is array giving callee formal IDs the caller formal IDs. POSSSIBLE_TRUTHS is clause of all callee conditions that may be true in caller context. TOPLEV_PREDICATE is - predicate under which callee is executed. OFFSET_MAP is an array of of + predicate under which callee is executed. OFFSET_MAP is an array of offsets that need to be added to conditions, negative offset means that conditions relying on values passed by reference have to be discarded because they might not be preserved (and should be considered offset zero diff --git a/gcc/optinfo-emit-json.cc b/gcc/optinfo-emit-json.cc index 68762c26c9e..6765c7d82ad 100644 --- a/gcc/optinfo-emit-json.cc +++ b/gcc/optinfo-emit-json.cc @@ -153,7 +153,7 @@ optrecord_json_writer::add_record (const optinfo *optinfo) /* Private methods of optrecord_json_writer. */ -/* Add record OBJ to the the innermost scope. */ +/* Add record OBJ to the innermost scope. */ void optrecord_json_writer::add_record (json::object *obj) diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c index f883a1fe7d6..6dd37fb0b78 100644 --- a/gcc/tree-ssa-strlen.c +++ b/gcc/tree-ssa-strlen.c @@ -2911,7 +2911,7 @@ handle_builtin_strncat (built_in_function, gimple_stmt_iterator *gsi) /* Return true if LEN depends on a call to strlen(SRC) in an interesting way. LEN can either be an integer expression, or a pointer (to char). - When it is the latter (such as in recursive calls to self) is is + When it is the latter (such as in recursive calls to self) it is assumed to be the argument in some call to strlen() whose relationship to SRC is being ascertained. */ diff --git a/gcc/tree-ssa-strlen.h b/gcc/tree-ssa-strlen.h index 12b7df042ff..a11c4d579a1 100644 --- a/gcc/tree-ssa-strlen.h +++ b/gcc/tree-ssa-strlen.h @@ -31,7 +31,7 @@ extern tree get_range (tree, wide_int[2], const vr_values * = NULL); struct c_strlen_data; extern void get_range_strlen_dynamic (tree , c_strlen_data *, const vr_values *); -/* APIs internal to strlen pass. Defined in in gimple-ssa-sprintf.c. */ +/* APIs internal to strlen pass. Defined in gimple-ssa-sprintf.c. */ extern bool handle_printf_call (gimple_stmt_iterator *, const vr_values *); #endif // GCC_TREE_SSA_STRLEN_H -- 2.30.2