From 5342156c7a5cede074f9334ca27a373e9802bd59 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Tue, 12 Jan 2016 16:48:29 +0000 Subject: [PATCH] =?UTF-8?q?re=20PR=20c++/68979=20(error:=20left=20operand?= =?UTF-8?q?=20of=20shift=20expression=20=E2=80=98(-1=20<<=204)=E2=80=99=20?= =?UTF-8?q?is=20negative)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR c++/68979 * constexpr.c (cxx_eval_check_shift_p): Use permerror rather than error_at and adjust the return value. * g++.dg/warn/permissive-1.C: New test. From-SVN: r232280 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/constexpr.c | 27 ++++++++++++------------ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/warn/permissive-1.C | 8 +++++++ 4 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 gcc/testsuite/g++.dg/warn/permissive-1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 363f6cd6cd5..7230c718c42 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-01-12 Marek Polacek + + PR c++/68979 + * constexpr.c (cxx_eval_check_shift_p): Use permerror rather than + error_at and adjust the return value. + 2016-01-12 Jakub Jelinek PR objc++/68511 diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index e60180ee6cd..36a1e4286df 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -1512,17 +1512,17 @@ cxx_eval_check_shift_p (location_t loc, const constexpr_ctx *ctx, if (tree_int_cst_sgn (rhs) == -1) { if (!ctx->quiet) - error_at (loc, "right operand of shift expression %q+E is negative", - build2_loc (loc, code, type, lhs, rhs)); - return true; + permerror (loc, "right operand of shift expression %q+E is negative", + build2_loc (loc, code, type, lhs, rhs)); + return (!flag_permissive || ctx->quiet); } if (compare_tree_int (rhs, uprec) >= 0) { if (!ctx->quiet) - error_at (loc, "right operand of shift expression %q+E is >= than " - "the precision of the left operand", - build2_loc (loc, code, type, lhs, rhs)); - return true; + permerror (loc, "right operand of shift expression %q+E is >= than " + "the precision of the left operand", + build2_loc (loc, code, type, lhs, rhs)); + return (!flag_permissive || ctx->quiet); } /* The value of E1 << E2 is E1 left-shifted E2 bit positions; [...] @@ -1536,9 +1536,10 @@ cxx_eval_check_shift_p (location_t loc, const constexpr_ctx *ctx, if (tree_int_cst_sgn (lhs) == -1) { if (!ctx->quiet) - error_at (loc, "left operand of shift expression %q+E is negative", - build2_loc (loc, code, type, lhs, rhs)); - return true; + permerror (loc, + "left operand of shift expression %q+E is negative", + build2_loc (loc, code, type, lhs, rhs)); + return (!flag_permissive || ctx->quiet); } /* For signed x << y the following: (unsigned) x >> ((prec (lhs) - 1) - y) @@ -1555,9 +1556,9 @@ cxx_eval_check_shift_p (location_t loc, const constexpr_ctx *ctx, if (tree_int_cst_lt (integer_one_node, t)) { if (!ctx->quiet) - error_at (loc, "shift expression %q+E overflows", - build2_loc (loc, code, type, lhs, rhs)); - return true; + permerror (loc, "shift expression %q+E overflows", + build2_loc (loc, code, type, lhs, rhs)); + return (!flag_permissive || ctx->quiet); } } return false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5eba1a19bf7..ec887e97505 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-01-12 Marek Polacek + + PR c++/68979 + * g++.dg/warn/permissive-1.C: New test. + 2016-01-12 Jakub Jelinek PR objc++/68511 diff --git a/gcc/testsuite/g++.dg/warn/permissive-1.C b/gcc/testsuite/g++.dg/warn/permissive-1.C new file mode 100644 index 00000000000..bfaca763782 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/permissive-1.C @@ -0,0 +1,8 @@ +// PR c++/68979 +// { dg-do compile { target int32 } } +// { dg-options "-fpermissive -Wno-shift-overflow -Wno-shift-count-overflow -Wno-shift-count-negative" } + +enum A { AA = -1 << 4 }; // { dg-warning "operand of shift expression" "" { target c++11 } } +enum B { BB = 1 << -4 }; // { dg-warning "operand of shift expression" } +enum C { CC = 1 << __SIZEOF_INT__ * 4 * __CHAR_BIT__ - 4 }; // { dg-warning "operand of shift expression" } +enum D { DD = 10 << __SIZEOF_INT__ * __CHAR_BIT__ - 2 }; // { dg-warning "shift expression" "" { target c++11 } }