Revert of Do not eagerly instantiate accessors' JSFunction.

src/ic/call-optimization.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.
 
 #include "src/ic/call-optimization.h"
 
 
 namespace v8 {
 namespace internal {
 
-CallOptimization::CallOptimization(Handle<Object> function) {
-  constant_function_ = Handle<JSFunction>::null();
-  is_simple_api_call_ = false;
-  expected_receiver_type_ = Handle<FunctionTemplateInfo>::null();
-  api_call_info_ = Handle<CallHandlerInfo>::null();
-  if (function->IsJSFunction()) {
-    Initialize(Handle<JSFunction>::cast(function));
-  } else if (function->IsFunctionTemplateInfo()) {
-    Initialize(Handle<FunctionTemplateInfo>::cast(function));
-  }
+CallOptimization::CallOptimization(Handle<JSFunction> function) {
+  Initialize(function);
 }
 
 
 Handle<JSObject> CallOptimization::LookupHolderOfExpectedType(
     Handle<Map> object_map, HolderLookup* holder_lookup,
     int* holder_depth_in_prototype_chain) const {
   DCHECK(is_simple_api_call());
   if (!object_map->IsJSObjectMap()) {
     *holder_lookup = kHolderNotFound;
     return Handle<JSObject>::null();
@@ skipping 50 matching lines @@
           if (prototype == *holder) return true;
           object = JSObject::cast(prototype);
         }
       }
       break;
   }
   UNREACHABLE();
   return false;
 }
 
-void CallOptimization::Initialize(
-    Handle<FunctionTemplateInfo> function_template_info) {
-  if (function_template_info->call_code()->IsUndefined()) return;
-  api_call_info_ =
-      handle(CallHandlerInfo::cast(function_template_info->call_code()));
-
-  if (!function_template_info->signature()->IsUndefined()) {
-    expected_receiver_type_ =
-        handle(FunctionTemplateInfo::cast(function_template_info->signature()));
-  }
-  is_simple_api_call_ = true;
-}
 
 void CallOptimization::Initialize(Handle<JSFunction> function) {
+  constant_function_ = Handle<JSFunction>::null();
+  is_simple_api_call_ = false;
+  expected_receiver_type_ = Handle<FunctionTemplateInfo>::null();
+  api_call_info_ = Handle<CallHandlerInfo>::null();
+
   if (function.is_null() || !function->is_compiled()) return;
 
   constant_function_ = function;
   AnalyzePossibleApiFunction(function);
 }
 
 
 void CallOptimization::AnalyzePossibleApiFunction(Handle<JSFunction> function) {
   if (!function->shared()->IsApiFunction()) return;
   Handle<FunctionTemplateInfo> info(function->shared()->get_api_func_data());
 
   // Require a C++ callback.
   if (info->call_code()->IsUndefined()) return;
   api_call_info_ = handle(CallHandlerInfo::cast(info->call_code()));
 
   if (!info->signature()->IsUndefined()) {
     expected_receiver_type_ =
         handle(FunctionTemplateInfo::cast(info->signature()));
   }
 
   is_simple_api_call_ = true;
 }
 }  // namespace internal
 }  // namespace v8