utils.c (handle_nonnull_attribute): Quote attribute name.

gcc/ada/ChangeLog:

	* gcc-interface/utils.c (handle_nonnull_attribute): Quote attribute
	name.

gcc/c/ChangeLog:

	* c-typeck.c (build_binary_op): Hyphenate floating-point.

gcc/testsuite/ChangeLog:

	* gcc.dg/Wfloat-equal-1.c: Adjust text of expected diagnostic.
	* gcc.dg/misc-column.c: Ditto.

gcc/ChangeLog:

	* tree-pretty-print.h: Remove unnecessary punctuation characters
	from a diagnostic.
	* tree-ssa.c (release_defs_bitset): Correct preprocessor conditional.

From-SVN: r272619

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 85c286a4a1551da9d6d8d6e9599b689a18403887..942c6fd7539d48f96bed6ca268575aef1cb8ed49 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-06-24  Martin Sebor  <msebor@redhat.com>
+
+       * tree-pretty-print.h: Remove unnecessary punctuation characters
+       from a diagnostic.
+       * tree-ssa.c (release_defs_bitset): Correct preprocessor conditional.
+
 2019-06-24  Jonathan Wakely  <jwakely@redhat.com>
 
        * ginclude/float.h (FLT_DECIMAL_DIG, DBL_DECIMAL_DIG, LDBL_DECIMAL_DIG)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 1b6aa2fd11f0a68b863f2b920df577d7a0ae1056..c85a4f707c69f6ce3e37b024a3fac0b4cb292686 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-24  Martin Sebor  <msebor@redhat.com>
+
+       * gcc-interface/utils.c (handle_nonnull_attribute): Quote attribute
+       name.
+
 2019-06-18  Arnaud Charlet  <charlet@adacore.com>
 
 PR ada/80590

diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index d9c9209ed84fdf53939e17c84cc29c85f79abb81..f2cb773ce48b6f5d6e4abdf876c09dc46711b674 100644 (file)
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -6234,7 +6234,8 @@ handle_nonnull_attribute (tree *node, tree ARG_UNUSED (name),
          && (!TYPE_ATTRIBUTES (type)
              || !lookup_attribute ("type generic", TYPE_ATTRIBUTES (type))))
        {
-         error ("nonnull attribute without arguments on a non-prototype");
+         error ("%qs attribute without arguments on a non-prototype",
+                "nonnull");
          *no_add_attrs = true;
        }
       return NULL_TREE;
