[turbofan] Revive the VectorSlotPair and also put feedback on JSCallFunction.

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"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 // Forward declarations.
 class Operator;
 struct JSOperatorGlobalCache;
 
 
+// Defines a pair of {TypeFeedbackVector} and {TypeFeedbackVectorICSlot}, which
+// is used to access the type feedback for a certain {Node}.
+class VectorSlotPair {
+ public:
+  VectorSlotPair() : slot_(FeedbackVectorICSlot::Invalid()) {}
+  VectorSlotPair(Handle<TypeFeedbackVector> vector, FeedbackVectorICSlot slot)
+      : vector_(vector), slot_(slot) {}
+
+  bool IsValid() const { return !vector_.is_null(); }
+
+  MaybeHandle<TypeFeedbackVector> vector() const { return vector_; }
+  FeedbackVectorICSlot slot() const { return slot_; }
+
+  int index() const {
+    Handle<TypeFeedbackVector> vector;
+    return vector_.ToHandle(&vector) ? vector->GetIndex(slot_) : -1;
+  }
+
+ private:
+  const MaybeHandle<TypeFeedbackVector> vector_;
+  const FeedbackVectorICSlot slot_;
+};
+
+bool operator==(VectorSlotPair const&, VectorSlotPair const&);
+bool operator!=(VectorSlotPair const&, VectorSlotPair const&);
+
+size_t hash_value(VectorSlotPair const&);
+
+
 // Defines the arity and the call flags for a JavaScript function call. This is
 // used as a parameter by JSCallFunction operators.
 class CallFunctionParameters final {
  public:
   CallFunctionParameters(size_t arity, CallFunctionFlags flags,
-                         LanguageMode language_mode)
+                         LanguageMode language_mode,
+                         VectorSlotPair const& feedback)
       : bit_field_(ArityField::encode(arity) | FlagsField::encode(flags) |
-                   LanguageModeField::encode(language_mode)) {}
+                   LanguageModeField::encode(language_mode)),
+        feedback_(feedback) {}
 
   size_t arity() const { return ArityField::decode(bit_field_); }
   CallFunctionFlags flags() const { return FlagsField::decode(bit_field_); }
   LanguageMode language_mode() const {
     return LanguageModeField::decode(bit_field_);
   }
+  VectorSlotPair const& feedback() const { return feedback_; }
 
   bool operator==(CallFunctionParameters const& that) const {
-    return this->bit_field_ == that.bit_field_;
+    return this->bit_field_ == that.bit_field_ &&
+           this->feedback_ == that.feedback_;
   }
   bool operator!=(CallFunctionParameters const& that) const {
     return !(*this == that);
   }
 
  private:
   friend size_t hash_value(CallFunctionParameters const& p) {
-    return p.bit_field_;
+    return base::hash_combine(p.bit_field_, p.feedback_);
   }
 
   typedef BitField<size_t, 0, 28> ArityField;
   typedef BitField<CallFunctionFlags, 28, 2> FlagsField;
   typedef BitField<LanguageMode, 30, 2> LanguageModeField;
 
   const uint32_t bit_field_;
+  const VectorSlotPair feedback_;
 };
 
 size_t hash_value(CallFunctionParameters const&);
 
 std::ostream& operator<<(std::ostream&, CallFunctionParameters const&);
 
 const CallFunctionParameters& CallFunctionParametersOf(const Operator* op);
 
 
 // Defines the arity and the ID for a runtime function call. This is used as a
@@ skipping 43 matching lines @@
 bool operator==(ContextAccess const&, ContextAccess const&);
 bool operator!=(ContextAccess const&, ContextAccess const&);
 
 size_t hash_value(ContextAccess const&);
 
 std::ostream& operator<<(std::ostream&, ContextAccess const&);
 
 ContextAccess const& ContextAccessOf(Operator const*);
 
 
-// A ResolvedFeedbackSlot needs to query the type feedback vector to get it's
-// index in the vector.
-class ResolvedFeedbackSlot {
- public:
-  ResolvedFeedbackSlot(Handle<TypeFeedbackVector> vector,
-                       FeedbackVectorICSlot slot)
-      : slot_(slot),
-        index_(slot == FeedbackVectorICSlot::Invalid() ? -1 : vector->GetIndex(
-                                                                  slot)) {}
-  ResolvedFeedbackSlot() : slot_(FeedbackVectorICSlot::Invalid()), index_(-1) {}
-
-  FeedbackVectorICSlot slot() const { return slot_; }
-  int index() const { return index_; }
-
- private:
-  const FeedbackVectorICSlot slot_;
-  const int index_;
-};
-
-
-bool operator==(ResolvedFeedbackSlot const& lhs,
-                ResolvedFeedbackSlot const& rhs);
-
-
 // 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 ResolvedFeedbackSlot& feedback,
-                      ContextualMode mode);
+                      const VectorSlotPair& feedback, ContextualMode mode);
 
   const Handle<String>& name() const { return name_; }
   uint32_t check_bitset() const { return check_bitset_; }
-  const ResolvedFeedbackSlot& feedback() const { return feedback_; }
+  const VectorSlotPair& feedback() const { return feedback_; }
   ContextualMode mode() const { return 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 ResolvedFeedbackSlot feedback_;
+  const VectorSlotPair feedback_;
   const ContextualMode 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&);
 
@@ 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 ResolvedFeedbackSlot& feedback,
+  LoadNamedParameters(const Unique<Name>& name, const VectorSlotPair& feedback,
                       ContextualMode contextual_mode)
       : name_(name), feedback_(feedback), contextual_mode_(contextual_mode) {}
 
   const Unique<Name>& name() const { return name_; }
   ContextualMode contextual_mode() const { return contextual_mode_; }
 
