Revert of [tests] Make assertOptimized()/assertUnoptimized() great again.

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 12 matching lines @@
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Flags: --allow-natives-syntax
 
 function o1() {
 }
 
-o1(); o1();
-%OptimizeFunctionOnNextCall(o1);
-o1();
+if (%GetOptimizationStatus(o1) != 4) {
+  // 4 == optimization disabled.
+  o1(); o1();
+  %OptimizeFunctionOnNextCall(o1);
+  o1();
 
-// Check that the given function was optimized.
-assertOptimized(o1);
+  // Check that the given function was optimized.
+  assertOptimized(o1);
 
-// Test the %NeverOptimizeFunction runtime call.
-%NeverOptimizeFunction(u1);
-function u1() {
+  // Test the %NeverOptimizeFunction runtime call.
+  %NeverOptimizeFunction(u1);
+  function u1() {
+  }
+
+  function u2() {
+    u1();
+  }
+
+  u1(); u1();
+  u2(); u2();
+
+  %OptimizeFunctionOnNextCall(u1);
+  %OptimizeFunctionOnNextCall(u2);
+
+  u1(); u1();
+  u2(); u2();
+
+  // 2 => not optimized.
+  assertUnoptimized(u1);
+  assertOptimized(u2);
 }
-
-function u2() {
-  u1();
-}
-
-u1(); u1();
-u2(); u2();
-
-%OptimizeFunctionOnNextCall(u1);
-%OptimizeFunctionOnNextCall(u2);
-
-u1(); u1();
-u2(); u2();
-
-assertUnoptimized(u1);
-assertOptimized(u2);