diff options
| author | Jason Merrill <jason@redhat.com> | 2012-07-25 10:56:57 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-07-25 10:56:57 -0400 |
| commit | 9155a6ddc40af0eed7079eac318e6dd864dcdbc9 (patch) | |
| tree | 8e81ba95c15901f6fa7c5c5c1581d3192ee2fcd3 /gcc/cp | |
| parent | 5e7b9f609af51eb9e5523f19e3faea764f634657 (diff) | |
| download | gcc-9155a6ddc40af0eed7079eac318e6dd864dcdbc9.zip gcc-9155a6ddc40af0eed7079eac318e6dd864dcdbc9.tar.gz gcc-9155a6ddc40af0eed7079eac318e6dd864dcdbc9.tar.bz2 | |
re PR c++/54020 ([c++0x] incorrectly accepted constexpr functions)
PR c++/54020
* semantics.c (potential_constant_expression_1) [COND_EXPR]: Call
maybe_constant_value.
From-SVN: r189851
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 19 |
2 files changed, 18 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e7b4711..f5fbb5c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2012-07-25 Jason Merrill <jason@redhat.com> + PR c++/54020 + * semantics.c (potential_constant_expression_1) [COND_EXPR]: Call + maybe_constant_value. + * cp-tree.h (tsubst_flags): Remove tf_no_access_control. * call.c (standard_conversion): Don't set it. * class.c (resolve_address_of_overloaded_function): Don't check it. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 6381949..b27e8ab 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -8497,10 +8497,17 @@ potential_constant_expression_1 (tree t, bool want_rval, tsubst_flags_t flags) case TRUTH_ORIF_EXPR: tmp = boolean_false_node; truth: - if (TREE_OPERAND (t, 0) == tmp) - return potential_constant_expression_1 (TREE_OPERAND (t, 1), rval, flags); - else - return potential_constant_expression_1 (TREE_OPERAND (t, 0), rval, flags); + { + tree op = TREE_OPERAND (t, 0); + if (!potential_constant_expression_1 (op, rval, flags)) + return false; + if (!processing_template_decl) + op = maybe_constant_value (op); + if (tree_int_cst_equal (op, tmp)) + return potential_constant_expression_1 (TREE_OPERAND (t, 1), rval, flags); + else + return true; + } case PLUS_EXPR: case MULT_EXPR: @@ -8556,7 +8563,9 @@ potential_constant_expression_1 (tree t, bool want_rval, tsubst_flags_t flags) tmp = TREE_OPERAND (t, 0); if (!potential_constant_expression_1 (tmp, rval, flags)) return false; - else if (integer_zerop (tmp)) + if (!processing_template_decl) + tmp = maybe_constant_value (tmp); + if (integer_zerop (tmp)) return potential_constant_expression_1 (TREE_OPERAND (t, 2), want_rval, flags); else if (TREE_CODE (tmp) == INTEGER_CST) |