Revert of Rework CallApi*Stubs.

src/ic/ia32/handler-compiler-ia32.cc

 // Copyright 2014 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.
 
 #if V8_TARGET_ARCH_IA32
 
 #include "src/ic/handler-compiler.h"
 
 #include "src/field-type.h"
 #include "src/ic/call-optimization.h"
@@ skipping 143 matching lines @@
   // Write the arguments to stack frame.
   if (is_store) {
     DCHECK(!receiver.is(store_parameter));
     DCHECK(!scratch.is(store_parameter));
     __ push(store_parameter);
   }
   __ push(scratch);
   // Stack now matches JSFunction abi.
   DCHECK(optimization.is_simple_api_call());
 
-  // Abi for CallApiCallbackStub.
+  // Abi for CallApiFunctionStub.
   Register callee = edi;
   Register data = ebx;
   Register holder = ecx;
   Register api_function_address = edx;
   scratch = no_reg;
 
   // Put callee in place.
   __ LoadAccessor(callee, accessor_holder, accessor_index,
                   is_store ? ACCESSOR_SETTER : ACCESSOR_GETTER);
 
@@ skipping 41 matching lines @@
     // Just tail call into the code.
     __ Jump(handle(Code::cast(api_call_info->fast_handler())),
             RelocInfo::CODE_TARGET);
     return;
   }
   // Put api_function_address in place.
   Address function_address = v8::ToCData<Address>(api_call_info->callback());
   __ mov(api_function_address, Immediate(function_address));
 
   // Jump to stub.
-  CallApiCallbackStub stub(isolate, is_store, call_data_undefined,
+  CallApiAccessorStub stub(isolate, is_store, call_data_undefined,
                            !optimization.is_constant_call());
   __ TailCallStub(&stub);
 }
 
 
 // Generate code to check that a global property cell is empty. Create
 // the property cell at compilation time if no cell exists for the
 // property.
 void PropertyHandlerCompiler::GenerateCheckPropertyCell(
     MacroAssembler* masm, Handle<JSGlobalObject> global, Handle<Name> name,
@@ skipping 581 matching lines @@
   // Return the generated code.
   return GetCode(kind(), Code::NORMAL, name);
 }
 
 
 #undef __
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32