diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-08-11 17:59:53 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-08-11 17:59:53 +0200 |
| commit | 385ed708b272bb4b53aeda3081960f63ac56d7b0 (patch) | |
| tree | 027726bc499da9489020e6e7087cd82393284aff | |
| parent | df7ec09f1209a33b35af3b798e6ff6ead5de8570 (diff) | |
| download | gcc-385ed708b272bb4b53aeda3081960f63ac56d7b0.zip gcc-385ed708b272bb4b53aeda3081960f63ac56d7b0.tar.gz gcc-385ed708b272bb4b53aeda3081960f63ac56d7b0.tar.bz2 | |
re PR c++/72868 (Constexpr expressions mistreat case ranges)
PR c++/72868
* constexpr.c (label_matches): Handle case range expressions.
* g++.dg/cpp1y/constexpr-switch4.C: New test.
From-SVN: r239379
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/constexpr-switch4.C | 27 |
4 files changed, 43 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 04d6aa0..c0d2460 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2016-08-11 Jakub Jelinek <jakub@redhat.com> + + PR c++/72868 + * constexpr.c (label_matches): Handle case range expressions. + 2016-08-11 Jason Merrill <jason@redhat.com> PR c++/73456 diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 20c870e..cb0fdee 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -3448,6 +3448,12 @@ label_matches (tree *jump_target, tree_stmt_iterator i, { if (!CASE_LOW (stmt)) default_label = i; + else if (CASE_HIGH (stmt)) + { + if (tree_int_cst_le (CASE_LOW (stmt), *jump_target) + && tree_int_cst_le (*jump_target, CASE_HIGH (stmt))) + return true; + } else if (tree_int_cst_equal (*jump_target, CASE_LOW (stmt))) return true; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c2482f5..bb47f76 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-08-11 Jakub Jelinek <jakub@redhat.com> + + PR c++/72868 + * g++.dg/cpp1y/constexpr-switch4.C: New test. + 2015-08-11 H.J. Lu <hongjiu.lu@intel.com> * gcc.target/i386/pieces-memcpy-1.c: New test. diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-switch4.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-switch4.C new file mode 100644 index 0000000..383bde9 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/constexpr-switch4.C @@ -0,0 +1,27 @@ +// PR c++/72868 +// { dg-do compile } +// { dg-options "-std=gnu++14" } + +constexpr int +foo (int i) +{ + switch (i) + { + case 11 ... 12: + return 4; + case 0 ... 9: + return 3; + default: + return 7; + } +} + +#define SA(X) static_assert((X),#X) +SA (foo (-1) == 7); +SA (foo (0) == 3); +SA (foo (3) == 3); +SA (foo (9) == 3); +SA (foo (10) == 7); +SA (foo (11) == 4); +SA (foo (12) == 4); +SA (foo (13) == 7); |