[turbofan] Turn various diamonds into selects.

test/unittests/compiler/js-builtin-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/js-builtin-reducer.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/node-properties-inl.h"
 #include "src/compiler/typer.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
@@ skipping 70 matching lines @@
         graph()->NewNode(javascript()->CallFunction(3, NO_CALL_FUNCTION_FLAGS),
                          fun, UndefinedConstant(), p0);
     Reduction r = Reduce(call);
 
     if (t0->Is(Type::Unsigned32())) {
       ASSERT_TRUE(r.Changed());
       EXPECT_THAT(r.replacement(), p0);
     } else {
       Capture<Node*> branch;
       ASSERT_TRUE(r.Changed());
-      EXPECT_THAT(
-          r.replacement(),
-          IsPhi(kMachNone, p0, IsNumberSubtract(IsNumberConstant(0), p0),
-                IsMerge(IsIfTrue(CaptureEq(&branch)),
-                        IsIfFalse(AllOf(
-                            CaptureEq(&branch),
-                            IsBranch(IsNumberLessThan(IsNumberConstant(0), p0),
-                                     graph()->start()))))));
+      EXPECT_THAT(r.replacement(),
+                  IsSelect(kMachNone, IsNumberLessThan(IsNumberConstant(0), p0),
+                           p0, IsNumberSubtract(IsNumberConstant(0), p0)));
     }
   }
 }
 
 
 // -----------------------------------------------------------------------------
 // Math.sqrt
 
 
 TEST_F(JSBuiltinReducerTest, MathSqrt) {
@@ skipping 55 matching lines @@
     TRACED_FOREACH(Type*, t1, kNumberTypes) {
       Node* p0 = Parameter(t0, 0);
       Node* p1 = Parameter(t1, 1);
       Node* fun = HeapConstant(Unique<HeapObject>::CreateUninitialized(f));
       Node* call = graph()->NewNode(
           javascript()->CallFunction(4, NO_CALL_FUNCTION_FLAGS), fun,
           UndefinedConstant(), p0, p1);
       Reduction r = Reduce(call);
 
       if (t0->Is(Type::Integral32()) && t1->Is(Type::Integral32())) {
-        Capture<Node*> branch;
         ASSERT_TRUE(r.Changed());
-        EXPECT_THAT(
-            r.replacement(),
-            IsPhi(kMachNone, p1, p0,
-                  IsMerge(IsIfTrue(CaptureEq(&branch)),
-                          IsIfFalse(AllOf(CaptureEq(&branch),
-                                          IsBranch(IsNumberLessThan(p0, p1),
-                                                   graph()->start()))))));
+        EXPECT_THAT(r.replacement(),
+                    IsSelect(kMachNone, IsNumberLessThan(p1, p0), p1, p0));
       } else {
         ASSERT_FALSE(r.Changed());
         EXPECT_EQ(IrOpcode::kJSCallFunction, call->opcode());
       }
     }
   }
 }
 
 
 // -----------------------------------------------------------------------------
@@ skipping 114 matching lines @@
         graph()->NewNode(javascript()->CallFunction(3, NO_CALL_FUNCTION_FLAGS),
                          fun, UndefinedConstant(), p0);
     Reduction r = Reduce(call, MachineOperatorBuilder::Flag::kNoFlags);
 
     ASSERT_FALSE(r.Changed());
   }
 }
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8