typeck.c (cp_build_binary_op): Do not handle RROTATE_EXPR and LROTATE_EXPR.

2019-10-10  Paolo Carlini  <paolo.carlini@oracle.com>

	* typeck.c (cp_build_binary_op): Do not handle RROTATE_EXPR and
	LROTATE_EXPR.
	* constexpr.c (cxx_eval_constant_expression): Likewise.
	(potential_constant_expression_1): Likewise.
	* cp-gimplify.c (cp_fold): Likewise.
	* pt.c (tsubst_copy): Likewise.

From-SVN: r276903

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a925f7e0ca3c6d99ccbd2b59479e777b281b47dd..49fb50db2d28c153840eba36a3dc9f7d9dee3257 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-11  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * typeck.c (cp_build_binary_op): Do not handle RROTATE_EXPR and
+       LROTATE_EXPR.
+       * constexpr.c (cxx_eval_constant_expression): Likewise.
+       (potential_constant_expression_1): Likewise.
+       * pt.c (tsubst_copy): Likewise.
+
 2019-10-11  Jason Merrill  <jason@redhat.com>
 
        * decl2.c (mark_used): Don't clobber DECL_SOURCE_LOCATION on

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index ea502343e40176262bfaa1c177038c891d1de02c..46d41ecb984cfc894879277b039d4e1a667c95b6 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -5115,8 +5115,6 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
     case MAX_EXPR:
     case LSHIFT_EXPR:
     case RSHIFT_EXPR:
-    case LROTATE_EXPR:
-    case RROTATE_EXPR:
     case BIT_IOR_EXPR:
     case BIT_XOR_EXPR:
     case BIT_AND_EXPR:
@@ -7103,8 +7101,6 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now,
     case MAX_EXPR:
     case LSHIFT_EXPR:
     case RSHIFT_EXPR:
-    case LROTATE_EXPR:
-    case RROTATE_EXPR:
     case BIT_IOR_EXPR:
     case BIT_XOR_EXPR:
     case BIT_AND_EXPR:

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 84464436991b2adb3dbcdd8ce0de0db81ee5cf75..7fecc03f6cc3aff1a7e582f06207693c73952006 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -16308,8 +16308,6 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl)
     case TRUTH_OR_EXPR:
     case RSHIFT_EXPR:
     case LSHIFT_EXPR:
-    case RROTATE_EXPR:
-    case LROTATE_EXPR:
     case EQ_EXPR:
     case NE_EXPR:
     case MAX_EXPR:
@@ -18913,8 +18911,6 @@ tsubst_copy_and_build (tree t,
     case TRUTH_OR_EXPR:
     case RSHIFT_EXPR:
     case LSHIFT_EXPR:
-    case RROTATE_EXPR:
-    case LROTATE_EXPR:
     case EQ_EXPR:
     case NE_EXPR:
     case MAX_EXPR:

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 74ff8857fabfd35f93678229d749c7e30d2a2828..141d86f50c963bc5d467145e764f724261fdaeb2 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -4899,35 +4899,6 @@ cp_build_binary_op (const op_location_t &location,
        }
       break;
 
-    case RROTATE_EXPR:
-    case LROTATE_EXPR:
-      if (code0 == INTEGER_TYPE && code1 == INTEGER_TYPE)
-       {
-         result_type = type0;
-         if (TREE_CODE (op1) == INTEGER_CST)
-           {
-             if (tree_int_cst_lt (op1, integer_zero_node))
-               {
-                 if (complain & tf_warning)
-                   warning (0, (code == LROTATE_EXPR)
-                                 ? G_("left rotate count is negative")
-                                 : G_("right rotate count is negative"));
-               }
-             else if (compare_tree_int (op1, TYPE_PRECISION (type0)) >= 0)
-               {
-                 if (complain & tf_warning)
-                   warning (0, (code == LROTATE_EXPR) 
-                                  ? G_("left rotate count >= width of type")
-                                  : G_("right rotate count >= width of type"));
-               }
-           }
-         /* Convert the shift-count to an integer, regardless of
-            size of value being shifted.  */
-         if (TYPE_MAIN_VARIANT (TREE_TYPE (op1)) != integer_type_node)
-           op1 = cp_convert (integer_type_node, op1, complain);
-       }
-      break;
-
     case EQ_EXPR:
     case NE_EXPR:
       if (code0 == VECTOR_TYPE && code1 == VECTOR_TYPE)