@@ -6248,8 +6249,8 @@ handle_nonnull_attribute (tree *node, tree ARG_UNUSED (name),
 
       if (!get_nonnull_operand (TREE_VALUE (args), &arg_num))
        {
-         error ("nonnull argument has invalid operand number (argument %lu)",
-                (unsigned long) attr_arg_num);
+         error ("%qs argument has invalid operand number (argument %lu)",
+                "nonnull", (unsigned long) attr_arg_num);
          *no_add_attrs = true;
          return NULL_TREE;
        }
@@ -6270,8 +6271,8 @@ handle_nonnull_attribute (tree *node, tree ARG_UNUSED (name),
          if (!argument
              || TREE_CODE (argument) == VOID_TYPE)
            {
-             error ("nonnull argument with out-of-range operand number "
-                    "(argument %lu, operand %lu)",
+             error ("%qs argument with out-of-range operand number "
+                    "(argument %lu, operand %lu)", "nonnull",
                     (unsigned long) attr_arg_num, (unsigned long) arg_num);
              *no_add_attrs = true;
              return NULL_TREE;
@@ -6279,8 +6280,8 @@ handle_nonnull_attribute (tree *node, tree ARG_UNUSED (name),
 
          if (TREE_CODE (argument) != POINTER_TYPE)
            {
-             error ("nonnull argument references non-pointer operand "
-                    "(argument %lu, operand %lu)",
+             error ("%qs argument references non-pointer operand "
+                    "(argument %lu, operand %lu)", "nonnull",
                   (unsigned long) attr_arg_num, (unsigned long) arg_num);
              *no_add_attrs = true;
              return NULL_TREE;

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 103634eff73925ceeb8205e4dd9bc86975d0eba3..83f3eaaa0224e8c05745468369ee9690e298380f 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,7 @@
+2019-06-24  Martin Sebor  <msebor@redhat.com>
+
+       * c-typeck.c (build_binary_op): Hyphenate floating-point.
+
 2019-06-10  Jakub Jelinek  <jakub@redhat.com>
 
        * c-parser.c (c_parser_pragma): Reject PRAGMA_OMP_SCAN.

diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 6abfd101f3016119b0d0904138fe604ba34f8dea..6419ca985c4655e9f21059477467054e455b6967 100644 (file)
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -11939,7 +11939,7 @@ build_binary_op (location_t location, enum tree_code code,
       if (FLOAT_TYPE_P (type0) || FLOAT_TYPE_P (type1))
        warning_at (location,
                    OPT_Wfloat_equal,
-                   "comparing floating point with %<==%> or %<!=%> is unsafe");
+                   "comparing floating-point with %<==%> or %<!=%> is unsafe");
       /* Result of comparison is always int,
         but don't convert the args to int!  */
       build_type = integer_type_node;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 86865a8a12238a0e30f23dea57cd6e33cc435089..041a81a9350cd7d987b910f7b5b89f2aef21b39a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-24  Martin Sebor  <msebor@redhat.com>
+
+       * gcc.dg/Wfloat-equal-1.c: Adjust text of expected diagnostic.
+       * gcc.dg/misc-column.c: Ditto.
+
 2019-06-23  Ian Lance Taylor  <iant@golang.org>
 
        * go.test/test/blank1.go: Update for diagnostic message changes.

diff --git a/gcc/testsuite/gcc.dg/Wfloat-equal-1.c b/gcc/testsuite/gcc.dg/Wfloat-equal-1.c
index 36b3fa53f3f66ff0e2ad3593694badc24c1f2be9..1b23611bdc0d8b600e147eeec19a28efab8ce2dd 100644 (file)
--- a/gcc/testsuite/gcc.dg/Wfloat-equal-1.c
+++ b/gcc/testsuite/gcc.dg/Wfloat-equal-1.c
@@ -4,7 +4,7 @@
 
 double a, b;
 _Complex double c, d;
-int f(void) { return a == b; } /* { dg-warning "comparing floating point" } */
-int g(void) { return c == d; } /* { dg-warning "comparing floating point" } */
-int h(void) { return a != b; } /* { dg-warning "comparing floating point" } */
-int i(void) { return c != d; } /* { dg-warning "comparing floating point" } */
+int f(void) { return a == b; } /* { dg-warning "comparing floating-point" } */
+int g(void) { return c == d; } /* { dg-warning "comparing floating-point" } */
+int h(void) { return a != b; } /* { dg-warning "comparing floating-point" } */
+int i(void) { return c != d; } /* { dg-warning "comparing floating-point" } */

diff --git a/gcc/testsuite/gcc.dg/misc-column.c b/gcc/testsuite/gcc.dg/misc-column.c
index e68300bfc2901da21279520a8323e568257a9bd2..7dc6e58ec066fa860103571d877f4cd81600b6aa 100644 (file)
--- a/gcc/testsuite/gcc.dg/misc-column.c
+++ b/gcc/testsuite/gcc.dg/misc-column.c
@@ -13,7 +13,7 @@ extern void bar();
 
 void foo (void)
 {
-  if (a == b) /* { dg-warning "9:comparing floating point with" } */
+  if (a == b) /* { dg-warning "9:comparing floating-point with" } */
     bar ();
 
   if (p < q) /* { dg-warning "9:comparison of distinct pointer types" } */

diff --git a/gcc/tree-pretty-print.h b/gcc/tree-pretty-print.h
index 9f59328966691efcf91aaf98610c412b23a7cbec..5434e808528ad297d3b8457eeaef36a60e194881 100644 (file)
--- a/gcc/tree-pretty-print.h
+++ b/gcc/tree-pretty-print.h
@@ -25,7 +25,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "pretty-print.h"
 
 #define pp_unsupported_tree(PP, T)                         \
-  pp_verbatim (PP, "#%qs not supported by %s#", \
+  pp_verbatim (PP, "%qs not supported by %s", \
               get_tree_code_name (TREE_CODE (T)), __FUNCTION__)
 
 #define pp_ti_abstract_origin(TI) ((tree *) (TI)->x_data)

diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index 4b6fa449d572d646359322c95b09395eccde9f12..16eaa8e326c6d324ab76d82fb8af3936b1873da1 100644 (file)
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -631,7 +631,7 @@ release_defs_bitset (bitmap toremove)
    the verification errors.  Their format strings don't follow GCC
    diagnostic conventions and the calls are ultimately followed by
    one to internal_error.  */
-#if __GNUC__ > 10
+#if __GNUC__ >= 10
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wformat-diag"
 #endif