Merged r12088 into 3.8 branch.

src/ic.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 920 matching lines @@
           if (!holder.is_identical_to(receiver)) return;
           code = isolate()->stub_cache()->ComputeLoadNormal();
         }
         break;
       case CALLBACKS: {
         Handle<Object> callback_object(lookup->GetCallbackObject());
         if (!callback_object->IsAccessorInfo()) return;
         Handle<AccessorInfo> callback =
             Handle<AccessorInfo>::cast(callback_object);
         if (v8::ToCData<Address>(callback->getter()) == 0) return;
+        if (!receiver->HasFastProperties()) return;
         code = isolate()->stub_cache()->ComputeLoadCallback(
             name, receiver, holder, callback);
         break;
       }
       case INTERCEPTOR:
         ASSERT(HasInterceptorGetter(*holder));
         code = isolate()->stub_cache()->ComputeLoadInterceptor(
             name, receiver, holder);
         break;
       default:
@@ skipping 216 matching lines @@
         code = isolate()->stub_cache()->ComputeKeyedLoadConstant(
             name, receiver, holder, constant);
         break;
       }
       case CALLBACKS: {
         Handle<Object> callback_object(lookup->GetCallbackObject());
         if (!callback_object->IsAccessorInfo()) return;
         Handle<AccessorInfo> callback =
             Handle<AccessorInfo>::cast(callback_object);
         if (v8::ToCData<Address>(callback->getter()) == 0) return;
+        if (!receiver->HasFastProperties()) return;
         code = isolate()->stub_cache()->ComputeKeyedLoadCallback(
             name, receiver, holder, callback);
         break;
       }
       case INTERCEPTOR:
         ASSERT(HasInterceptorGetter(lookup->holder()));
         code = isolate()->stub_cache()->ComputeKeyedLoadInterceptor(
             name, receiver, holder);
         break;
       default:
@@ skipping 194 matching lines @@
         if (lookup->holder() != *receiver) return;
         code = isolate()->stub_cache()->ComputeStoreNormal(strict_mode);
       }
       break;
     case CALLBACKS: {
       Handle<Object> callback_object(lookup->GetCallbackObject());
       if (!callback_object->IsAccessorInfo()) return;
       Handle<AccessorInfo> callback =
           Handle<AccessorInfo>::cast(callback_object);
       if (v8::ToCData<Address>(callback->setter()) == 0) return;
+      if (!receiver->HasFastProperties()) return;
       code = isolate()->stub_cache()->ComputeStoreCallback(
           name, receiver, callback, strict_mode);
       break;
     }
     case INTERCEPTOR:
       ASSERT(!receiver->GetNamedInterceptor()->setter()->IsUndefined());
       code = isolate()->stub_cache()->ComputeStoreInterceptor(
           name, receiver, strict_mode);
       break;
     case CONSTANT_FUNCTION:
@@ skipping 1026 matching lines @@
 #undef ADDR
 };
 
 
 Address IC::AddressFromUtilityId(IC::UtilityId id) {
   return IC_utilities[id];
 }
 
 
 } }  // namespace v8::internal