Revert of [fullcodegen] Refactor code that calls store ICs.

src/full-codegen/full-codegen.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/full-codegen/full-codegen.h"
 
 #include "src/ast/ast-numbering.h"
 #include "src/ast/ast.h"
 #include "src/ast/prettyprinter.h"
 #include "src/ast/scopes.h"
@@ skipping 217 matching lines @@
   CallIC(ic, id);
   if (FLAG_tf_load_ic_stub) RestoreContext();
 }
 
 void FullCodeGenerator::CallLoadGlobalIC(TypeofMode typeof_mode,
                                          TypeFeedbackId id) {
   Handle<Code> ic = CodeFactory::LoadGlobalIC(isolate(), typeof_mode).code();
   CallIC(ic, id);
 }
 
-void FullCodeGenerator::CallStoreIC(FeedbackVectorSlot slot,
-                                    Handle<Object> name, TypeFeedbackId id) {
-  DCHECK(name->IsName());
-  __ Move(StoreDescriptor::NameRegister(), name);
+void FullCodeGenerator::CallStoreIC(TypeFeedbackId id) {
+  Handle<Code> ic = CodeFactory::StoreIC(isolate(), language_mode()).code();
 
   STATIC_ASSERT(!StoreDescriptor::kPassLastArgsOnStack ||
                 StoreDescriptor::kStackArgumentsCount == 2);
   if (StoreDescriptor::kPassLastArgsOnStack) {
     __ Push(StoreDescriptor::ValueRegister());
-    EmitPushSlot(slot);
-  } else {
-    EmitLoadSlot(StoreDescriptor::SlotRegister(), slot);
+    __ Push(StoreDescriptor::SlotRegister());
   }
 
-  Handle<Code> ic = CodeFactory::StoreIC(isolate(), language_mode()).code();
   CallIC(ic, id);
   RestoreContext();
 }
 
-void FullCodeGenerator::CallKeyedStoreIC(FeedbackVectorSlot slot) {
+void FullCodeGenerator::CallKeyedStoreIC() {
+  Handle<Code> ic =
+      CodeFactory::KeyedStoreIC(isolate(), language_mode()).code();
+
   STATIC_ASSERT(!StoreDescriptor::kPassLastArgsOnStack ||
                 StoreDescriptor::kStackArgumentsCount == 2);
   if (StoreDescriptor::kPassLastArgsOnStack) {
     __ Push(StoreDescriptor::ValueRegister());
-    EmitPushSlot(slot);
-  } else {
-    EmitLoadSlot(StoreDescriptor::SlotRegister(), slot);
+    __ Push(StoreDescriptor::SlotRegister());
   }
 
-  Handle<Code> ic =
-      CodeFactory::KeyedStoreIC(isolate(), language_mode()).code();
   CallIC(ic);
   RestoreContext();
 }
 
 void FullCodeGenerator::RecordJSReturnSite(Call* call) {
   // We record the offset of the function return so we can rebuild the frame
   // if the function was inlined, i.e., this is the return address in the
   // inlined function's frame.
   //
   // The bailout state is ignored.  We defensively set it to TOS_REGISTER, which
@@ skipping 208 matching lines @@
 
   globals_ = saved_globals;
 }
 
 
 void FullCodeGenerator::VisitVariableProxy(VariableProxy* expr) {
   Comment cmnt(masm_, "[ VariableProxy");
   EmitVariableLoad(expr);
 }
 
+
 void FullCodeGenerator::VisitSloppyBlockFunctionStatement(
     SloppyBlockFunctionStatement* declaration) {
   Visit(declaration->statement());
 }
 
 
 int FullCodeGenerator::DeclareGlobalsFlags() {
   return info_->GetDeclareGlobalsFlags();
 }
 
@@ skipping 619 matching lines @@
 }
 
 void FullCodeGenerator::EmitPropertyKey(LiteralProperty* property,
                                         BailoutId bailout_id) {
   VisitForStackValue(property->key());
   CallRuntimeWithOperands(Runtime::kToName);
   PrepareForBailoutForId(bailout_id, BailoutState::TOS_REGISTER);
   PushOperand(result_register());
 }
 
-void FullCodeGenerator::EmitLoadSlot(Register destination,
-                                     FeedbackVectorSlot slot) {
+void FullCodeGenerator::EmitLoadStoreICSlot(FeedbackVectorSlot slot) {
   DCHECK(!slot.IsInvalid());
-  __ Move(destination, SmiFromSlot(slot));
-}
-
-void FullCodeGenerator::EmitPushSlot(FeedbackVectorSlot slot) {
-  __ Push(SmiFromSlot(slot));
+  __ Move(StoreDescriptor::SlotRegister(), SmiFromSlot(slot));
 }
 
 void FullCodeGenerator::VisitReturnStatement(ReturnStatement* stmt) {
   Comment cmnt(masm_, "[ ReturnStatement");
   SetStatementPosition(stmt);
   Expression* expr = stmt->expression();
   VisitForAccumulatorValue(expr);
   EmitUnwindAndReturn();
 }
 
@@ skipping 887 matching lines @@
   return info_->has_simple_parameters();
 }
 
 FunctionLiteral* FullCodeGenerator::literal() const { return info_->literal(); }
 
 #undef __
 
 
 }  // namespace internal
 }  // namespace v8