-  const ResolvedFeedbackSlot& feedback() const { return feedback_; }
+  const VectorSlotPair& feedback() const { return feedback_; }
 
  private:
   const Unique<Name> name_;
-  const ResolvedFeedbackSlot feedback_;
+  const VectorSlotPair feedback_;
   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. This is
 // used as a parameter by JSLoadProperty operators.
 class LoadPropertyParameters final {
  public:
-  explicit LoadPropertyParameters(const ResolvedFeedbackSlot& feedback)
+  explicit LoadPropertyParameters(const VectorSlotPair& feedback)
       : feedback_(feedback) {}
 
-  const ResolvedFeedbackSlot& feedback() const { return feedback_; }
+  const VectorSlotPair& feedback() const { return feedback_; }
 
  private:
-  const ResolvedFeedbackSlot feedback_;
+  const VectorSlotPair feedback_;
 };
 
 bool operator==(LoadPropertyParameters const&, LoadPropertyParameters const&);
 bool operator!=(LoadPropertyParameters const&, LoadPropertyParameters const&);
 
 size_t hash_value(LoadPropertyParameters const&);
 
 std::ostream& operator<<(std::ostream&, LoadPropertyParameters const&);
 
 const LoadPropertyParameters& LoadPropertyParametersOf(const Operator* op);
 
 
 // Defines the property being stored to an object by a named store. This is
 // used as a parameter by JSStoreNamed operators.
 class StoreNamedParameters final {
  public:
   StoreNamedParameters(LanguageMode language_mode,
-                       const ResolvedFeedbackSlot& feedback,
-                       const Unique<Name>& name)
+                       const VectorSlotPair& feedback, const Unique<Name>& name)
       : language_mode_(language_mode), name_(name), feedback_(feedback) {}
 
   LanguageMode language_mode() const { return language_mode_; }
-  const ResolvedFeedbackSlot& feedback() const { return feedback_; }
+  const VectorSlotPair& feedback() const { return feedback_; }
   const Unique<Name>& name() const { return name_; }
 
  private:
   const LanguageMode language_mode_;
   const Unique<Name> name_;
-  const ResolvedFeedbackSlot feedback_;
+  const VectorSlotPair feedback_;
 };
 
 bool operator==(StoreNamedParameters const&, StoreNamedParameters const&);
 bool operator!=(StoreNamedParameters const&, StoreNamedParameters const&);
 
 size_t hash_value(StoreNamedParameters const&);
 
 std::ostream& operator<<(std::ostream&, StoreNamedParameters const&);
 
 const StoreNamedParameters& StoreNamedParametersOf(const Operator* op);
 
 
 // Defines the property being stored to an object. This is used as a parameter
 // by JSStoreProperty operators.
 class StorePropertyParameters final {
  public:
   StorePropertyParameters(LanguageMode language_mode,
-                          const ResolvedFeedbackSlot& feedback)
+                          const VectorSlotPair& feedback)
       : language_mode_(language_mode), feedback_(feedback) {}
 
   LanguageMode language_mode() const { return language_mode_; }
-  const ResolvedFeedbackSlot& feedback() const { return feedback_; }
+  const VectorSlotPair& feedback() const { return feedback_; }
 
  private:
   const LanguageMode language_mode_;
-  const ResolvedFeedbackSlot feedback_;
+  const VectorSlotPair feedback_;
 };
 
 bool operator==(StorePropertyParameters const&, StorePropertyParameters const&);
 bool operator!=(StorePropertyParameters const&, StorePropertyParameters const&);
 
 size_t hash_value(StorePropertyParameters const&);
 
 std::ostream& operator<<(std::ostream&, StorePropertyParameters const&);
 
 const StorePropertyParameters& StorePropertyParametersOf(const Operator* op);
@@ skipping 59 matching lines @@
   const Operator* ToName();
   const Operator* ToObject();
   const Operator* Yield();
 
   const Operator* Create();
   const Operator* CreateClosure(Handle<SharedFunctionInfo> shared_info,
                                 PretenureFlag pretenure);
   const Operator* CreateLiteralArray(int literal_flags);
   const Operator* CreateLiteralObject(int literal_flags);
 
-  const Operator* CallFunction(size_t arity, CallFunctionFlags flags,
-                               LanguageMode language_mode);
+  const Operator* CallFunction(
+      size_t arity, CallFunctionFlags flags, LanguageMode language_mode,
+      VectorSlotPair const& feedback = VectorSlotPair());
   const Operator* CallRuntime(Runtime::FunctionId id, size_t arity);
 
   const Operator* CallConstruct(int arguments);
 
-  const Operator* LoadProperty(const ResolvedFeedbackSlot& feedback);
+  const Operator* LoadProperty(const VectorSlotPair& feedback);
   const Operator* LoadNamed(const Unique<Name>& name,
-                            const ResolvedFeedbackSlot& feedback,
+                            const VectorSlotPair& feedback,
                             ContextualMode contextual_mode = NOT_CONTEXTUAL);
 
   const Operator* StoreProperty(LanguageMode language_mode,
-                                const ResolvedFeedbackSlot& feedback);
+                                const VectorSlotPair& feedback);
   const Operator* StoreNamed(LanguageMode language_mode,
                              const Unique<Name>& name,
-                             const ResolvedFeedbackSlot& feedback);
+                             const VectorSlotPair& feedback);
 
   const Operator* DeleteProperty(LanguageMode language_mode);
 
   const Operator* HasProperty();
 
   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 ResolvedFeedbackSlot& feedback,
+                                    const VectorSlotPair& feedback,
                                     ContextualMode 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();
@@ skipping 17 matching lines @@
   Zone* const zone_;
 
   DISALLOW_COPY_AND_ASSIGN(JSOperatorBuilder);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_JS_OPERATOR_H_