Revert change 1509 that flush ICs when adding setters on an object or...

src/accessors.cc

 // Copyright 2006-2008 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 491 matching lines @@
                                       void*) {
   // Before we can set the prototype we need to be sure
   // prototype cycles are prevented.
   // It is sufficient to validate that the receiver is not in the new prototype
   // chain.
 
   // Silently ignore the change if value is not a JSObject or null.
   // SpiderMonkey behaves this way.
   if (!value->IsJSObject() && !value->IsNull()) return value;
 
-  bool clear_ics = false;
   for (Object* pt = value; pt != Heap::null_value(); pt = pt->GetPrototype()) {
-    JSObject *obj = JSObject::cast(pt);
-    if (obj == receiver) {
+    if (JSObject::cast(pt) == receiver) {
       // Cycle detected.
       HandleScope scope;
       return Top::Throw(*Factory::NewError("cyclic_proto",
                                            HandleVector<Object>(NULL, 0)));
     }
-    if (obj->HasLocalPropertyWithType(CALLBACKS))
-      clear_ics = true;
   }
 
   // Find the first object in the chain whose prototype object is not
   // hidden and set the new prototype on that object.
   JSObject* current = receiver;
   Object* current_proto = receiver->GetPrototype();
   while (current_proto->IsJSObject() &&
          JSObject::cast(current_proto)->map()->is_hidden_prototype()) {
     current = JSObject::cast(current_proto);
     current_proto = current_proto->GetPrototype();
   }
 
   // Set the new prototype of the object.
   Object* new_map = current->map()->CopyDropTransitions();
   if (new_map->IsFailure()) return new_map;
   Map::cast(new_map)->set_prototype(value);
   current->set_map(Map::cast(new_map));
 
-  // Finally, if the prototype contains a setter we may have broken
-  // the assumptions made when creating ics so we have to clear them.
-  if (clear_ics) Heap::ClearStoreICs();
-
   // To be consistent with other Set functions, return the value.
   return value;
 }
 
 
 const AccessorDescriptor Accessors::ObjectPrototype = {
   ObjectGetPrototype,
   ObjectSetPrototype,
   0
 };
 
 } }  // namespace v8::internal