1 files changed, 16 insertions, 117 deletions

diff --git a/deps/v8/src/prototype.h b/deps/v8/src/prototype.h
index 71ae1ff9f1f..d09a6c82a60 100644
--- a/deps/v8/src/prototype.h
+++ b/deps/v8/src/prototype.h
@@ -27,72 +27,23 @@ class PrototypeIterator {
  public:
   enum WhereToEnd { END_AT_NULL, END_AT_NON_HIDDEN };
 
-  PrototypeIterator(Isolate* isolate, Handle<JSReceiver> receiver,
-                    WhereToStart where_to_start = kStartAtPrototype,
-                    WhereToEnd where_to_end = END_AT_NULL)
-      : isolate_(isolate),
-        object_(nullptr),
-        handle_(receiver),
-        where_to_end_(where_to_end),
-        is_at_end_(false),
-        seen_proxies_(0) {
-    CHECK(!handle_.is_null());
-    if (where_to_start == kStartAtPrototype) Advance();
-  }
+  inline PrototypeIterator(Isolate* isolate, Handle<JSReceiver> receiver,
+                           WhereToStart where_to_start = kStartAtPrototype,
+                           WhereToEnd where_to_end = END_AT_NULL);
 
-  PrototypeIterator(Isolate* isolate, JSReceiver* receiver,
-                    WhereToStart where_to_start = kStartAtPrototype,
-                    WhereToEnd where_to_end = END_AT_NULL)
-      : isolate_(isolate),
-        object_(receiver),
-        where_to_end_(where_to_end),
-        is_at_end_(false),
-        seen_proxies_(0) {
-    if (where_to_start == kStartAtPrototype) Advance();
-  }
+  inline PrototypeIterator(Isolate* isolate, JSReceiver* receiver,
+                           WhereToStart where_to_start = kStartAtPrototype,
+                           WhereToEnd where_to_end = END_AT_NULL);
 
-  explicit PrototypeIterator(Isolate* isolate, Map* receiver_map,
-                             WhereToEnd where_to_end = END_AT_NULL)
-      : isolate_(isolate),
-        object_(receiver_map->GetPrototypeChainRootMap(isolate_)->prototype()),
-        where_to_end_(where_to_end),
-        is_at_end_(object_->IsNull(isolate_)),
-        seen_proxies_(0) {
-    if (!is_at_end_ && where_to_end_ == END_AT_NON_HIDDEN) {
-      DCHECK(object_->IsJSReceiver());
-      Map* map = JSReceiver::cast(object_)->map();
-      is_at_end_ = !map->has_hidden_prototype();
-    }
-  }
+  inline explicit PrototypeIterator(Isolate* isolate, Map* receiver_map,
+                                    WhereToEnd where_to_end = END_AT_NULL);
 
-  explicit PrototypeIterator(Isolate* isolate, Handle<Map> receiver_map,
-                             WhereToEnd where_to_end = END_AT_NULL)
-      : isolate_(isolate),
-        object_(nullptr),
-        handle_(receiver_map->GetPrototypeChainRootMap(isolate_)->prototype(),
-                isolate_),
-        where_to_end_(where_to_end),
-        is_at_end_(handle_->IsNull(isolate_)),
-        seen_proxies_(0) {
-    if (!is_at_end_ && where_to_end_ == END_AT_NON_HIDDEN) {
-      DCHECK(handle_->IsJSReceiver());
-      Map* map = JSReceiver::cast(*handle_)->map();
-      is_at_end_ = !map->has_hidden_prototype();
-    }
-  }
+  inline explicit PrototypeIterator(Isolate* isolate, Handle<Map> receiver_map,
+                                    WhereToEnd where_to_end = END_AT_NULL);
 
   ~PrototypeIterator() {}
 
-  bool HasAccess() const {
-    // We can only perform access check in the handlified version of the
-    // PrototypeIterator.
-    DCHECK(!handle_.is_null());
-    if (handle_->IsAccessCheckNeeded()) {
-      return isolate_->MayAccess(handle(isolate_->context(), isolate_),
-                                 Handle<JSObject>::cast(handle_));
-    }
-    return true;
-  }
+  inline bool HasAccess() const;
 
   template <typename T = Object>
   T* GetCurrent() const {
@@ -107,67 +58,15 @@ class PrototypeIterator {
     return Handle<T>::cast(iterator.handle_);
   }
 
-  void Advance() {
-    if (handle_.is_null() && object_->IsJSProxy()) {
-      is_at_end_ = true;
-      object_ = ReadOnlyRoots(isolate_).null_value();
-      return;
-    } else if (!handle_.is_null() && handle_->IsJSProxy()) {
-      is_at_end_ = true;
-      handle_ = isolate_->factory()->null_value();
-      return;
-    }
-    AdvanceIgnoringProxies();
-  }
+  inline void Advance();
 
-  void AdvanceIgnoringProxies() {
-    Object* object = handle_.is_null() ? object_ : *handle_;
-    Map* map = HeapObject::cast(object)->map();
-
-    Object* prototype = map->prototype();
-    is_at_end_ = where_to_end_ == END_AT_NON_HIDDEN
-                     ? !map->has_hidden_prototype()
-                     : prototype->IsNull(isolate_);
-
-    if (handle_.is_null()) {
-      object_ = prototype;
-    } else {
-      handle_ = handle(prototype, isolate_);
-    }
-  }
+  inline void AdvanceIgnoringProxies();
 
   // Returns false iff a call to JSProxy::GetPrototype throws.
-  V8_WARN_UNUSED_RESULT bool AdvanceFollowingProxies() {
-    DCHECK(!(handle_.is_null() && object_->IsJSProxy()));
-    if (!HasAccess()) {
-      // Abort the lookup if we do not have access to the current object.
-      handle_ = isolate_->factory()->null_value();
-      is_at_end_ = true;
-      return true;
-    }
-    return AdvanceFollowingProxiesIgnoringAccessChecks();
-  }
+  V8_WARN_UNUSED_RESULT inline bool AdvanceFollowingProxies();
 
-  V8_WARN_UNUSED_RESULT bool AdvanceFollowingProxiesIgnoringAccessChecks() {
-    if (handle_.is_null() || !handle_->IsJSProxy()) {
-      AdvanceIgnoringProxies();
-      return true;
-    }
-
-    // Due to possible __proto__ recursion limit the number of Proxies
-    // we visit to an arbitrarily chosen large number.
-    seen_proxies_++;
-    if (seen_proxies_ > JSProxy::kMaxIterationLimit) {
-      isolate_->StackOverflow();
-      return false;
-    }
-    MaybeHandle<Object> proto =
-        JSProxy::GetPrototype(Handle<JSProxy>::cast(handle_));
-    if (!proto.ToHandle(&handle_)) return false;
-    is_at_end_ =
-        where_to_end_ == END_AT_NON_HIDDEN || handle_->IsNull(isolate_);
-    return true;
-  }
+  V8_WARN_UNUSED_RESULT inline bool
+  AdvanceFollowingProxiesIgnoringAccessChecks();
 
   bool IsAtEnd() const { return is_at_end_; }
   Isolate* isolate() const { return isolate_; }