Revert "Speed up the LookupIterator"

src/lookup.h

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_LOOKUP_H_
 #define V8_LOOKUP_H_
 
 #include "src/factory.h"
 #include "src/isolate.h"
 #include "src/objects.h"
@@ skipping 29 matching lines @@
     DATA,
     TRANSITION,
     // Set state_ to BEFORE_PROPERTY to ensure that the next lookup will be a
     // PROPERTY lookup.
     BEFORE_PROPERTY = INTERCEPTOR
   };
 
   LookupIterator(Handle<Object> receiver, Handle<Name> name,
                  Configuration configuration = DEFAULT)
       : configuration_(ComputeConfiguration(configuration, name)),
+        state_(NOT_FOUND),
         interceptor_state_(InterceptorState::kUninitialized),
         property_details_(PropertyDetails::Empty()),
         isolate_(name->GetIsolate()),
         name_(isolate_->factory()->InternalizeName(name)),
         // kMaxUInt32 isn't a valid index.
         index_(kMaxUInt32),
         receiver_(receiver),
-        initial_holder_(GetRoot(isolate_, receiver)) {
+        holder_(GetRoot(isolate_, receiver)),
+        initial_holder_(holder_),
+        number_(DescriptorArray::kNotFound) {
 #ifdef DEBUG
     uint32_t index;  // Assert that the name is not an array index.
     DCHECK(!name->AsArrayIndex(&index));
 #endif  // DEBUG
-    Start<false>();
+    Next();
   }
 
   LookupIterator(Handle<Object> receiver, Handle<Name> name,
                  Handle<JSReceiver> holder,
                  Configuration configuration = DEFAULT)
       : configuration_(ComputeConfiguration(configuration, name)),
+        state_(NOT_FOUND),
         interceptor_state_(InterceptorState::kUninitialized),
         property_details_(PropertyDetails::Empty()),
         isolate_(name->GetIsolate()),
         name_(isolate_->factory()->InternalizeName(name)),
         // kMaxUInt32 isn't a valid index.
         index_(kMaxUInt32),
         receiver_(receiver),
-        initial_holder_(holder) {
+        holder_(holder),
+        initial_holder_(holder_),
+        number_(DescriptorArray::kNotFound) {
 #ifdef DEBUG
     uint32_t index;  // Assert that the name is not an array index.
     DCHECK(!name->AsArrayIndex(&index));
 #endif  // DEBUG
-    Start<false>();
+    Next();
   }
 
   LookupIterator(Isolate* isolate, Handle<Object> receiver, uint32_t index,
                  Configuration configuration = DEFAULT)
       : configuration_(configuration),
+        state_(NOT_FOUND),
         interceptor_state_(InterceptorState::kUninitialized),
         property_details_(PropertyDetails::Empty()),
         isolate_(isolate),
         name_(),
         index_(index),
         receiver_(receiver),
-        initial_holder_(GetRoot(isolate, receiver, index)) {
+        holder_(GetRoot(isolate, receiver, index)),
+        initial_holder_(holder_),
+        number_(DescriptorArray::kNotFound) {
     // kMaxUInt32 isn't a valid index.
     DCHECK_NE(kMaxUInt32, index_);
-    Start<true>();
+    Next();
   }
 
   LookupIterator(Isolate* isolate, Handle<Object> receiver, uint32_t index,
                  Handle<JSReceiver> holder,
                  Configuration configuration = DEFAULT)
       : configuration_(configuration),
+        state_(NOT_FOUND),
         interceptor_state_(InterceptorState::kUninitialized),
         property_details_(PropertyDetails::Empty()),
         isolate_(isolate),
         name_(),
         index_(index),
         receiver_(receiver),
-        initial_holder_(holder) {
+        holder_(holder),
+        initial_holder_(holder_),
+        number_(DescriptorArray::kNotFound) {
     // kMaxUInt32 isn't a valid index.
     DCHECK_NE(kMaxUInt32, index_);
-    Start<true>();
+    Next();
   }
 
   static LookupIterator PropertyOrElement(
       Isolate* isolate, Handle<Object> receiver, Handle<Name> name,
       Configuration configuration = DEFAULT) {
     uint32_t index;
     if (name->AsArrayIndex(&index)) {
       LookupIterator it =
           LookupIterator(isolate, receiver, index, configuration);
       it.name_ = name;
@@ skipping 12 matching lines @@
       it.name_ = name;
       return it;
     }
     return LookupIterator(receiver, name, holder, configuration);
   }
 
   static LookupIterator PropertyOrElement(
       Isolate* isolate, Handle<Object> receiver, Handle<Object> key,
       bool* success, Configuration configuration = DEFAULT);
 
-  void Restart() {
-    InterceptorState state = InterceptorState::kUninitialized;
-    IsElement() ? RestartInternal<true>(state) : RestartInternal<false>(state);
-  }
+  void Restart() { RestartInternal(InterceptorState::kUninitialized); }
 
   Isolate* isolate() const { return isolate_; }
   State state() const { return state_; }
 
   Handle<Name> name() const {
     DCHECK(!IsElement());
     return name_;
   }
   Handle<Name> GetName() {
     if (name_.is_null()) {
       DCHECK(IsElement());
       name_ = factory()->Uint32ToString(index_);
     }
     return name_;
   }
   uint32_t index() const { return index_; }
 
   bool IsElement() const { return index_ != kMaxUInt32; }
 
   bool IsFound() const { return state_ != NOT_FOUND; }
   void Next();
   void NotFound() {
     has_property_ = false;
     state_ = NOT_FOUND;
   }
 
   Heap* heap() const { return isolate_->heap(); }
   Factory* factory() const { return isolate_->factory(); }
   Handle<Object> GetReceiver() const { return receiver_; }
-
-  Handle<JSObject> GetStoreTarget() const {
-    if (receiver_->IsJSGlobalProxy()) {
-      Map* map = JSGlobalProxy::cast(*receiver_)->map();
-      if (map->has_hidden_prototype()) {
-        return handle(JSGlobalObject::cast(map->prototype()), isolate_);
-      }
-    }
-    return Handle<JSObject>::cast(receiver_);
-  }
-
+  Handle<JSObject> GetStoreTarget() const;
   bool is_dictionary_holder() const { return !holder_->HasFastProperties(); }
   Handle<Map> transition_map() const {
     DCHECK_EQ(TRANSITION, state_);
     return Handle<Map>::cast(transition_);
   }
   template <class T>
   Handle<T> GetHolder() const {
     DCHECK(IsFound());
     return Handle<T>::cast(holder_);
   }
@@ skipping 51 matching lines @@
   int GetAccessorIndex() const;
   int GetConstantIndex() const;
   Handle<PropertyCell> GetPropertyCell() const;
   Handle<Object> GetAccessors() const;
   inline Handle<InterceptorInfo> GetInterceptor() const {
     DCHECK_EQ(INTERCEPTOR, state_);
     return handle(GetInterceptor(JSObject::cast(*holder_)), isolate_);
   }
   Handle<Object> GetDataValue() const;
   void WriteDataValue(Handle<Object> value);
-  inline void UpdateProtector() {
-    if (FLAG_harmony_species && !IsElement() &&
-        (*name_ == heap()->constructor_string() ||
-         *name_ == heap()->species_symbol())) {
-      InternalUpdateProtector();
-    }
-  }
+  void UpdateProtector();
 
  private:
-  void InternalUpdateProtector();
-
   enum class InterceptorState {
     kUninitialized,
     kSkipNonMasking,
     kProcessNonMasking
   };
 
   Handle<Map> GetReceiverMap() const;
 
   MUST_USE_RESULT inline JSReceiver* NextHolder(Map* map);
-
-  template <bool is_element>
-  void Start();
-  template <bool is_element>
-  void NextInternal(Map* map, JSReceiver* holder);
-  template <bool is_element>
-  inline State LookupInHolder(Map* map, JSReceiver* holder) {
-    return map->instance_type() <= LAST_SPECIAL_RECEIVER_TYPE
-               ? LookupInSpecialHolder<is_element>(map, holder)
-               : LookupInRegularHolder<is_element>(map, holder);
+  inline State LookupInHolder(Map* map, JSReceiver* holder);
+  void RestartLookupForNonMaskingInterceptors() {
+    RestartInternal(InterceptorState::kProcessNonMasking);
   }
-  template <bool is_element>
-  State LookupInRegularHolder(Map* map, JSReceiver* holder);
-  template <bool is_element>
-  State LookupInSpecialHolder(Map* map, JSReceiver* holder);
-  template <bool is_element>
-  void RestartLookupForNonMaskingInterceptors() {
-    RestartInternal<is_element>(InterceptorState::kProcessNonMasking);
-  }
-  template <bool is_element>
   void RestartInternal(InterceptorState interceptor_state);
+  State LookupNonMaskingInterceptorInHolder(Map* map, JSReceiver* holder);
   Handle<Object> FetchValue() const;
-  template <bool is_element>
   void ReloadPropertyInformation();
-
   inline bool SkipInterceptor(JSObject* holder);
+  bool HasInterceptor(Map* map) const;
   inline InterceptorInfo* GetInterceptor(JSObject* holder) const {
     if (IsElement()) return holder->GetIndexedInterceptor();
     return holder->GetNamedInterceptor();
   }
 
   bool check_hidden() const { return (configuration_ & kHidden) != 0; }
   bool check_interceptor() const {
     return (configuration_ & kInterceptor) != 0;
   }
   int descriptor_number() const {
@@ skipping 47 matching lines @@
   Handle<JSReceiver> holder_;
   const Handle<JSReceiver> initial_holder_;
   uint32_t number_;
 };
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_LOOKUP_H_