Remove special frontend for callbacks with slow-mode holders.

src/stub-cache.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/v8.h"
 
 #include "src/api.h"
 #include "src/arguments.h"
 #include "src/ast.h"
 #include "src/code-stubs.h"
@@ skipping 852 matching lines @@
   Label miss;
   NonexistentFrontendHeader(name, &miss, scratch2(), scratch3());
   GenerateLoadConstant(isolate()->factory()->undefined_value());
   FrontendFooter(name, &miss);
   return GetCode(kind(), Code::FAST, name);
 }
 
 
 Handle<Code> NamedLoadHandlerCompiler::CompileLoadCallback(
     Handle<Name> name, Handle<ExecutableAccessorInfo> callback) {
-  Register reg = CallbackFrontend(receiver(), name, callback);
+  Register reg = Frontend(receiver(), name);
   GenerateLoadCallback(reg, callback);
   return GetCode(kind(), Code::FAST, name);
 }
 
 
 Handle<Code> NamedLoadHandlerCompiler::CompileLoadCallback(
     Handle<Name> name, const CallOptimization& call_optimization) {
   DCHECK(call_optimization.is_simple_api_call());
-  Handle<JSFunction> callback = call_optimization.constant_function();
-  CallbackFrontend(receiver(), name, callback);
+  Frontend(receiver(), name);
   Handle<Map> receiver_map = IC::TypeToMap(*type(), isolate());
   GenerateFastApiCall(
       masm(), call_optimization, receiver_map,
       receiver(), scratch1(), false, 0, NULL);
   return GetCode(kind(), Code::FAST, name);
 }
 
 
 Handle<Code> NamedLoadHandlerCompiler::CompileLoadInterceptor(
     Handle<Name> name) {
@@ skipping 11 matching lines @@
   // TODO(368): Compile in the whole chain: all the interceptors in
   // prototypes and ultimate answer.
   GenerateLoadInterceptor(reg, &lookup, name);
   return GetCode(kind(), Code::FAST, name);
 }
 
 
 void NamedLoadHandlerCompiler::GenerateLoadPostInterceptor(
     Register interceptor_reg, Handle<Name> name, LookupResult* lookup) {
   Handle<JSObject> real_named_property_holder(lookup->holder());
+
+  set_type_for_object(holder());
+  set_holder(real_named_property_holder);
+  Register reg = Frontend(interceptor_reg, name);
+
   if (lookup->IsField()) {
-    FieldIndex field = lookup->GetFieldIndex();
-    if (holder().is_identical_to(real_named_property_holder)) {
-      GenerateLoadField(interceptor_reg, field, lookup->representation());
-    } else {
-      set_type_for_object(holder());
-      set_holder(real_named_property_holder);
-      Register reg = Frontend(interceptor_reg, name);
-      GenerateLoadField(reg, field, lookup->representation());
-    }
+    GenerateLoadField(reg, lookup->GetFieldIndex(), lookup->representation());
   } else {
-    // We found CALLBACKS property in prototype chain of interceptor's holder.
     DCHECK(lookup->type() == CALLBACKS);
     Handle<ExecutableAccessorInfo> callback(
         ExecutableAccessorInfo::cast(lookup->GetCallbackObject()));
     DCHECK(callback->getter() != NULL);
-
-    set_type_for_object(holder());
-    set_holder(real_named_property_holder);
-    Register reg = CallbackFrontend(interceptor_reg, name, callback);
     GenerateLoadCallback(reg, callback);
   }
 }
 
 
 Handle<Code> PropertyICCompiler::CompileMonomorphic(Handle<HeapType> type,
                                                     Handle<Code> handler,
                                                     Handle<Name> name,
                                                     IcCheckType check) {
   TypeHandleList types(1);
@@ skipping 349 matching lines @@
           Handle<FunctionTemplateInfo>(
               FunctionTemplateInfo::cast(signature->receiver()));
     }
   }
 
   is_simple_api_call_ = true;
 }
 
 
 } }  // namespace v8::internal