From 134efa824828834466593e60f7786669da3adb39 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 15 Jan 2015 15:46:09 -0500 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/constexpr.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7ad7737d582..2e74c0a4068 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2015-01-15 Jason Merrill + PR c++/64356 + * constexpr.c (cxx_eval_binary_expression): Fix pasto. + PR c++/63283 * constexpr.c (potential_constant_expression_1): Handle reference args in templates. diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index e27a892a51d..943ecbfecb1 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -1624,7 +1624,7 @@ cxx_eval_binary_expression (const constexpr_ctx *ctx, tree t, rhs = cxx_eval_constant_expression (ctx, orig_rhs, /*lval*/false, non_constant_p, overflow_p); if (!ptr) - VERIFY_CONSTANT (lhs); + VERIFY_CONSTANT (rhs); location_t loc = EXPR_LOCATION (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)) *non_constant_p = true; if (!ptr) - VERIFY_CONSTANT (lhs); + VERIFY_CONSTANT (r); return r; } -- 2.30.2