Vector ICs: Get rid of stack arguments on ia32 transitioning stores.

src/ic/handler-compiler.cc

Index: src/ic/handler-compiler.cc
diff --git a/src/ic/handler-compiler.cc b/src/ic/handler-compiler.cc
index 77e0fb5e435b5db4bc366337954f311bc084b3d1..077a3a9a6d7e2d0043291a7ee7d890e7d2079263 100644
--- a/src/ic/handler-compiler.cc
+++ b/src/ic/handler-compiler.cc
@@ -456,17 +456,18 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreTransition(
   DCHECK(!transition->is_access_check_needed());
 
   // Call to respective StoreTransitionStub.
-  Register transition_map_reg = StoreTransitionHelper::MapRegister();
-  bool stack_args = StoreTransitionHelper::UsesStackArgs();
-  Register map_reg = stack_args ? scratch1() : transition_map_reg;
+  bool virtual_args = StoreTransitionHelper::HasVirtualSlotArg();
+  Register map_reg = StoreTransitionHelper::MapRegister();
 
   if (details.type() == DATA_CONSTANT) {
     DCHECK(descriptors->GetValue(descriptor)->IsJSFunction());
-    GenerateRestoreMap(transition, map_reg, scratch2(), &miss);
-    GenerateConstantCheck(map_reg, descriptor, value(), scratch2(), &miss);
-    if (stack_args) {
-      // Also pushes vector and slot.
-      GeneratePushMap(map_reg, scratch2());
+    Register tmp =
+        virtual_args ? VectorStoreICDescriptor::VectorRegister() : map_reg;
+    GenerateRestoreMap(transition, tmp, scratch2(), &miss);
+    GenerateConstantCheck(tmp, descriptor, value(), scratch2(), &miss);
+    if (virtual_args) {
+      // This will move the map from tmp into map_reg.
+      RearrangeVectorAndSlot(tmp, map_reg);
     } else if (FLAG_vector_stores) {
       PopVectorAndSlot();
     }
@@ -484,10 +485,11 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreTransition(
             ? StoreTransitionStub::ExtendStorageAndStoreMapAndValue
             : StoreTransitionStub::StoreMapAndValue;
 
-    GenerateRestoreMap(transition, map_reg, scratch2(), &miss);
-    if (stack_args) {
-      // Also pushes vector and slot.
-      GeneratePushMap(map_reg, scratch2());
+    Register tmp =
+        virtual_args ? VectorStoreICDescriptor::VectorRegister() : map_reg;
+    GenerateRestoreMap(transition, tmp, scratch2(), &miss);
+    if (virtual_args) {
+      RearrangeVectorAndSlot(tmp, map_reg);
     } else if (FLAG_vector_stores) {
       PopVectorAndSlot();
     }