Porting r9605 to arm (elements kind conversion in generated code).

test/mjsunit/elements-transition.js

Index: test/mjsunit/elements-transition.js
diff --git a/test/mjsunit/elements-transition.js b/test/mjsunit/elements-transition.js
index ab3c69022932a9bc7e17ad33a2e3864c67137790..06d6229981c66d3d01d92689db21a2bf12a5637a 100644
--- a/test/mjsunit/elements-transition.js
+++ b/test/mjsunit/elements-transition.js
@@ -51,7 +51,7 @@ if (support_smi_only_arrays) {
         set(array_2, i, 'object');
         assertTrue(%HasFastElements(array_1));
         assertTrue(%HasFastElements(array_2));
-      } else {
+      } else if (i != length - 3) {

[Sven Panne, 2011/10/19 06:16:11]

Some comments what each if-branch is supposed to test might be helpful.

         set(array_1, i, 2*i+1);
         set(array_2, i, 2*i+1);
       }
@@ -64,9 +64,12 @@ if (support_smi_only_arrays) {
       } else if (i == length - 5 && test_object) {
         assertEquals('object', array_1[i]);
         assertEquals('object', array_2[i]);
-      } else {
+      } else if (i != length - 3) {
         assertEquals(2*i+1, array_1[i]);
         assertEquals(2*i+1, array_2[i]);
+      } else {
+        assertEquals(undefined, array_1[i]);
+        assertEquals(undefined, array_2[i]);
       }
     }
 
@@ -74,10 +77,10 @@ if (support_smi_only_arrays) {
     assertEquals(length, array_2.length);
   }
 
-  test(false, false, function(a,i,v){ a[i] = v; }, 100);
-  test(true,  false, function(a,i,v){ a[i] = v; }, 100);
-  test(false, true,  function(a,i,v){ a[i] = v; }, 100);
-  test(true,  true,  function(a,i,v){ a[i] = v; }, 100);
+  test(false, false, function(a,i,v){ a[i] = v; }, 20);
+  test(true,  false, function(a,i,v){ a[i] = v; }, 20);
+  test(false, true,  function(a,i,v){ a[i] = v; }, 20);
+  test(true,  true,  function(a,i,v){ a[i] = v; }, 20);
 
   test(false, false, function(a,i,v){ a[i] = v; }, 10000);
   test(true,  false, function(a,i,v){ a[i] = v; }, 10000);