Simplify inlining now that the scheduler is smart(er).

test/cctest/compiler/test-run-inlining.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/v8.h"
 
 #include "test/cctest/compiler/function-tester.h"
 
 #if V8_TURBOFAN_TARGET
 
@@ skipping 146 matching lines @@
   InstallAssertStackDepthHelper(CcTest::isolate());
   T.CheckCall(T.Val(42 + 42 + 12), T.Val(12), T.Val(4));
 }
 
 
 TEST(InlineTwiceDependentDiamond) {
   FLAG_context_specialization = true;
   FLAG_turbo_inlining = true;
   FunctionTester T(
       "(function () {"
-      "function foo(s) { if (true) {"
-      "                  return 12 } else { return 13; } };"
-      "function bar(s,t) { return foo(foo(1)); };"
-      "return bar;"
-      "})();");
-
-  InstallAssertStackDepthHelper(CcTest::isolate());
-  T.CheckCall(T.Val(12), T.undefined(), T.undefined());
-}
-
-
-TEST(InlineTwiceDependentDiamondReal) {
-  FLAG_context_specialization = true;
-  FLAG_turbo_inlining = true;
-  FunctionTester T(
-      "(function () {"
       "var x = 41;"
       "function foo(s) { AssertStackDepth(1); if (s % 2 == 0) {"
       "                  return x - s } else { return x + s; } };"
       "function bar(s,t) { return foo(foo(s)); };"
       "return bar;"
       "})();");
 
   InstallAssertStackDepthHelper(CcTest::isolate());
   T.CheckCall(T.Val(-11), T.Val(11), T.Val(4));
 }
 
+
+TEST(InlineTwiceDependentDiamondDifferent) {
+  FLAG_context_specialization = true;
+  FLAG_turbo_inlining = true;
+  FunctionTester T(
+      "(function () {"
+      "var x = 41;"
+      "function foo(s,t) { AssertStackDepth(1); if (s % 2 == 0) {"
+      "                    return x - s * t } else { return x + s * t; } };"
+      "function bar(s,t) { return foo(foo(s, 3), 5); };"
+      "return bar;"
+      "})();");
+
+  InstallAssertStackDepthHelper(CcTest::isolate());
+  T.CheckCall(T.Val(-329), T.Val(11), T.Val(4));
+}
+
 #endif  // V8_TURBOFAN_TARGET