Chromium Code Reviews| Index: test/mjsunit/array-literal-transitions.js | 
| diff --git a/test/mjsunit/array-literal-transitions.js b/test/mjsunit/array-literal-transitions.js | 
| index f657525eb6f1af773732decd853e5eaed0db0c78..45e3fa2eb57390b586aac306e2dd23693e0b6e5f 100644 | 
| --- a/test/mjsunit/array-literal-transitions.js | 
| +++ b/test/mjsunit/array-literal-transitions.js | 
| @@ -33,7 +33,7 @@ | 
| // in this test case. Depending on whether smi-only arrays are actually | 
| // enabled, this test takes the appropriate code path to check smi-only arrays. | 
| -support_smi_only_arrays = %HasFastSmiOnlyElements([1,2,3,4,5,6,7,8,9,10]); | 
| +support_smi_only_arrays = %HasFastSmiElements([1,2,3,4,5,6,7,8,9,10]); | 
| if (support_smi_only_arrays) { | 
| print("Tests include smi-only arrays."); | 
| @@ -44,167 +44,5 @@ if (support_smi_only_arrays) { | 
| // IC and Crankshaft support for smi-only elements in dynamic array literals. | 
| function get(foo) { return foo; } // Used to generate dynamic values. | 
| -function array_literal_test() { | 
| 
 
Jakob Kummerow
2012/05/13 21:55:27
What happened here? Didn't like this test any more
 
danno
2012/05/22 11:05:21
Done.
 
 | 
| - var a0 = [1, 2, 3]; | 
| - assertTrue(%HasFastSmiOnlyElements(a0)); | 
| var a1 = [get(1), get(2), get(3)]; | 
| - assertTrue(%HasFastSmiOnlyElements(a1)); | 
| - | 
| - var b0 = [1, 2, get("three")]; | 
| - assertTrue(%HasFastElements(b0)); | 
| - var b1 = [get(1), get(2), get("three")]; | 
| - assertTrue(%HasFastElements(b1)); | 
| - | 
| - var c0 = [1, 2, get(3.5)]; | 
| - assertTrue(%HasFastDoubleElements(c0)); | 
| - assertEquals(3.5, c0[2]); | 
| - assertEquals(2, c0[1]); | 
| - assertEquals(1, c0[0]); | 
| - | 
| - var c1 = [1, 2, 3.5]; | 
| - assertTrue(%HasFastDoubleElements(c1)); | 
| - assertEquals(3.5, c1[2]); | 
| - assertEquals(2, c1[1]); | 
| - assertEquals(1, c1[0]); | 
| - | 
| - var c2 = [get(1), get(2), get(3.5)]; | 
| - assertTrue(%HasFastDoubleElements(c2)); | 
| - assertEquals(3.5, c2[2]); | 
| - assertEquals(2, c2[1]); | 
| - assertEquals(1, c2[0]); | 
| - | 
| - var object = new Object(); | 
| - var d0 = [1, 2, object]; | 
| - assertTrue(%HasFastElements(d0)); | 
| - assertEquals(object, d0[2]); | 
| - assertEquals(2, d0[1]); | 
| - assertEquals(1, d0[0]); | 
| - | 
| - var e0 = [1, 2, 3.5]; | 
| - assertTrue(%HasFastDoubleElements(e0)); | 
| - assertEquals(3.5, e0[2]); | 
| - assertEquals(2, e0[1]); | 
| - assertEquals(1, e0[0]); | 
| - | 
| - var f0 = [1, 2, [1, 2]]; | 
| - assertTrue(%HasFastElements(f0)); | 
| - assertEquals([1,2], f0[2]); | 
| - assertEquals(2, f0[1]); | 
| - assertEquals(1, f0[0]); | 
| -} | 
| - | 
| -if (support_smi_only_arrays) { | 
| - for (var i = 0; i < 3; i++) { | 
| - array_literal_test(); | 
| - } | 
| - %OptimizeFunctionOnNextCall(array_literal_test); | 
| - array_literal_test(); | 
| - | 
| - function test_large_literal() { | 
| - | 
| - function d() { | 
| - gc(); | 
| - return 2.5; | 
| - } | 
| - | 
| - function o() { | 
| - gc(); | 
| - return new Object(); | 
| - } | 
| - | 
| - large = | 
| - [ 0, 1, 2, 3, 4, 5, d(), d(), d(), d(), d(), d(), o(), o(), o(), o() ]; | 
| - assertFalse(%HasDictionaryElements(large)); | 
| - assertFalse(%HasFastSmiOnlyElements(large)); | 
| - assertFalse(%HasFastDoubleElements(large)); | 
| - assertTrue(%HasFastElements(large)); | 
| - assertEquals(large, | 
| - [0, 1, 2, 3, 4, 5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, | 
| - new Object(), new Object(), new Object(), new Object()]); | 
| - } | 
| - | 
| - for (var i = 0; i < 3; i++) { | 
| - test_large_literal(); | 
| - } | 
| - %OptimizeFunctionOnNextCall(test_large_literal); | 
| - test_large_literal(); | 
| - | 
| - function deopt_array(use_literal) { | 
| - if (use_literal) { | 
| - return [.5, 3, 4]; | 
| - } else { | 
| - return new Array(); | 
| - } | 
| - } | 
| - | 
| - deopt_array(false); | 
| - deopt_array(false); | 
| - deopt_array(false); | 
| - %OptimizeFunctionOnNextCall(deopt_array); | 
| - var array = deopt_array(false); | 
| - assertTrue(2 != %GetOptimizationStatus(deopt_array)); | 
| - deopt_array(true); | 
| - assertTrue(2 != %GetOptimizationStatus(deopt_array)); | 
| - array = deopt_array(false); | 
| - assertTrue(2 != %GetOptimizationStatus(deopt_array)); | 
| - | 
| - // Check that unexpected changes in the objects stored into the boilerplate | 
| - // also force a deopt. | 
| - function deopt_array_literal_all_smis(a) { | 
| - return [0, 1, a]; | 
| - } | 
| - | 
| - deopt_array_literal_all_smis(2); | 
| - deopt_array_literal_all_smis(3); | 
| - deopt_array_literal_all_smis(4); | 
| - array = deopt_array_literal_all_smis(4); | 
| - assertEquals(0, array[0]); | 
| - assertEquals(1, array[1]); | 
| - assertEquals(4, array[2]); | 
| - %OptimizeFunctionOnNextCall(deopt_array_literal_all_smis); | 
| - array = deopt_array_literal_all_smis(5); | 
| - array = deopt_array_literal_all_smis(6); | 
| - assertTrue(2 != %GetOptimizationStatus(deopt_array_literal_all_smis)); | 
| - assertEquals(0, array[0]); | 
| - assertEquals(1, array[1]); | 
| - assertEquals(6, array[2]); | 
| - | 
| - array = deopt_array_literal_all_smis(.5); | 
| - assertTrue(1 != %GetOptimizationStatus(deopt_array_literal_all_smis)); | 
| - assertEquals(0, array[0]); | 
| - assertEquals(1, array[1]); | 
| - assertEquals(.5, array[2]); | 
| - | 
| - function deopt_array_literal_all_doubles(a) { | 
| - return [0.5, 1, a]; | 
| - } | 
| - | 
| - deopt_array_literal_all_doubles(.5); | 
| - deopt_array_literal_all_doubles(.5); | 
| - deopt_array_literal_all_doubles(.5); | 
| - array = deopt_array_literal_all_doubles(0.5); | 
| - assertEquals(0.5, array[0]); | 
| - assertEquals(1, array[1]); | 
| - assertEquals(0.5, array[2]); | 
| - %OptimizeFunctionOnNextCall(deopt_array_literal_all_doubles); | 
| - array = deopt_array_literal_all_doubles(5); | 
| - array = deopt_array_literal_all_doubles(6); | 
| - assertTrue(2 != %GetOptimizationStatus(deopt_array_literal_all_doubles)); | 
| - assertEquals(0.5, array[0]); | 
| - assertEquals(1, array[1]); | 
| - assertEquals(6, array[2]); | 
| - | 
| - var foo = new Object(); | 
| - array = deopt_array_literal_all_doubles(foo); | 
| - assertTrue(1 != %GetOptimizationStatus(deopt_array_literal_all_doubles)); | 
| - assertEquals(0.5, array[0]); | 
| - assertEquals(1, array[1]); | 
| - assertEquals(foo, array[2]); | 
| -} | 
| - | 
| -(function literals_after_osr() { | 
| - var color = [0]; | 
| - // Trigger OSR. | 
| - while (%GetOptimizationStatus(literals_after_osr) == 2) {} | 
| - return [color[0]]; | 
| -})(); | 
| + assertTrue(%HasFastSmiElements(a1)); |