A64: Synchronize with r15814.

test/mjsunit/never-optimize.js

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 18 matching lines @@
 
 function o1() {
 }
 
 if (%GetOptimizationStatus(o1) != 4) {
   // 4 == optimization disabled.
   o1(); o1();
   %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();
 
   %OptimizeFunctionOnNextCall(u1);
   %OptimizeFunctionOnNextCall(u2);
 
   u1(); u1();
   u2(); u2();
 
   // 2 => not optimized.
-  assertEquals(2, %GetOptimizationStatus(u1));
-  assertEquals(2, %GetOptimizationStatus(u2));
-
+  assertUnoptimized(u1);
+  assertOptimized(u2);
 }