Message ID | 20160112125201.GE25528@redhat.com |
---|---|
State | New |
Headers | show |
On Tue, Jan 12, 2016 at 01:52:01PM +0100, Marek Polacek wrote: > --- gcc/testsuite/g++.dg/warn/permissive-1.C > +++ gcc/testsuite/g++.dg/warn/permissive-1.C > @@ -0,0 +1,8 @@ > +// PR c++/68979 > +// { dg-do compile } > +// { 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 << 100 }; // { dg-warning "operand of shift expression" } > +enum D { DD = 31 << 30 }; // { dg-warning "shift expression" "" { target c++11 } } Shouldn't this test be limited to // { dg-do compile { target int32 } } or better yet replace the 100 and 30 above with say __SIZEOF_INT__ * 4 * __CHAR_BIT__ - 4 and __SIZEOF_INT__ * __CHAR_BIT__ - 2 ? I'd guess that on say int16 targets, or int64 targets (if we have any at some point) or int128 targets this wouldn't do what you are expecting. { target int32 } is not exactly right, because it still assumes __CHAR_BIT__ == 8 and for other char sizes it could fail. Jakub
Changing the diagnostic is OK, but cxx_eval_check_shift_p should return true regardless of flag_permissive, so that SFINAE results follow the standard. Jason
On Tue, Jan 12, 2016 at 08:27:47AM -0500, Jason Merrill wrote: > Changing the diagnostic is OK, but cxx_eval_check_shift_p should return true > regardless of flag_permissive, so that SFINAE results follow the standard. There's a complication, because if I keep returning true, we'll give a compile-time error like this: permissive-1.C:5:18: warning: left operand of shift expression ‘(-1 << 4)’ is negative [-fpermissive] enum A { AA = -1 << 4 }; // { dg-warning "operand of shift expression" "" { target c++11 } } permissive-1.C:5:21: error: enumerator value for ‘AA’ is not an integer constant enum A { AA = -1 << 4 }; // { dg-warning "operand of shift expression" "" { target c++11 } } So I suppose that wouldn't really help. :( Marek
On 01/12/2016 09:05 AM, Marek Polacek wrote: > On Tue, Jan 12, 2016 at 08:27:47AM -0500, Jason Merrill wrote: >> Changing the diagnostic is OK, but cxx_eval_check_shift_p should return true >> regardless of flag_permissive, so that SFINAE results follow the standard. > > There's a complication, because if I keep returning true, we'll give a > compile-time error like this: > > permissive-1.C:5:18: warning: left operand of shift expression ‘(-1 << 4)’ is > negative [-fpermissive] > enum A { AA = -1 << 4 }; // { dg-warning "operand of shift expression" "" { > target c++11 } } > > permissive-1.C:5:21: error: enumerator value for ‘AA’ is not an integer > constant > enum A { AA = -1 << 4 }; // { dg-warning "operand of shift expression" "" { > target c++11 } } > > So I suppose that wouldn't really help. :( In that case, we need to return (!flag_permissive || ctx->quiet). Jason
diff --git gcc/cp/constexpr.c gcc/cp/constexpr.c index e60180e..dbcc242 100644 --- gcc/cp/constexpr.c +++ 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; } 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; } /* 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; } /* 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; } } return false; diff --git gcc/testsuite/g++.dg/warn/permissive-1.C gcc/testsuite/g++.dg/warn/permissive-1.C index e69de29..7223e68 100644 --- gcc/testsuite/g++.dg/warn/permissive-1.C +++ gcc/testsuite/g++.dg/warn/permissive-1.C @@ -0,0 +1,8 @@ +// PR c++/68979 +// { dg-do compile } +// { 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 << 100 }; // { dg-warning "operand of shift expression" } +enum D { DD = 31 << 30 }; // { dg-warning "shift expression" "" { target c++11 } }