predict.c (test_prediction_value_range): Use -1U instead of -1 to avoid narrowing...

	* predict.c (test_prediction_value_range): Use -1U instead of -1
	to avoid narrowing conversion warning.
	* dumpfile.c (dump_options): Wrap all value into dump_flags_t cast
	to avoid narrowing conversion warning.
	* opt-functions.awk (var_ref): Return (unsigned short) -1 instead of
	-1.
	* optc-gen.awk (END): Expect (unsigned short) -1 instead of -1.

From-SVN: r249683

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f2754154a2267561bcca89b19130e48b0c93731..36773196eec6a4a6feaaeca900cf1451234eebb8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2017-06-27  Jakub Jelinek  <jakub@redhat.com>
+
+       * predict.c (test_prediction_value_range): Use -1U instead of -1
+       to avoid narrowing conversion warning.
+       * dumpfile.c (dump_options): Wrap all value into dump_flags_t cast
+       to avoid narrowing conversion warning.
+       * opt-functions.awk (var_ref): Return (unsigned short) -1 instead of
+       -1.
+       * optc-gen.awk (END): Expect (unsigned short) -1 instead of -1.
+
 2017-06-27  Jerome Lambourg  <lambourg@adacore.com>
 
        * config/vxworks.h (VXWORKS_LIBS_RTP): Alternative definition for

diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c
index 6c55f05b677350e209f4fa531df932c98a1bdafb..c3dd12684006de05a03ed83d4dfb1f8c3f77dd93 100644 (file)
--- a/gcc/dumpfile.c
+++ b/gcc/dumpfile.c
@@ -110,9 +110,9 @@ static const struct dump_option_value_info dump_options[] =
   {"missed", MSG_MISSED_OPTIMIZATION},
   {"note", MSG_NOTE},
   {"optall", MSG_ALL},
-  {"all", ~(TDF_RAW | TDF_SLIM | TDF_LINENO | TDF_GRAPH | TDF_STMTADDR
-           | TDF_RHS_ONLY | TDF_NOUID | TDF_ENUMERATE_LOCALS | TDF_SCEV
-           | TDF_GIMPLE)},
+  {"all", dump_flags_t (~(TDF_RAW | TDF_SLIM | TDF_LINENO | TDF_GRAPH
+                       | TDF_STMTADDR | TDF_RHS_ONLY | TDF_NOUID
+                       | TDF_ENUMERATE_LOCALS | TDF_SCEV | TDF_GIMPLE))},
   {NULL, 0}
 };
 

diff --git a/gcc/opt-functions.awk b/gcc/opt-functions.awk
index 0736a6f3fafe6b8c6074fe6c0bb8a02ea6dd2d9b..b367d3a5b194c210f4bae8510c2e6795e4c3c5c6 100644 (file)
--- a/gcc/opt-functions.awk
+++ b/gcc/opt-functions.awk
@@ -275,7 +275,7 @@ function var_ref(name, flags)
                return "offsetof (struct gcc_options, x_target_flags)"
        if (opt_args("InverseMask", flags) != "")
                return "offsetof (struct gcc_options, x_target_flags)"
-       return "-1"
+       return "(unsigned short) -1"
 }
 
 # Given the option called NAME return a sanitized version of its name.

diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index 3b9126ccf97d75f795b4279385596081b6a296b6..eaaec25f74f040406cb712d8a8da5608a8d52f36 100644 (file)
--- a/gcc/optc-gen.awk
+++ b/gcc/optc-gen.awk
@@ -336,7 +336,7 @@ for (i = 0; i < n_opts; i++) {
                alias_posarg = nth_arg(1, alias_arg)
                alias_negarg = nth_arg(2, alias_arg)
 
-               if (var_ref(opts[i], flags[i]) != "-1")
+               if (var_ref(opts[i], flags[i]) != "(unsigned short) -1")
                        print "#error Alias setting variable"
 
                if (alias_posarg != "" && alias_negarg == "") {

diff --git a/gcc/predict.c b/gcc/predict.c
index 44151bc2e6ce3e0c1a42303f6178a6da0cb9c700..71d6d0a5bb1f5651d95b08571ec9c04fea4cd527 100644 (file)
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -4031,7 +4031,7 @@ test_prediction_value_range ()
 {
   branch_predictor predictors[] = {
 #include "predict.def"
-    {NULL, -1}
+    {NULL, -1U}
   };
 
   for (unsigned i = 0; predictors[i].name != NULL; i++)