[Isolates] Merge from bleeding_edge to isolates, revisions 6100-6300.

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 108 matching lines @@
   object = *object_handle;
   value = *value_handle;
 
   if (uint32_v->Number() == number_v->Number()) {
     if (object->IsJSArray()) {
       return JSArray::cast(object)->SetElementsLength(*uint32_v);
     } else {
       // This means one of the object's prototypes is a JSArray and
       // the object does not have a 'length' property.
       // Calling SetProperty causes an infinite loop.
-      return object->IgnoreAttributesAndSetLocalProperty(HEAP->length_symbol(),
-                                                         value, NONE);
+      return object->SetLocalPropertyIgnoreAttributes(HEAP->length_symbol(),
+                                                      value, NONE);
     }
   }
   return Isolate::Current()->Throw(
       *FACTORY->NewRangeError("invalid_array_length",
           HandleVector<Object>(NULL, 0)));
 }
 
 
 const AccessorDescriptor Accessors::ArrayLength = {
   ArrayGetLength,
@@ skipping 631 matching lines @@
       if (i > 0) {
         // Function in question was inlined.
         return ConstructArgumentsObjectForInlinedFunction(frame, function, i);
       } else {
         // If there is an arguments variable in the stack, we return that.
         int index = function->shared()->scope_info()->
             StackSlotIndex(isolate->heap()->arguments_symbol());
         if (index >= 0) {
           Handle<Object> arguments =
               Handle<Object>(frame->GetExpression(index), isolate);
-          if (!arguments->IsTheHole()) return *arguments;
+          if (!arguments->IsArgumentsMarker()) return *arguments;
         }
 
         // If there isn't an arguments variable in the stack, we need to
         // find the frame that holds the actual arguments passed to the
         // function on the stack.
         it.AdvanceToArgumentsFrame();
         frame = it.frame();
 
         // Get the number of arguments and construct an arguments object
         // mirror for the right frame.
@@ skipping 106 matching lines @@
 }
 
 
 const AccessorDescriptor Accessors::ObjectPrototype = {
   ObjectGetPrototype,
   ObjectSetPrototype,
   0
 };
 
 } }  // namespace v8::internal