TypeofMode replaces TypeofState and ContextualMode.

src/compiler/js-operator.h

 // Copyright 2013 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_COMPILER_JS_OPERATOR_H_
 #define V8_COMPILER_JS_OPERATOR_H_
 
 #include "src/runtime/runtime.h"
 #include "src/unique.h"
 
@@ skipping 140 matching lines @@
 
 ContextAccess const& ContextAccessOf(Operator const*);
 
 
 // Defines the name for a dynamic variable lookup. The {check_bitset} allows to
 // inline checks whether the lookup yields in a global variable. This is used as
 // a parameter by JSLoadDynamicGlobal and JSStoreDynamicGlobal operators.
 class DynamicGlobalAccess final {
  public:
   DynamicGlobalAccess(const Handle<String>& name, uint32_t check_bitset,
-                      const VectorSlotPair& feedback, ContextualMode mode);
+                      const VectorSlotPair& feedback, TypeofMode typeof_mode);
 
   const Handle<String>& name() const { return name_; }
   uint32_t check_bitset() const { return check_bitset_; }
   const VectorSlotPair& feedback() const { return feedback_; }
-  ContextualMode mode() const { return mode_; }
+  TypeofMode typeof_mode() const { return typeof_mode_; }
 
   // Indicates that an inline check is disabled.
   bool RequiresFullCheck() const {
     return check_bitset() == kFullCheckRequired;
   }
 
   // Limit of context chain length to which inline check is possible.
   static const int kMaxCheckDepth = 30;
 
   // Sentinel for {check_bitset} disabling inline checks.
   static const uint32_t kFullCheckRequired = -1;
 
  private:
   const Handle<String> name_;
   const uint32_t check_bitset_;
   const VectorSlotPair feedback_;
-  const ContextualMode mode_;
+  const TypeofMode typeof_mode_;
 };
 
 size_t hash_value(DynamicGlobalAccess const&);
 
 bool operator==(DynamicGlobalAccess const&, DynamicGlobalAccess const&);
 bool operator!=(DynamicGlobalAccess const&, DynamicGlobalAccess const&);
 
 std::ostream& operator<<(std::ostream&, DynamicGlobalAccess const&);
 
 DynamicGlobalAccess const& DynamicGlobalAccessOf(Operator const*);
@@ skipping 36 matching lines @@
 std::ostream& operator<<(std::ostream&, DynamicContextAccess const&);
 
 DynamicContextAccess const& DynamicContextAccessOf(Operator const*);
 
 
 // Defines the property being loaded from an object by a named load. This is
 // used as a parameter by JSLoadNamed operators.
 class LoadNamedParameters final {
  public:
   LoadNamedParameters(const Unique<Name>& name, const VectorSlotPair& feedback,
-                      LanguageMode language_mode,
-                      ContextualMode contextual_mode)
-      : name_(name),
-        feedback_(feedback),
-        language_mode_(language_mode),
-        contextual_mode_(contextual_mode) {}
+                      LanguageMode language_mode)
+      : name_(name), feedback_(feedback), language_mode_(language_mode) {}
 
   const Unique<Name>& name() const { return name_; }
   LanguageMode language_mode() const { return language_mode_; }
-  ContextualMode contextual_mode() const { return contextual_mode_; }
 
   const VectorSlotPair& feedback() const { return feedback_; }
 
  private:
   const Unique<Name> name_;
   const VectorSlotPair feedback_;
   const LanguageMode language_mode_;
-  const ContextualMode contextual_mode_;
 };
 
 bool operator==(LoadNamedParameters const&, LoadNamedParameters const&);
 bool operator!=(LoadNamedParameters const&, LoadNamedParameters const&);
 
 size_t hash_value(LoadNamedParameters const&);
 
 std::ostream& operator<<(std::ostream&, LoadNamedParameters const&);
 
 const LoadNamedParameters& LoadNamedParametersOf(const Operator* op);
 
 
 // Defines the property being loaded from an object by a named load. This is
 // used as a parameter by JSLoadGlobal operator.
 class LoadGlobalParameters final {
  public:
   LoadGlobalParameters(const Unique<Name>& name, const VectorSlotPair& feedback,
-                       ContextualMode contextual_mode, int slot_index)
+                       TypeofMode typeof_mode, int slot_index)
       : name_(name),
         feedback_(feedback),
-        contextual_mode_(contextual_mode),
+        typeof_mode_(typeof_mode),
         slot_index_(slot_index) {}
 
   const Unique<Name>& name() const { return name_; }
-  ContextualMode contextual_mode() const { return contextual_mode_; }
+  TypeofMode typeof_mode() const { return typeof_mode_; }
 
   const VectorSlotPair& feedback() const { return feedback_; }
 
   const int slot_index() const { return slot_index_; }
 
  private:
   const Unique<Name> name_;
   const VectorSlotPair feedback_;
-  const ContextualMode contextual_mode_;
+  const TypeofMode typeof_mode_;
   const int slot_index_;
 };
 
 bool operator==(LoadGlobalParameters const&, LoadGlobalParameters const&);
 bool operator!=(LoadGlobalParameters const&, LoadGlobalParameters const&);
 
 size_t hash_value(LoadGlobalParameters const&);
 
 std::ostream& operator<<(std::ostream&, LoadGlobalParameters const&);
 
@@ skipping 201 matching lines @@
   const Operator* StoreNamed(LanguageMode language_mode,
                              const Unique<Name>& name,
                              const VectorSlotPair& feedback);
 
   const Operator* DeleteProperty(LanguageMode language_mode);
 
   const Operator* HasProperty();
 
   const Operator* LoadGlobal(const Unique<Name>& name,
                              const VectorSlotPair& feedback,
-                             ContextualMode contextual_mode = NOT_CONTEXTUAL,
+                             TypeofMode typeof_mode = NOT_INSIDE_TYPEOF,
                              int slot_index = -1);
   const Operator* StoreGlobal(LanguageMode language_mode,
                               const Unique<Name>& name,
                               const VectorSlotPair& feedback,
                               int slot_index = -1);
 
   const Operator* LoadContext(size_t depth, size_t index, bool immutable);
   const Operator* StoreContext(size_t depth, size_t index);
 
   const Operator* LoadDynamicGlobal(const Handle<String>& name,
                                     uint32_t check_bitset,
                                     const VectorSlotPair& feedback,
-                                    ContextualMode mode);
+                                    TypeofMode typeof_mode);
   const Operator* LoadDynamicContext(const Handle<String>& name,
                                      uint32_t check_bitset, size_t depth,
                                      size_t index);
 
   const Operator* TypeOf();
   const Operator* InstanceOf();
 
   const Operator* ForInDone();
   const Operator* ForInNext();
   const Operator* ForInPrepare();
@@ skipping 16 matching lines @@
   Zone* const zone_;
 
   DISALLOW_COPY_AND_ASSIGN(JSOperatorBuilder);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_JS_OPERATOR_H_