Handlify Object::GetPrototype and (most) callers.

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 1091 matching lines @@
 }
 
 
 // -----------------------------------------------------------------------------
 //
 
 
 // Searches the hidden prototype chain of the given object for the first
 // object that is an instance of the given type.  If no such object can
 // be found then Heap::null_value() is returned.
-static inline Object* FindHidden(Heap* heap,
-                                 Object* object,
-                                 FunctionTemplateInfo* type) {
-  if (type->IsTemplateFor(object)) return object;
-  Object* proto = object->GetPrototype(heap->isolate());
+static inline Handle<Object> FindHidden(Isolate* isolate,
+                                        Handle<Object> object,
+                                        Handle<FunctionTemplateInfo> type) {

[Yang, 2014/04/15 13:10:48]

It seems like we don't need to handlify this and its callers.

+  if (type->IsTemplateFor(*object)) return object;
+  Handle<Object> proto = Object::GetPrototype(isolate, object);
   if (proto->IsJSObject() &&
-      JSObject::cast(proto)->map()->is_hidden_prototype()) {
-    return FindHidden(heap, proto, type);
+      JSObject::cast(*proto)->map()->is_hidden_prototype()) {
+    return FindHidden(isolate, proto, type);
   }
-  return heap->null_value();
+  return Handle<Object>();
 }
 
 
 // Returns the holder JSObject if the function can legally be called
 // with this receiver.  Returns Heap::null_value() if the call is
 // illegal.  Any arguments that don't fit the expected type is
 // overwritten with undefined.  Note that holder and the arguments are
 // implicitly rewritten with the first object in the hidden prototype
 // chain that actually has the expected type.
 static inline Object* TypeCheck(Heap* heap,
                                 int argc,
                                 Object** argv,
                                 FunctionTemplateInfo* info) {
+  Isolate* isolate = heap->isolate();
+  HandleScope scope(isolate);
+  DisallowHeapAllocation no_alloc;
   Object* recv = argv[0];
   // API calls are only supported with JSObject receivers.
   if (!recv->IsJSObject()) return heap->null_value();
   Object* sig_obj = info->signature();
   if (sig_obj->IsUndefined()) return recv;
   SignatureInfo* sig = SignatureInfo::cast(sig_obj);
   // If necessary, check the receiver
   Object* recv_type = sig->receiver();
   Object* holder = recv;
   if (!recv_type->IsUndefined()) {
-    holder = FindHidden(heap, holder, FunctionTemplateInfo::cast(recv_type));
-    if (holder == heap->null_value()) return heap->null_value();
+    Handle<Object> hidden =
+        FindHidden(
+            isolate,
+            handle(holder, isolate),
+            handle(FunctionTemplateInfo::cast(recv_type)));
+    if (hidden.is_null()) return heap->null_value();
+    holder = *hidden;
   }
   Object* args_obj = sig->args();
   // If there is no argument signature we're done
   if (args_obj->IsUndefined()) return holder;
   FixedArray* args = FixedArray::cast(args_obj);
   int length = args->length();
   if (argc <= length) length = argc - 1;
   for (int i = 0; i < length; i++) {
     Object* argtype = args->get(i);
     if (argtype->IsUndefined()) continue;
     Object** arg = &argv[-1 - i];
-    Object* current = *arg;
-    current = FindHidden(heap, current, FunctionTemplateInfo::cast(argtype));
-    if (current == heap->null_value()) current = heap->undefined_value();
-    *arg = current;
+    Handle<Object> current(*arg, isolate);
+    current = FindHidden(
+        isolate, current, handle(FunctionTemplateInfo::cast(argtype)));
+    if (!current.is_null()) {
+      *arg = *current;
+    } else {
+      *arg = heap->undefined_value();
+    }
   }
   return holder;
 }
 
 
 template <bool is_construct>
 MUST_USE_RESULT static MaybeObject* HandleApiCallHelper(
     BuiltinArguments<NEEDS_CALLED_FUNCTION> args, Isolate* isolate) {
   ASSERT(is_construct == CalledAsConstructor(isolate));
   Heap* heap = isolate->heap();
@@ skipping 576 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