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

test/mjsunit/regress/regress-2618.js

Index: test/mjsunit/regress/regress-2618.js
diff --git a/test/mjsunit/regress/regress-2618.js b/test/mjsunit/regress/regress-2618.js
index 56f6bf10e61a6f4ac27c34ad1f72625f106b553e..faffc5bf47d247a0f8830f363cd9495d804993a8 100644
--- a/test/mjsunit/regress/regress-2618.js
+++ b/test/mjsunit/regress/regress-2618.js
@@ -25,9 +25,7 @@
 // (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: --use-osr --allow-natives-syntax --ignition-osr --crankshaft
-
-assertFalse(isNeverOptimize());
+// Flags: --use-osr --allow-natives-syntax --ignition-osr
 
 function f() {
   do {
@@ -38,7 +36,7 @@
 }
 
 f();
-assertTrue(%GetOptimizationCount(f) > 0);
+assertTrue(%GetOptimizationCount(f) > 0 || %GetOptimizationStatus(f) == 4);
 
 function g() {
   for (var i = 0; i < 1; i++) { }
@@ -69,4 +67,4 @@
 }
 
 g();
-assertTrue(%GetOptimizationCount(g) > 0);
+assertTrue(%GetOptimizationCount(g) > 0 || %GetOptimizationStatus(g) == 4);