From ce811fc49bb470856f6c4953c071d5b3db6485bb Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 16 Mar 2018 21:12:27 +0100 Subject: [PATCH] re PR c/84909 (typo: conversion from %qT to to %qT) PR c/84909 * c-warn.c (conversion_warning): Replace "to to" with "to" in diagnostics. * hsa-gen.c (mem_type_for_type): Fix comment typo. * tree-vect-loop-manip.c (vect_create_cond_for_niters_checks): Likewise. * gimple-ssa-warn-restrict.c (builtin_memref::set_base_and_offset): Likewise. From-SVN: r258609 --- gcc/ChangeLog | 9 +++++++++ gcc/c-family/ChangeLog | 4 ++++ gcc/c-family/c-warn.c | 3 +-- gcc/gimple-ssa-warn-restrict.c | 2 +- gcc/hsa-gen.c | 2 +- gcc/tree-vect-loop-manip.c | 2 +- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b6037d27c80..7aeedb76dad 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2018-03-16 Jakub Jelinek + + PR c/84909 + * hsa-gen.c (mem_type_for_type): Fix comment typo. + * tree-vect-loop-manip.c (vect_create_cond_for_niters_checks): + Likewise. + * gimple-ssa-warn-restrict.c (builtin_memref::set_base_and_offset): + Likewise. + 2018-03-16 Vladimir Makarov PR target/84876 diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 38dbbe37716..6635f37ae41 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,5 +1,9 @@ 2018-03-16 Jakub Jelinek + PR c/84909 + * c-warn.c (conversion_warning): Replace "to to" with "to" in + diagnostics. + PR c/84910 * c-warn.c (diagnose_mismatched_attributes): Remove trailing space from diagnostics. diff --git a/gcc/c-family/c-warn.c b/gcc/c-family/c-warn.c index 7672d534ffc..d0d9c7894a8 100644 --- a/gcc/c-family/c-warn.c +++ b/gcc/c-family/c-warn.c @@ -1138,8 +1138,7 @@ conversion_warning (location_t loc, tree type, tree expr, tree result) conversion_kind = unsafe_conversion_p (loc, type, expr, result, true); if (conversion_kind == UNSAFE_IMAGINARY) warning_at (loc, OPT_Wconversion, - "conversion from %qT to to %qT discards imaginary " - "component", + "conversion from %qT to %qT discards imaginary component", expr_type, type); else { diff --git a/gcc/gimple-ssa-warn-restrict.c b/gcc/gimple-ssa-warn-restrict.c index 25cc032c2da..e7a85fdcd13 100644 --- a/gcc/gimple-ssa-warn-restrict.c +++ b/gcc/gimple-ssa-warn-restrict.c @@ -417,7 +417,7 @@ builtin_memref::set_base_and_offset (tree expr) poly_int64 bytepos = exact_div (bitpos, BITS_PER_UNIT); - /* Convert the poly_int64 offset to to offset_int. The offset + /* Convert the poly_int64 offset to offset_int. The offset should be constant but be prepared for it not to be just in case. */ offset_int cstoff; diff --git a/gcc/hsa-gen.c b/gcc/hsa-gen.c index 55a46b5a16a..7974fffe360 100644 --- a/gcc/hsa-gen.c +++ b/gcc/hsa-gen.c @@ -691,7 +691,7 @@ mem_type_for_type (BrigType16_t type) /* HSA has non-intuitive constraints on load/store types. If it's a bit-type it _must_ be B128, if it's not a bit-type it must be 64bit max. So for loading entities of 128 bits (e.g. vectors) - we have to to B128, while for loading the rest we have to use the + we have to use B128, while for loading the rest we have to use the input type (??? or maybe also flattened to a equally sized non-vector unsigned type?). */ if ((type & BRIG_TYPE_PACK_MASK) == BRIG_TYPE_PACK_128) diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c index 1c43ed0becd..e82c1fe027e 100644 --- a/gcc/tree-vect-loop-manip.c +++ b/gcc/tree-vect-loop-manip.c @@ -2700,7 +2700,7 @@ vect_do_peeling (loop_vec_info loop_vinfo, tree niters, tree nitersm1, /* Function vect_create_cond_for_niters_checks. Create a conditional expression that represents the run-time checks for - loop's niter. The loop is guaranteed to to terminate if the run-time + loop's niter. The loop is guaranteed to terminate if the run-time checks hold. Input: -- 2.30.2