Move compatible receiver check from CompileHandler to UpdateCaches

src/ic/ic.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/accessors.h"
 #include "src/api.h"
 #include "src/arguments.h"
 #include "src/base/bits.h"
@@ skipping 1080 matching lines @@
   // invalid lookups later.
   if (code->type() != Code::NORMAL &&
       Code::ExtractCacheHolderFromFlags(code->flags()) == flag) {
     Map::UpdateCodeCache(stub_holder_map, lookup->name(), code);
   }
 
   return code;
 }
 
 
+Handle<Code> LoadIC::ComputeHandler(LookupIterator* lookup,
+                                    Handle<Object> value) {

[Toon Verwaest, 2015/07/06 11:49:18]

Just move this code into LoadIC::UpdateCaches, that's basically what it's there
for.

+  if (lookup->state() == LookupIterator::ACCESSOR) {
+    Handle<Object> accessors = lookup->GetAccessors();
+    Handle<Map> map = receiver_map();
+    if (accessors->IsExecutableAccessorInfo()) {
+      Handle<ExecutableAccessorInfo> info =
+          Handle<ExecutableAccessorInfo>::cast(accessors);
+      if ((v8::ToCData<Address>(info->getter()) != 0) &&
+          !ExecutableAccessorInfo::IsCompatibleReceiverMap(isolate(), info,
+                                                           map)) {
+        return slow_stub();
+      }
+    } else if (accessors->IsAccessorPair()) {
+      Handle<Object> getter(Handle<AccessorPair>::cast(accessors)->getter(),
+                            isolate());
+      Handle<JSObject> holder = lookup->GetHolder<JSObject>();
+      Handle<Object> receiver = lookup->GetReceiver();
+      if (getter->IsJSFunction() && holder->HasFastProperties()) {
+        Handle<JSFunction> function = Handle<JSFunction>::cast(getter);
+        if (receiver->IsJSObject() || function->IsBuiltin() ||
+            !is_sloppy(function->shared()->language_mode())) {
+          CallOptimization call_optimization(function);
+          if (call_optimization.is_simple_api_call() &&
+              !call_optimization.IsCompatibleReceiver(receiver, holder)) {
+            return slow_stub();
+          }
+        }
+      }
+    }
+  }
+  return IC::ComputeHandler(lookup, value);
+}
+
+
 Handle<Code> LoadIC::CompileHandler(LookupIterator* lookup,
                                     Handle<Object> unused,
                                     CacheHolderFlag cache_holder) {
   Handle<Object> receiver = lookup->GetReceiver();
   if (receiver->IsString() &&
       Name::Equals(isolate()->factory()->length_string(), lookup->name())) {
     FieldIndex index = FieldIndex::ForInObjectOffset(String::kLengthOffset);
     return SimpleFieldLoad(index);
   }
 
@@ skipping 47 matching lines @@
         return stub.GetCode();
       }
 
       Handle<Object> accessors = lookup->GetAccessors();
       if (accessors->IsExecutableAccessorInfo()) {
         Handle<ExecutableAccessorInfo> info =
             Handle<ExecutableAccessorInfo>::cast(accessors);
         if (v8::ToCData<Address>(info->getter()) == 0) break;
         if (!ExecutableAccessorInfo::IsCompatibleReceiverMap(isolate(), info,
                                                              map)) {
+          // This case should be already handled in LoadIC::ComputeHandler.
+          UNREACHABLE();
           break;
         }
         if (!holder->HasFastProperties()) break;
         NamedLoadHandlerCompiler compiler(isolate(), map, holder, cache_holder);
         return compiler.CompileLoadCallback(lookup->name(), info);
       }
       if (accessors->IsAccessorPair()) {
         Handle<Object> getter(Handle<AccessorPair>::cast(accessors)->getter(),
                               isolate());
         if (!getter->IsJSFunction()) break;
         if (!holder->HasFastProperties()) break;
         Handle<JSFunction> function = Handle<JSFunction>::cast(getter);
         if (!receiver->IsJSObject() && !function->IsBuiltin() &&
             is_sloppy(function->shared()->language_mode())) {
           // Calling sloppy non-builtins with a value as the receiver
           // requires boxing.
           break;
         }
         CallOptimization call_optimization(function);
         NamedLoadHandlerCompiler compiler(isolate(), map, holder, cache_holder);
-        if (call_optimization.is_simple_api_call() &&
-            call_optimization.IsCompatibleReceiver(receiver, holder)) {
-          return compiler.CompileLoadCallback(lookup->name(), call_optimization,
-                                              lookup->GetAccessorIndex());
+        if (call_optimization.is_simple_api_call()) {
+          if (call_optimization.IsCompatibleReceiver(receiver, holder)) {
+            return compiler.CompileLoadCallback(
+                lookup->name(), call_optimization, lookup->GetAccessorIndex());
+          } else {
+            // This case should be already handled in LoadIC::ComputeHandler.
+            UNREACHABLE();
+          }
         }
         int expected_arguments =
             function->shared()->internal_formal_parameter_count();
         return compiler.CompileLoadViaGetter(
             lookup->name(), lookup->GetAccessorIndex(), expected_arguments);
       }
       break;
     }
 
     case LookupIterator::DATA: {
@@ skipping 1861 matching lines @@
 static const Address IC_utilities[] = {
 #define ADDR(name) FUNCTION_ADDR(name),
     IC_UTIL_LIST(ADDR) NULL
 #undef ADDR
 };
 
 
 Address IC::AddressFromUtilityId(IC::UtilityId id) { return IC_utilities[id]; }
 }  // namespace internal
 }  // namespace v8