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

test/mjsunit/array-constructor-feedback.js

 // Copyright 2012 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 66 matching lines @@
   assertKind(elements_kind.fast_double, b);
   assertOptimized(bar0);
   // bar0 should deopt
   b = bar0(Object);
   assertUnoptimized(bar0)
   // When it's re-optimized, we should call through the full stub
   bar0(Array);
     %OptimizeFunctionOnNextCall(bar0);
   b = bar0(Array);
   // This only makes sense to test if we allow crankshafting
-  if (4 != %GetOptimizationStatus(bar0)) {
+  var opt_status = %GetOptimizationStatus(bar0);
+  if ((opt_status & V8OptimizationStatus.kNeverOptimize) === 0) {
     // We also lost our ability to record kind feedback, as the site
     // is megamorphic now.
     assertKind(elements_kind.fast_smi_only, b);
     assertOptimized(bar0);
     b[0] = 3.5;
     c = bar0(Array);
     assertKind(elements_kind.fast_smi_only, c);
   }
 })();
 
@@ skipping 39 matching lines @@
 // change it anymore
 (function() {
   function bar() {
     return new Array();
   }
   a = bar();
   bar();
     %OptimizeFunctionOnNextCall(bar);
   b = bar();
   // This only makes sense to test if we allow crankshafting
-  if (4 != %GetOptimizationStatus(bar)) {
+  var opt_status = %GetOptimizationStatus(bar);
+  if ((opt_status & V8OptimizationStatus.kNeverOptimize) === 0) {
     assertOptimized(bar);
       %DebugPrint(3);
     b[0] = 3.5;
     c = bar();
     assertKind(elements_kind.fast_smi_only, c);
     assertOptimized(bar);
   }
 })();
 
 
@@ skipping 28 matching lines @@
   assertFalse(isHoley(a));
   a = bar(1);  // ouch!
   assertOptimized(bar);
   assertTrue(isHoley(a));
   a = bar(100);
   assertTrue(isHoley(a));
   a = bar(0);
   assertOptimized(bar);
   // Crankshafted functions don't use mementos, so feedback still
   // indicates a packed array is desired. (unless --nocrankshaft is in use).
-  if (4 != %GetOptimizationStatus(bar)) {
+  var opt_status = %GetOptimizationStatus(bar);
+  if ((opt_status & V8OptimizationStatus.kNeverOptimize) === 0) {
     assertFalse(isHoley(a));
   }
 })();
 
 // Test: Make sure that crankshaft continues with feedback for large arrays.
 (function() {
   function bar(len) { return new Array(len); }
   var size = 100001;
   // Perform a gc, because we are allocating a very large array and if a gc
   // happens during the allocation we could lose our memento.
   gc();
   bar(size)[0] = 'string';
   var res = bar(size);
   assertKind(elements_kind.fast, bar(size));
     %OptimizeFunctionOnNextCall(bar);
   assertKind(elements_kind.fast, bar(size));
   // But there is a limit, based on the size of the old generation, currently
   // 22937600, but double it to prevent the test being too brittle.
   var large_size = 22937600 * 2;
   assertKind(elements_kind.dictionary, bar(large_size));
 })();