From: Marek Polacek <polacek@redhat.com>
To: GCC Patches <gcc-patches@gcc.gnu.org>,
Jason Merrill <jason@redhat.com>,
Joseph Myers <joseph@codesourcery.com>,
Jeff Law <law@redhat.com>
Subject: [C/C++ PATCH] Fix -Wshift-overflow with sign bit
Date: Wed, 12 Aug 2015 15:39:00 -0000 [thread overview]
Message-ID: <20150812153927.GK3335@redhat.com> (raw)
This patch fixes a defect in -Wshift-overflow. We should only warn
about left-shifting 1 into the sign bit when -Wshift-overflow=2. But
this doesn't apply only for 1 << 31, but also for 2 << 30, etc.
In C++14, never warn about this.
Neither existing tests nor documentation require updating, I think.
Bootstrapped/regtested on x86_64-linux, ok for trunk?
2015-08-12 Marek Polacek <polacek@redhat.com>
PR c++/55095
* c-common.c (maybe_warn_shift_overflow): Properly handle
left-shifting 1 into the sign bit.
* c-c++-common/Wshift-overflow-6.c: New test.
* c-c++-common/Wshift-overflow-7.c: New test.
* g++.dg/cpp1y/left-shift-2.C: New test.
diff --git gcc/c-family/c-common.c gcc/c-family/c-common.c
index f6c5ddd..13175d8 100644
--- gcc/c-family/c-common.c
+++ gcc/c-family/c-common.c
@@ -12442,9 +12442,10 @@ maybe_warn_shift_overflow (location_t loc, tree op0, tree op1)
if (TYPE_UNSIGNED (type0))
return false;
+ unsigned int min_prec = (wi::min_precision (op0, SIGNED)
+ + TREE_INT_CST_LOW (op1));
/* Handle the left-shifting 1 into the sign bit case. */
- if (integer_onep (op0)
- && compare_tree_int (op1, prec0 - 1) == 0)
+ if (min_prec == prec0 + 1)
{
/* Never warn for C++14 onwards. */
if (cxx_dialect >= cxx14)
@@ -12456,8 +12457,6 @@ maybe_warn_shift_overflow (location_t loc, tree op0, tree op1)
return true;
}
- unsigned int min_prec = (wi::min_precision (op0, SIGNED)
- + TREE_INT_CST_LOW (op1));
bool overflowed = min_prec > prec0;
if (overflowed && c_inhibit_evaluation_warnings == 0)
warning_at (loc, OPT_Wshift_overflow_,
diff --git gcc/testsuite/c-c++-common/Wshift-overflow-6.c gcc/testsuite/c-c++-common/Wshift-overflow-6.c
index e69de29..fed79f8 100644
--- gcc/testsuite/c-c++-common/Wshift-overflow-6.c
+++ gcc/testsuite/c-c++-common/Wshift-overflow-6.c
@@ -0,0 +1,36 @@
+/* PR c++/55095 */
+/* { dg-do compile { target int32 } } */
+/* { dg-options "-Wshift-overflow=1" } */
+/* { dg-additional-options "-std=c++11" { target c++ } } */
+
+int i00 = 0b1 << 31;
+int i01 = 0b10 << 30;
+int i02 = 0b100 << 29;
+int i03 = 0b1000 << 28;
+int i04 = 0b10000 << 27;
+int i05 = 0b100000 << 26;
+int i06 = 0b1000000 << 25;
+int i07 = 0b10000000 << 24;
+int i08 = 0b100000000 << 23;
+int i09 = 0b1000000000 << 22;
+int i10 = 0b10000000000 << 21;
+int i11 = 0b100000000000 << 20;
+int i12 = 0b1000000000000 << 19;
+int i13 = 0b10000000000000 << 18;
+int i14 = 0b100000000000000 << 17;
+int i15 = 0b1000000000000000 << 16;
+int i16 = 0b10000000000000000 << 15;
+int i17 = 0b100000000000000000 << 14;
+int i18 = 0b1000000000000000000 << 13;
+int i19 = 0b10000000000000000000 << 12;
+int i20 = 0b100000000000000000000 << 11;
+int i21 = 0b1000000000000000000000 << 10;
+int i22 = 0b10000000000000000000000 << 9;
+int i23 = 0b100000000000000000000000 << 8;
+int i24 = 0b1000000000000000000000000 << 7;
+int i25 = 0b10000000000000000000000000 << 6;
+int i26 = 0b100000000000000000000000000 << 5;
+int i27 = 0b1000000000000000000000000000 << 4;
+int i28 = 0b10000000000000000000000000000 << 3;
+int i29 = 0b100000000000000000000000000000 << 2;
+int i30 = 0b1000000000000000000000000000000 << 1;
diff --git gcc/testsuite/c-c++-common/Wshift-overflow-7.c gcc/testsuite/c-c++-common/Wshift-overflow-7.c
index e69de29..0eb1fef 100644
--- gcc/testsuite/c-c++-common/Wshift-overflow-7.c
+++ gcc/testsuite/c-c++-common/Wshift-overflow-7.c
@@ -0,0 +1,36 @@
+/* PR c++/55095 */
+/* { dg-do compile { target int32 } } */
+/* { dg-options "-Wshift-overflow=2" } */
+/* { dg-additional-options "-std=c++11" { target c++ } } */
+
+int i00 = 0b1 << 31; /* { dg-warning "requires 33 bits to represent" } */
+int i01 = 0b10 << 30; /* { dg-warning "requires 33 bits to represent" } */
+int i02 = 0b100 << 29; /* { dg-warning "requires 33 bits to represent" } */
+int i03 = 0b1000 << 28; /* { dg-warning "requires 33 bits to represent" } */
+int i04 = 0b10000 << 27; /* { dg-warning "requires 33 bits to represent" } */
+int i05 = 0b100000 << 26; /* { dg-warning "requires 33 bits to represent" } */
+int i06 = 0b1000000 << 25; /* { dg-warning "requires 33 bits to represent" } */
+int i07 = 0b10000000 << 24; /* { dg-warning "requires 33 bits to represent" } */
+int i08 = 0b100000000 << 23; /* { dg-warning "requires 33 bits to represent" } */
+int i09 = 0b1000000000 << 22; /* { dg-warning "requires 33 bits to represent" } */
+int i10 = 0b10000000000 << 21; /* { dg-warning "requires 33 bits to represent" } */
+int i11 = 0b100000000000 << 20; /* { dg-warning "requires 33 bits to represent" } */
+int i12 = 0b1000000000000 << 19; /* { dg-warning "requires 33 bits to represent" } */
+int i13 = 0b10000000000000 << 18; /* { dg-warning "requires 33 bits to represent" } */
+int i14 = 0b100000000000000 << 17; /* { dg-warning "requires 33 bits to represent" } */
+int i15 = 0b1000000000000000 << 16; /* { dg-warning "requires 33 bits to represent" } */
+int i16 = 0b10000000000000000 << 15; /* { dg-warning "requires 33 bits to represent" } */
+int i17 = 0b100000000000000000 << 14; /* { dg-warning "requires 33 bits to represent" } */
+int i18 = 0b1000000000000000000 << 13; /* { dg-warning "requires 33 bits to represent" } */
+int i19 = 0b10000000000000000000 << 12; /* { dg-warning "requires 33 bits to represent" } */
+int i20 = 0b100000000000000000000 << 11; /* { dg-warning "requires 33 bits to represent" } */
+int i21 = 0b1000000000000000000000 << 10; /* { dg-warning "requires 33 bits to represent" } */
+int i22 = 0b10000000000000000000000 << 9; /* { dg-warning "requires 33 bits to represent" } */
+int i23 = 0b100000000000000000000000 << 8; /* { dg-warning "requires 33 bits to represent" } */
+int i24 = 0b1000000000000000000000000 << 7; /* { dg-warning "requires 33 bits to represent" } */
+int i25 = 0b10000000000000000000000000 << 6; /* { dg-warning "requires 33 bits to represent" } */
+int i26 = 0b100000000000000000000000000 << 5; /* { dg-warning "requires 33 bits to represent" } */
+int i27 = 0b1000000000000000000000000000 << 4; /* { dg-warning "requires 33 bits to represent" } */
+int i28 = 0b10000000000000000000000000000 << 3; /* { dg-warning "requires 33 bits to represent" } */
+int i29 = 0b100000000000000000000000000000 << 2; /* { dg-warning "requires 33 bits to represent" } */
+int i30 = 0b1000000000000000000000000000000 << 1; /* { dg-warning "requires 33 bits to represent" } */
diff --git gcc/testsuite/g++.dg/cpp1y/left-shift-2.C gcc/testsuite/g++.dg/cpp1y/left-shift-2.C
index e69de29..342f9072 100644
--- gcc/testsuite/g++.dg/cpp1y/left-shift-2.C
+++ gcc/testsuite/g++.dg/cpp1y/left-shift-2.C
@@ -0,0 +1,36 @@
+// PR c++/55095
+// { dg-do compile { target c++14 } }
+// { dg-options "-Wshift-overflow=2" }
+// { dg-require-effective-target int32 }
+
+int i00 = 0b1 << 31;
+int i01 = 0b10 << 30;
+int i02 = 0b100 << 29;
+int i03 = 0b1000 << 28;
+int i04 = 0b10000 << 27;
+int i05 = 0b100000 << 26;
+int i06 = 0b1000000 << 25;
+int i07 = 0b10000000 << 24;
+int i08 = 0b100000000 << 23;
+int i09 = 0b1000000000 << 22;
+int i10 = 0b10000000000 << 21;
+int i11 = 0b100000000000 << 20;
+int i12 = 0b1000000000000 << 19;
+int i13 = 0b10000000000000 << 18;
+int i14 = 0b100000000000000 << 17;
+int i15 = 0b1000000000000000 << 16;
+int i16 = 0b10000000000000000 << 15;
+int i17 = 0b100000000000000000 << 14;
+int i18 = 0b1000000000000000000 << 13;
+int i19 = 0b10000000000000000000 << 12;
+int i20 = 0b100000000000000000000 << 11;
+int i21 = 0b1000000000000000000000 << 10;
+int i22 = 0b10000000000000000000000 << 9;
+int i23 = 0b100000000000000000000000 << 8;
+int i24 = 0b1000000000000000000000000 << 7;
+int i25 = 0b10000000000000000000000000 << 6;
+int i26 = 0b100000000000000000000000000 << 5;
+int i27 = 0b1000000000000000000000000000 << 4;
+int i28 = 0b10000000000000000000000000000 << 3;
+int i29 = 0b100000000000000000000000000000 << 2;
+int i30 = 0b1000000000000000000000000000000 << 1;
Marek
next reply other threads:[~2015-08-12 15:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-12 15:39 Marek Polacek [this message]
2015-08-12 17:10 ` Jeff Law
2015-08-12 17:28 ` Toon Moene
2015-08-12 17:33 ` Jeff Law
2015-08-12 17:40 ` Marek Polacek
2015-08-12 17:46 ` Jeff Law
2015-08-23 8:50 ` Jason Merrill
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150812153927.GK3335@redhat.com \
--to=polacek@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jason@redhat.com \
--cc=joseph@codesourcery.com \
--cc=law@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).