Removed transitions from the accessor pair descriptors.

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 1304 matching lines @@
                            Handle<String> name,
                            LookupResult* lookup) {
   receiver->LocalLookup(*name, lookup);
   if (!StoreICableLookup(lookup)) {
     // 2nd chance: There can be accessors somewhere in the prototype chain, but
     // for compatibility reasons we have to hide this behind a flag. Note that
     // we explicitly exclude native accessors for now, because the stubs are not
     // yet prepared for this scenario.
     if (!FLAG_es5_readonly) return false;
     receiver->Lookup(*name, lookup);
-    if (!lookup->IsCallbacks()) return false;
+    if (!lookup->IsPropertyCallbacks()) return false;
     Handle<Object> callback(lookup->GetCallbackObject());
     return callback->IsAccessorPair() && StoreICableLookup(lookup);
   }
 
   if (lookup->IsInterceptor() &&
       receiver->GetNamedInterceptor()->setter()->IsUndefined()) {
     receiver->LocalLookupRealNamedProperty(*name, lookup);
     return StoreICableLookup(lookup);
   }
 
@@ skipping 169 matching lines @@
       break;
     }
     case INTERCEPTOR:
       ASSERT(!receiver->GetNamedInterceptor()->setter()->IsUndefined());
       code = isolate()->stub_cache()->ComputeStoreInterceptor(
           name, receiver, strict_mode);
       break;
     case CONSTANT_FUNCTION:
       return;
     case TRANSITION: {
-      Object* value = lookup->GetTransitionValue();
-      // Callbacks.
-      if (value->IsAccessorPair()) return;
-
+      Map* value = lookup->GetTransitionTarget();
       Handle<Map> transition(Map::cast(value));
       DescriptorArray* target_descriptors = transition->instance_descriptors();
       int descriptor = target_descriptors->LastAdded();
       PropertyDetails details = target_descriptors->GetDetails(descriptor);
 
       if (details.type() != FIELD || details.attributes() != NONE) return;
 
       int field_index = target_descriptors->GetFieldIndex(descriptor);
       code = isolate()->stub_cache()->ComputeStoreField(
           name, receiver, field_index, transition, strict_mode);
@@ skipping 442 matching lines @@
   // stub cache.
   Handle<Code> code;
 
   switch (type) {
     case FIELD:
       code = isolate()->stub_cache()->ComputeKeyedStoreField(
           name, receiver, lookup->GetFieldIndex(),
           Handle<Map>::null(), strict_mode);
       break;
     case TRANSITION: {
-      Object* value = lookup->GetTransitionValue();
-      // Callbacks transition.
-      if (value->IsAccessorPair()) {
-        code = (strict_mode == kStrictMode)
-            ? generic_stub_strict()
-            : generic_stub();
-        break;
-      }
+      Handle<Map> transition(lookup->GetTransitionTarget());
 
-      Handle<Map> transition(Map::cast(value));
       DescriptorArray* target_descriptors = transition->instance_descriptors();
       int descriptor = target_descriptors->LastAdded();
       PropertyDetails details = target_descriptors->GetDetails(descriptor);
 
       if (details.type() == FIELD && details.attributes() == NONE) {
         int field_index = target_descriptors->GetFieldIndex(descriptor);
         code = isolate()->stub_cache()->ComputeKeyedStoreField(
             name, receiver, field_index, transition, strict_mode);
         break;
       }
@@ skipping 138 matching lines @@
   JSArray* receiver = JSArray::cast(args[0]);
   Object* len = args[1];
 
   // The generated code should filter out non-Smis before we get here.
   ASSERT(len->IsSmi());
 
 #ifdef DEBUG
   // The length property has to be a writable callback property.
   LookupResult debug_lookup(isolate);
   receiver->LocalLookup(isolate->heap()->length_symbol(), &debug_lookup);
-  ASSERT(debug_lookup.IsCallbacks() && !debug_lookup.IsReadOnly());
+  ASSERT(debug_lookup.IsPropertyCallbacks() && !debug_lookup.IsReadOnly());
 #endif
 
   Object* result;
   { MaybeObject* maybe_result = receiver->SetElementsLength(len);
     if (!maybe_result->ToObject(&result)) return maybe_result;
   }
   return len;
 }
 
 
@@ skipping 543 matching lines @@
 #undef ADDR
 };
 
 
 Address IC::AddressFromUtilityId(IC::UtilityId id) {
   return IC_utilities[id];
 }
 
 
 } }  // namespace v8::internal