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

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
134efa82 · Jason Merrill · Jason Merrill · c3c29ba5 · 134efa82 · 134efa82
Commit 134efa82 authored Jan 15, 2015 by Jason Merrill Committed by Jason Merrill Jan 15, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

gcc/cp/ChangeLog
+3 -0

gcc/cp/constexpr.c
+2 -2

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
 2015-01-15  Jason Merrill  <jason@redhat.com>

+	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.

--- 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;
 }