From: Jason Merrill <jason@redhat.com>
Date: Fri, 24 Apr 2015 14:50:51 +0000 (-0400)
Subject: constexpr.c (potential_constant_expression_1): Remove obsolete code.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f8815f7a483ba1fa81d5d07b7a519cd3931fa701;p=gcc.git

constexpr.c (potential_constant_expression_1): Remove obsolete code.

	* constexpr.c (potential_constant_expression_1) [MINUS_EXPR]:
	Remove obsolete code.
	[NE_EXPR]: Likewise.

From-SVN: r222414
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a463f66c18e..767094d42ab 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-24  Jason Merrill  <jason@redhat.com>
+
+	* constexpr.c (potential_constant_expression_1) [MINUS_EXPR]:
+	Remove obsolete code.
+	[NE_EXPR]: Likewise.
+
 2015-04-23  Jason Merrill  <jason@redhat.com>
 
 	PR c++/65646
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 2990519b4bc..6465677a950 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -4156,15 +4156,6 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict,
       }
 
     case MINUS_EXPR:
-      /* -- a subtraction where both operands are pointers.   */
-      if (TYPE_PTR_P (TREE_OPERAND (t, 0))
-          && TYPE_PTR_P (TREE_OPERAND (t, 1)))
-        {
-          if (flags & tf_error)
-            error ("difference of two pointer expressions is not "
-                   "a constant expression");
-          return false;
-        }
       want_rval = true;
       goto binary;
 
@@ -4174,16 +4165,6 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict,
     case GE_EXPR:
     case EQ_EXPR:
     case NE_EXPR:
-      /* -- a relational or equality operator where at least
-            one of the operands is a pointer.  */
-      if (TYPE_PTR_P (TREE_OPERAND (t, 0))
-          || TYPE_PTR_P (TREE_OPERAND (t, 1)))
-        {
-          if (flags & tf_error)
-            error ("pointer comparison expression is not a "
-                   "constant expression");
-          return false;
-        }
       want_rval = true;
       goto binary;