re PR c++/64356 (Some constexpr expressions not recognized as constexpr)
PR c++/64356 * constexpr.c (cxx_eval_binary_expression): Fix pasto. From-SVN: r219687
This commit is contained in:
parent
c3c29ba588
commit
134efa8248
|
@ -1,5 +1,8 @@
|
||||||
2015-01-15 Jason Merrill <jason@redhat.com>
|
2015-01-15 Jason Merrill <jason@redhat.com>
|
||||||
|
|
||||||
|
PR c++/64356
|
||||||
|
* constexpr.c (cxx_eval_binary_expression): Fix pasto.
|
||||||
|
|
||||||
PR c++/63283
|
PR c++/63283
|
||||||
* constexpr.c (potential_constant_expression_1): Handle reference
|
* constexpr.c (potential_constant_expression_1): Handle reference
|
||||||
args in templates.
|
args in templates.
|
||||||
|
|
|
@ -1624,7 +1624,7 @@ cxx_eval_binary_expression (const constexpr_ctx *ctx, tree t,
|
||||||
rhs = cxx_eval_constant_expression (ctx, orig_rhs, /*lval*/false,
|
rhs = cxx_eval_constant_expression (ctx, orig_rhs, /*lval*/false,
|
||||||
non_constant_p, overflow_p);
|
non_constant_p, overflow_p);
|
||||||
if (!ptr)
|
if (!ptr)
|
||||||
VERIFY_CONSTANT (lhs);
|
VERIFY_CONSTANT (rhs);
|
||||||
|
|
||||||
location_t loc = EXPR_LOCATION (t);
|
location_t loc = EXPR_LOCATION (t);
|
||||||
enum tree_code code = TREE_CODE (t);
|
enum tree_code code = TREE_CODE (t);
|
||||||
|
@ -1640,7 +1640,7 @@ cxx_eval_binary_expression (const constexpr_ctx *ctx, tree t,
|
||||||
else if (cxx_eval_check_shift_p (loc, ctx, code, type, lhs, rhs))
|
else if (cxx_eval_check_shift_p (loc, ctx, code, type, lhs, rhs))
|
||||||
*non_constant_p = true;
|
*non_constant_p = true;
|
||||||
if (!ptr)
|
if (!ptr)
|
||||||
VERIFY_CONSTANT (lhs);
|
VERIFY_CONSTANT (r);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue