Re: C++ PATCH for c++/64356 and libstdc++/58777 (constexpr pointer arithmetic)

[Jason Merrill]

Oops, got a bit excessive with the copy/paste.


commit 4203eda52ae9eefc618d3819a3c468841bf2910b
Author: Jason Merrill <ja...@redhat.com>
Date:   Wed Jan 14 23:58:50 2015 -0500

    	PR c++/64356
    	* constexpr.c (cxx_eval_binary_expression): Fix pasto.

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index e27a892..943ecbf 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;
 }