Handlify callers of Object::GetElement.

src/builtins.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 489 matching lines @@
       array->set_elements(new_elms);
     }
 
     // Set the length.
     array->set_length(Smi::FromInt(new_length));
     return Smi::FromInt(new_length);
   }
 }
 
 
+static Handle<Object> ElementsAccessorSetLengthWrapper(
+    Isolate* isolate,
+    ElementsAccessor* accessor,
+    Handle<JSArray> array,
+    int new_length) {
+  CALL_HEAP_FUNCTION(isolate,
+                     accessor->SetLength(*array, Smi::FromInt(new_length)),
+                     Object);
+}
+
+
 BUILTIN(ArrayPop) {
   Heap* heap = isolate->heap();
   Object* receiver = *args.receiver();
   FixedArrayBase* elms_obj;
   MaybeObject* maybe_elms =
       EnsureJSArrayWithWritableFastElements(heap, receiver, NULL, 0);
   if (maybe_elms == NULL) return CallJsBuiltin(isolate, "ArrayPop", args);
   if (!maybe_elms->To(&elms_obj)) return maybe_elms;
 
   JSArray* array = JSArray::cast(receiver);
   ASSERT(!array->map()->is_observed());
 
   int len = Smi::cast(array->length())->value();
   if (len == 0) return heap->undefined_value();
 
   ElementsAccessor* accessor = array->GetElementsAccessor();
   int new_length = len - 1;
-  MaybeObject* maybe_result;
   if (accessor->HasElement(array, array, new_length, elms_obj)) {
-    maybe_result = accessor->Get(array, array, new_length, elms_obj);
+    MaybeObject* maybe_result =
+        accessor->Get(array, array, new_length, elms_obj);
+    if (maybe_result->IsFailure()) return maybe_result;
+    MaybeObject* maybe_failure =
+        accessor->SetLength(array, Smi::FromInt(new_length));
+    if (maybe_failure->IsFailure()) return maybe_failure;
+    return maybe_result;
   } else {
-    maybe_result = array->GetPrototype()->GetElement(isolate, len - 1);
+    // TODO(yangguo): handlify all once ElementsAccessors are handlified.
+    HandleScope scope(isolate);
+    Handle<Object> proto(array->GetPrototype(), isolate);
+    Handle<Object> element = Object::GetElement(isolate, proto, len - 1);
+    RETURN_IF_EMPTY_HANDLE(isolate, element);
+    Handle<JSArray> array_handle(array, isolate);
+    RETURN_IF_EMPTY_HANDLE(isolate,
+                           ElementsAccessorSetLengthWrapper(
+                               isolate, accessor, array_handle, new_length));
+    return *element;
   }
-  if (maybe_result->IsFailure()) return maybe_result;
-  MaybeObject* maybe_failure =
-      accessor->SetLength(array, Smi::FromInt(new_length));
-  if (maybe_failure->IsFailure()) return maybe_failure;
-  return maybe_result;
 }
 
 
 BUILTIN(ArrayShift) {
   Heap* heap = isolate->heap();
   Object* receiver = *args.receiver();
   FixedArrayBase* elms_obj;
   MaybeObject* maybe_elms_obj =
       EnsureJSArrayWithWritableFastElements(heap, receiver, NULL, 0);
   if (maybe_elms_obj == NULL)
@@ skipping 1190 matching lines @@
 }
 BUILTIN_LIST_C(DEFINE_BUILTIN_ACCESSOR_C)
 BUILTIN_LIST_A(DEFINE_BUILTIN_ACCESSOR_A)
 BUILTIN_LIST_H(DEFINE_BUILTIN_ACCESSOR_H)
 BUILTIN_LIST_DEBUG_A(DEFINE_BUILTIN_ACCESSOR_A)
 #undef DEFINE_BUILTIN_ACCESSOR_C
 #undef DEFINE_BUILTIN_ACCESSOR_A
 
 
 } }  // namespace v8::internal