Revert of [turbofan] Reduces x << y ^ x >>> (32 - y) to x ror (32 - y).

test/unittests/compiler/machine-operator-reducer-unittest.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/machine-operator-reducer.h"
 #include "src/base/bits.h"
 #include "src/base/division-by-constant.h"
 #include "src/base/ieee754.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/typer.h"
@@ skipping 711 matching lines @@
   EXPECT_EQ(reduction1.replacement(), node1);
   EXPECT_THAT(reduction1.replacement(), IsWord32Ror(value, sub));
 
   // (x >>> (32 - y)) | (x << y) => x ror (32 - y)
   Node* node2 = graph()->NewNode(machine()->Word32Or(), shr_l, shl_l);
   Reduction reduction2 = Reduce(node2);
   EXPECT_TRUE(reduction2.Changed());
   EXPECT_EQ(reduction2.replacement(), node2);
   EXPECT_THAT(reduction2.replacement(), IsWord32Ror(value, sub));
 
-  // (x << y) ^ (x >>> (32 - y)) => x ror (32 - y)
-  Node* node3 = graph()->NewNode(machine()->Word32Xor(), shl_l, shr_l);
-  Reduction reduction3 = Reduce(node3);
-  EXPECT_TRUE(reduction3.Changed());
-  EXPECT_EQ(reduction3.replacement(), node3);
-  EXPECT_THAT(reduction3.replacement(), IsWord32Ror(value, sub));
-
-  // (x >>> (32 - y)) ^ (x << y) => x ror (32 - y)
-  Node* node4 = graph()->NewNode(machine()->Word32Xor(), shr_l, shl_l);
-  Reduction reduction4 = Reduce(node4);
-  EXPECT_TRUE(reduction4.Changed());
-  EXPECT_EQ(reduction4.replacement(), node4);
-  EXPECT_THAT(reduction4.replacement(), IsWord32Ror(value, sub));
-
   // Testing rotate right.
   Node* shl_r = graph()->NewNode(machine()->Word32Shl(), value, sub);
   Node* shr_r = graph()->NewNode(machine()->Word32Shr(), value, shift);
 
   // (x << (32 - y)) | (x >>> y) => x ror y
-  Node* node5 = graph()->NewNode(machine()->Word32Or(), shl_r, shr_r);
-  Reduction reduction5 = Reduce(node5);
-  EXPECT_TRUE(reduction5.Changed());
-  EXPECT_EQ(reduction5.replacement(), node5);
-  EXPECT_THAT(reduction5.replacement(), IsWord32Ror(value, shift));
+  Node* node3 = graph()->NewNode(machine()->Word32Or(), shl_r, shr_r);
+  Reduction reduction3 = Reduce(node3);
+  EXPECT_TRUE(reduction3.Changed());
+  EXPECT_EQ(reduction3.replacement(), node3);
+  EXPECT_THAT(reduction3.replacement(), IsWord32Ror(value, shift));
 
   // (x >>> y) | (x << (32 - y)) => x ror y
-  Node* node6 = graph()->NewNode(machine()->Word32Or(), shr_r, shl_r);
-  Reduction reduction6 = Reduce(node6);
-  EXPECT_TRUE(reduction6.Changed());
-  EXPECT_EQ(reduction6.replacement(), node6);
-  EXPECT_THAT(reduction6.replacement(), IsWord32Ror(value, shift));
+  Node* node4 = graph()->NewNode(machine()->Word32Or(), shr_r, shl_r);
+  Reduction reduction4 = Reduce(node4);
+  EXPECT_TRUE(reduction4.Changed());
+  EXPECT_EQ(reduction4.replacement(), node4);
+  EXPECT_THAT(reduction4.replacement(), IsWord32Ror(value, shift));
+}
 
-  // (x << (32 - y)) ^ (x >>> y) => x ror y
-  Node* node7 = graph()->NewNode(machine()->Word32Xor(), shl_r, shr_r);
-  Reduction reduction7 = Reduce(node7);
-  EXPECT_TRUE(reduction7.Changed());
-  EXPECT_EQ(reduction7.replacement(), node7);
-  EXPECT_THAT(reduction7.replacement(), IsWord32Ror(value, shift));
-
-  // (x >>> y) ^ (x << (32 - y)) => x ror y
-  Node* node8 = graph()->NewNode(machine()->Word32Xor(), shr_r, shl_r);
-  Reduction reduction8 = Reduce(node8);
-  EXPECT_TRUE(reduction8.Changed());
-  EXPECT_EQ(reduction8.replacement(), node8);
-  EXPECT_THAT(reduction8.replacement(), IsWord32Ror(value, shift));
-}
 
 TEST_F(MachineOperatorReducerTest, ReduceToWord32RorWithConstant) {
   Node* value = Parameter(0);
   TRACED_FORRANGE(int32_t, k, 0, 31) {
     Node* shl =
         graph()->NewNode(machine()->Word32Shl(), value, Int32Constant(k));
     Node* shr =
         graph()->NewNode(machine()->Word32Shr(), value, Int32Constant(32 - k));
 
     // (x << K) | (x >>> ((32 - K) - y)) => x ror (32 - K)
@@ skipping 1288 matching lines @@
     Reduction r = Reduce(node);
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(r.replacement(),
                 IsStore(rep, base, index, value, effect, control));
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8