diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-06-27 11:13:53 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-06-27 11:13:53 +0200 |
| commit | f6b3ca5a1a04285c61283122e96c84563691d161 (patch) | |
| tree | 724db2e4012e6ea190ddc221da0ae94e1d605332 | |
| parent | 58b45c4f3f5e83f3e3b7249eddd679c2c576e02e (diff) | |
| download | gcc-f6b3ca5a1a04285c61283122e96c84563691d161.zip gcc-f6b3ca5a1a04285c61283122e96c84563691d161.tar.gz gcc-f6b3ca5a1a04285c61283122e96c84563691d161.tar.bz2 | |
predict.c (test_prediction_value_range): Use -1U instead of -1 to avoid narrowing conversion warning.
* 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
| -rw-r--r-- | gcc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/dumpfile.c | 6 | ||||
| -rw-r--r-- | gcc/opt-functions.awk | 2 | ||||
| -rw-r--r-- | gcc/optc-gen.awk | 2 | ||||
| -rw-r--r-- | gcc/predict.c | 2 |
5 files changed, 16 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3f27541..3677319 100644 --- 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 6c55f05..c3dd126 100644 --- 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 0736a6f..b367d3a 100644 --- 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 3b9126c..eaaec25 100644 --- 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 44151bc..71d6d0a 100644 --- 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++) |