A64: Synchronize with r15814.

test/mjsunit/never-optimize.js

Index: test/mjsunit/never-optimize.js
diff --git a/test/mjsunit/never-optimize.js b/test/mjsunit/never-optimize.js
index 553cd17d6371a0f5ddaa50de5b06fefcabbe9acb..55b1f11981891a70fe01a4c25f55176416fd1a0b 100644
--- a/test/mjsunit/never-optimize.js
+++ b/test/mjsunit/never-optimize.js
@@ -36,22 +36,18 @@ if (%GetOptimizationStatus(o1) != 4) {
   %OptimizeFunctionOnNextCall(o1);
   o1();
 
-  // check that the given function was optimized.
-  var o1_status = %GetOptimizationStatus(o1);
-  assertTrue(o1_status == 1    // optimized
-          || o1_status == 3    // optimized (always opt)
-          || o1_status == 5);  // lazy recompile requested
+  // Check that the given function was optimized.
+  assertOptimized(o1);
 
-  // Test the %NeverOptimize runtime call.
+  // Test the %NeverOptimizeFunction runtime call.
+  %NeverOptimizeFunction(u1);
   function u1() {
-    %NeverOptimize();
   }
 
   function u2() {
+    u1();
   }
 
-  %NeverOptimize(u2);
-
   u1(); u1();
   u2(); u2();
 
@@ -62,7 +58,6 @@ if (%GetOptimizationStatus(o1) != 4) {
   u2(); u2();
 
   // 2 => not optimized.
-  assertEquals(2, %GetOptimizationStatus(u1));
-  assertEquals(2, %GetOptimizationStatus(u2));
-
+  assertUnoptimized(u1);
+  assertOptimized(u2);
 }