Fix elements-kind test to disable optimization of important functions under test; add simpler versi…

test/mjsunit/elements-kind.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 153 matching lines @@
   }
 }
 var smi_only = new Array(1, 2, 3);
 assertKind(elements_kind.fast_smi_only, smi_only);
 for (var i = 0; i < 3; i++) monomorphic(smi_only);
 %OptimizeFunctionOnNextCall(monomorphic);
 monomorphic(smi_only);
 
 if (support_smi_only_arrays) {
   function construct_smis() {
+    try {} catch (e) {} // TODO(titzer): DisableOptimization
     var a = [0, 0, 0];
     a[0] = 0;  // Send the COW array map to the steak house.
     assertKind(elements_kind.fast_smi_only, a);
     return a;
   }
   function construct_doubles() {
+    try {} catch (e) {} // TODO(titzer): DisableOptimization
     var a = construct_smis();
     a[0] = 1.5;
     assertKind(elements_kind.fast_double, a);
     return a;
   }
   function construct_objects() {
+    try {} catch (e) {} // TODO(titzer): DisableOptimization
     var a = construct_smis();
     a[0] = "one";
     assertKind(elements_kind.fast, a);
     return a;
   }
 
   // Test crankshafted transition SMI->DOUBLE.
   function convert_to_double(array) {
+    try {} catch (e) {} // TODO(titzer): DisableOptimization
     array[1] = 2.5;
     assertKind(elements_kind.fast_double, array);
     assertEquals(2.5, array[1]);
   }
   var smis = construct_smis();
   for (var i = 0; i < 3; i++) convert_to_double(smis);
   %OptimizeFunctionOnNextCall(convert_to_double);
   smis = construct_smis();
   convert_to_double(smis);
   // Test crankshafted transitions SMI->FAST and DOUBLE->FAST.
   function convert_to_fast(array) {
+    try {} catch (e) {} // TODO(titzer): DisableOptimization
     array[1] = "two";
     assertKind(elements_kind.fast, array);
     assertEquals("two", array[1]);
   }
   smis = construct_smis();
   for (var i = 0; i < 3; i++) convert_to_fast(smis);
   var doubles = construct_doubles();
   for (var i = 0; i < 3; i++) convert_to_fast(doubles);
   smis = construct_smis();
   doubles = construct_doubles();
   %OptimizeFunctionOnNextCall(convert_to_fast);
   convert_to_fast(smis);
   convert_to_fast(doubles);
   // Test transition chain SMI->DOUBLE->FAST (crankshafted function will
   // transition to FAST directly).
   function convert_mixed(array, value, kind) {
+    try {} catch (e) {} // TODO(titzer): DisableOptimization

[mvstanton, 2013/06/26 13:21:43]

What is the timeframe to bring these back to allow optimization, I ask because
it looks like the intent of this test is to verify that things work as expected
in the full codegen and crankshaft cases. If we don't test the crankshaft case,
regressions could slip in. Is there another way to achieve what you are looking
for, like making a copy of this test and specifying different flags?

[titzer, 2013/06/26 17:53:59]

As it turns out, what this test does is check the elements kind transitions that
happen in fullcode; i.e. it will not work if the methods in question are
compiled with crankshaft, which transitions the elements kinds differently. As
it turns out, these methods were never being compiled with Crankshaft, and when
I added a mode to do aggressive OSR (including the toplevel code here, which
then inlines these methods), then one of this test's asserts fails.

I'm not a big fan of tests for optimization states, in particular this one, but
at least this way, the tests' requirements are explicit. Before, we were just
lucky.

     array[1] = value;
     assertKind(kind, array);
     assertEquals(value, array[1]);
   }
   smis = construct_smis();
   for (var i = 0; i < 3; i++) {
     convert_mixed(smis, 1.5, elements_kind.fast_double);
   }
   doubles = construct_doubles();
   for (var i = 0; i < 3; i++) {
@@ skipping 113 matching lines @@
   var a = ["foo", "bar"];
   assertKind(elements_kind.fast, a);
   var b = a.splice(0, 1);
   assertKind(elements_kind.fast, b);
   var c = a.slice(0, 1);
   assertKind(elements_kind.fast, c);
 }
 
 // Throw away type information in the ICs for next stress run.
 gc();