diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-11-11 17:34:12 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-11-11 17:34:12 +0000 |
| commit | 8d2c507e3644ab03a0be5e9d79a7af89219f9346 (patch) | |
| tree | cda7a230e439ff04b7348e7945373732943c8a19 | |
| parent | 612bd51987e96b748c353c5d7ba20cdd1284d621 (diff) | |
| download | gcc-8d2c507e3644ab03a0be5e9d79a7af89219f9346.tar.gz | |
/cp
2014-11-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/63265
* pt.c (tsubst_copy_and_build, case COND_EXPR): Maybe fold to
constant the condition.
/testsuite
2014-11-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/63265
* g++.dg/cpp0x/constexpr-63265.C: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217361 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-63265.C | 19 |
4 files changed, 35 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9420908683d..a5513b6cf45 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-11-11 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/63265 + * pt.c (tsubst_copy_and_build, case COND_EXPR): Maybe fold to + constant the condition. + 2014-11-10 Andi Kleen <ak@linux.intel.com> * semantics.c (finish_goto_stmt): Call check_no_cilk. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index fa9652f748c..21d4039b623 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -15138,11 +15138,13 @@ tsubst_copy_and_build (tree t, case COND_EXPR: { tree cond = RECUR (TREE_OPERAND (t, 0)); + tree folded_cond = (maybe_constant_value + (fold_non_dependent_expr_sfinae (cond, tf_none))); tree exp1, exp2; - if (TREE_CODE (cond) == INTEGER_CST) + if (TREE_CODE (folded_cond) == INTEGER_CST) { - if (integer_zerop (cond)) + if (integer_zerop (folded_cond)) { ++c_inhibit_evaluation_warnings; exp1 = RECUR (TREE_OPERAND (t, 1)); @@ -15156,6 +15158,7 @@ tsubst_copy_and_build (tree t, exp2 = RECUR (TREE_OPERAND (t, 2)); --c_inhibit_evaluation_warnings; } + cond = folded_cond; } else { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3ffd69ae1fc..b301e055908 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-11-11 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/63265 + * g++.dg/cpp0x/constexpr-63265.C: New. + 2014-11-11 Evgeny Stupachenko <evstupac@gmail.com> * gcc.target/i386/pr52252-atom-1.c: New. diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-63265.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-63265.C new file mode 100644 index 00000000000..aa0ce5e7ce2 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-63265.C @@ -0,0 +1,19 @@ +// PR c++/63265 +// { dg-do compile { target c++11 } } + +#define LSHIFT (sizeof(unsigned int) * __CHAR_BIT__) + +template <int lshift> +struct SpuriouslyWarns1 { + static constexpr unsigned int v = lshift < LSHIFT ? 1U << lshift : 0; +}; + +static_assert(SpuriouslyWarns1<LSHIFT>::v == 0, "Impossible occurred"); + +template <int lshift> +struct SpuriouslyWarns2 { + static constexpr bool okay = lshift < LSHIFT; + static constexpr unsigned int v = okay ? 1U << lshift : 0; +}; + +static_assert(SpuriouslyWarns2<LSHIFT>::v == 0, "Impossible occurred"); |