[Interpreter] Add support for keyed load / store ICs and named store IC to

test/unittests/compiler/node-test-utils.cc

 // 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.
 
 #include "test/unittests/compiler/node-test-utils.h"
 
 #include <vector>
 
 #include "src/assembler.h"
 #include "src/compiler/common-operator.h"
@@ skipping 1455 matching lines @@
   }
 
  private:
   const Matcher<Node*> object_value_matcher_;
   const Matcher<Node*> key_matcher_;
   const Matcher<Node*> effect_matcher_;
   const Matcher<Node*> control_matcher_;
 };
 
 
-// TODO(mythria): Check if we can use the same matcher for Load and Store
+class IsJSLoadGlobalMatcher final : public NodeMatcher {
+ public:
+  IsJSLoadGlobalMatcher(const Matcher<Handle<Name>>& name_matcher,
+                        const Matcher<TypeofMode> typeof_mode_matcher,
+                        const Matcher<Node*>& feedback_vector_matcher,
+                        const Matcher<Node*>& effect_matcher,
+                        const Matcher<Node*>& control_matcher)
+      : NodeMatcher(IrOpcode::kJSLoadGlobal),
+        name_matcher_(name_matcher),
+        typeof_mode_matcher_(typeof_mode_matcher),
+        feedback_vector_matcher_(feedback_vector_matcher),
+        effect_matcher_(effect_matcher),
+        control_matcher_(control_matcher) {}
+
+  void DescribeTo(std::ostream* os) const final {
+    NodeMatcher::DescribeTo(os);
+    *os << " whose name (";
+    name_matcher_.DescribeTo(os);
+    *os << "), typeof mode (";
+    typeof_mode_matcher_.DescribeTo(os);
+    *os << "), feedback vector (";
+    feedback_vector_matcher_.DescribeTo(os);
+    *os << "), effect (";
+    effect_matcher_.DescribeTo(os);
+    *os << "), and control (";
+    control_matcher_.DescribeTo(os);
+    *os << ")";
+  }
+
+  bool MatchAndExplain(Node* node, MatchResultListener* listener) const final {
+    return (NodeMatcher::MatchAndExplain(node, listener) &&
+            PrintMatchAndExplain(OpParameter<LoadGlobalParameters>(node).name(),
+                                 "name", name_matcher_, listener) &&
+            PrintMatchAndExplain(
+                OpParameter<LoadGlobalParameters>(node).typeof_mode(),
+                "typeof mode", typeof_mode_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0),
+                                 "feedback vector", feedback_vector_matcher_,
+                                 listener) &&
+            PrintMatchAndExplain(NodeProperties::GetEffectInput(node), "effect",
+                                 effect_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetControlInput(node),
+                                 "control", control_matcher_, listener));
+  }
+
+ private:
+  const Matcher<Handle<Name>> name_matcher_;
+  const Matcher<TypeofMode> typeof_mode_matcher_;
+  const Matcher<Node*> feedback_vector_matcher_;
+  const Matcher<Node*> effect_matcher_;
+  const Matcher<Node*> control_matcher_;
+};
+
+
+class IsJSStoreGlobalMatcher final : public NodeMatcher {
+ public:
+  IsJSStoreGlobalMatcher(const Matcher<Handle<Name>>& name_matcher,
+                         const Matcher<Node*>& value_matcher,
+                         const Matcher<Node*>& feedback_vector_matcher,
+                         const Matcher<Node*>& effect_matcher,
+                         const Matcher<Node*>& control_matcher)
+      : NodeMatcher(IrOpcode::kJSStoreGlobal),
+        name_matcher_(name_matcher),
+        value_matcher_(value_matcher),
+        feedback_vector_matcher_(feedback_vector_matcher),
+        effect_matcher_(effect_matcher),
+        control_matcher_(control_matcher) {}
+
+  void DescribeTo(std::ostream* os) const final {
+    NodeMatcher::DescribeTo(os);
+    *os << " whose name (";
+    name_matcher_.DescribeTo(os);
+    *os << "), value (";
+    value_matcher_.DescribeTo(os);
+    *os << "), feedback vector (";
+    feedback_vector_matcher_.DescribeTo(os);
+    *os << "), effect (";
+    effect_matcher_.DescribeTo(os);
+    *os << "), and control (";
+    control_matcher_.DescribeTo(os);
+    *os << ")";
+  }
+
+  bool MatchAndExplain(Node* node, MatchResultListener* listener) const final {
+    return (
+        NodeMatcher::MatchAndExplain(node, listener) &&
+        PrintMatchAndExplain(OpParameter<StoreGlobalParameters>(node).name(),
+                             "name", name_matcher_, listener) &&
+        PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0), "value",
+                             value_matcher_, listener) &&
+        PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1),
+                             "feedback vector", feedback_vector_matcher_,
+                             listener) &&
+        PrintMatchAndExplain(NodeProperties::GetEffectInput(node), "effect",
+                             effect_matcher_, listener) &&
+        PrintMatchAndExplain(NodeProperties::GetControlInput(node), "control",
+                             control_matcher_, listener));
+  }
+
+ private:
+  const Matcher<Handle<Name>> name_matcher_;
+  const Matcher<Node*> value_matcher_;
+  const Matcher<Node*> feedback_vector_matcher_;
+  const Matcher<Node*> effect_matcher_;
+  const Matcher<Node*> control_matcher_;
+};
+
+
 class IsJSLoadNamedMatcher final : public NodeMatcher {
  public:
   IsJSLoadNamedMatcher(const Matcher<Handle<Name>>& name_matcher,
                        const Matcher<Node*>& object_value_matcher,
                        const Matcher<Node*>& feedback_vector_matcher,
                        const Matcher<Node*>& effect_matcher,
                        const Matcher<Node*>& control_matcher)
       : NodeMatcher(IrOpcode::kJSLoadNamed),
         name_matcher_(name_matcher),
         object_value_matcher_(object_value_matcher),
@@ skipping 33 matching lines @@
 
  private:
   const Matcher<Handle<Name>> name_matcher_;
   const Matcher<Node*> object_value_matcher_;
   const Matcher<Node*> feedback_vector_matcher_;
   const Matcher<Node*> effect_matcher_;
   const Matcher<Node*> control_matcher_;
 };
 
 
-class IsJSLoadGlobalMatcher final : public NodeMatcher {
+class IsJSLoadPropertyMatcher final : public NodeMatcher {
  public:
-  IsJSLoadGlobalMatcher(const Matcher<Handle<Name>>& name_matcher,
-                        const Matcher<TypeofMode> typeof_mode_matcher,
-                        const Matcher<Node*>& feedback_vector_matcher,
-                        const Matcher<Node*>& effect_matcher,
-                        const Matcher<Node*>& control_matcher)
-      : NodeMatcher(IrOpcode::kJSLoadGlobal),
-        name_matcher_(name_matcher),
-        typeof_mode_matcher_(typeof_mode_matcher),
+  IsJSLoadPropertyMatcher(const Matcher<Node*>& object_matcher,
+                          const Matcher<Node*>& key_matcher,
+                          const Matcher<Node*>& feedback_vector_matcher,
+                          const Matcher<Node*>& effect_matcher,
+                          const Matcher<Node*>& control_matcher)
+      : NodeMatcher(IrOpcode::kJSLoadProperty),
+        object_matcher_(object_matcher),
+        key_matcher_(key_matcher),
         feedback_vector_matcher_(feedback_vector_matcher),
         effect_matcher_(effect_matcher),
         control_matcher_(control_matcher) {}
 
   void DescribeTo(std::ostream* os) const final {
     NodeMatcher::DescribeTo(os);
-    *os << " whose name (";
-    name_matcher_.DescribeTo(os);
-    *os << "), typeof mode (";
-    typeof_mode_matcher_.DescribeTo(os);
+    *os << " whose object (";
+    object_matcher_.DescribeTo(os);
+    *os << "), key (";
+    key_matcher_.DescribeTo(os);
     *os << "), feedback vector (";
     feedback_vector_matcher_.DescribeTo(os);
     *os << "), effect (";
+    effect_matcher_.DescribeTo(os);
+    *os << "), and control (";
+    control_matcher_.DescribeTo(os);
+    *os << ")";
+  }
+
+  bool MatchAndExplain(Node* node, MatchResultListener* listener) const final {
+    return (NodeMatcher::MatchAndExplain(node, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0),
+                                 "object", object_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1), "key",
+                                 key_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 2),
+                                 "feedback vector", feedback_vector_matcher_,
+                                 listener) &&
+            PrintMatchAndExplain(NodeProperties::GetEffectInput(node), "effect",
+                                 effect_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetControlInput(node),
+                                 "control", control_matcher_, listener));
+  }
+
+ private:
+  const Matcher<Node*> object_matcher_;
+  const Matcher<Node*> key_matcher_;
+  const Matcher<Node*> feedback_vector_matcher_;
+  const Matcher<Node*> effect_matcher_;
+  const Matcher<Node*> control_matcher_;
+};
+
+
+class IsJSStoreNamedMatcher final : public NodeMatcher {
+ public:
+  IsJSStoreNamedMatcher(const Matcher<Handle<Name>>& name_matcher,
+                        const Matcher<Node*>& object_matcher,
+                        const Matcher<Node*>& value_matcher,
+                        const Matcher<Node*>& feedback_vector_matcher,
+                        const Matcher<Node*>& effect_matcher,
+                        const Matcher<Node*>& control_matcher)
+      : NodeMatcher(IrOpcode::kJSStoreNamed),
+        name_matcher_(name_matcher),
+        object_matcher_(object_matcher),
+        value_matcher_(value_matcher),
+        feedback_vector_matcher_(feedback_vector_matcher),
+        effect_matcher_(effect_matcher),
+        control_matcher_(control_matcher) {}
+
+  void DescribeTo(std::ostream* os) const final {
+    NodeMatcher::DescribeTo(os);
+    *os << " whose object (";
+    object_matcher_.DescribeTo(os);
+    *os << "), name (";
+    name_matcher_.DescribeTo(os);
+    *os << "), value (";
+    value_matcher_.DescribeTo(os);
+    *os << "), feedback vector (";
+    feedback_vector_matcher_.DescribeTo(os);
+    *os << "), effect (";
     effect_matcher_.DescribeTo(os);
     *os << "), and control (";
     control_matcher_.DescribeTo(os);
     *os << ")";
   }
 
   bool MatchAndExplain(Node* node, MatchResultListener* listener) const final {
     return (NodeMatcher::MatchAndExplain(node, listener) &&
-            PrintMatchAndExplain(OpParameter<LoadGlobalParameters>(node).name(),
-                                 "name", name_matcher_, listener) &&
-            PrintMatchAndExplain(
-                OpParameter<LoadGlobalParameters>(node).typeof_mode(),
-                "typeof mode", typeof_mode_matcher_, listener) &&
+            PrintMatchAndExplain(OpParameter<NamedAccess>(node).name(), "Name",
+                                 name_matcher_, listener) &&
             PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0),
+                                 "object", object_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1),
+                                 "value", value_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 2),
                                  "feedback vector", feedback_vector_matcher_,
                                  listener) &&
             PrintMatchAndExplain(NodeProperties::GetEffectInput(node), "effect",
                                  effect_matcher_, listener) &&
             PrintMatchAndExplain(NodeProperties::GetControlInput(node),
                                  "control", control_matcher_, listener));
   }
 
  private:
   const Matcher<Handle<Name>> name_matcher_;
-  const Matcher<TypeofMode> typeof_mode_matcher_;
+  const Matcher<Node*> object_matcher_;
+  const Matcher<Node*> value_matcher_;
   const Matcher<Node*> feedback_vector_matcher_;
   const Matcher<Node*> effect_matcher_;
   const Matcher<Node*> control_matcher_;
 };
 
 
-class IsJSStoreGlobalMatcher final : public NodeMatcher {
+class IsJSStorePropertyMatcher final : public NodeMatcher {
  public:
-  IsJSStoreGlobalMatcher(const Matcher<Handle<Name>>& name_matcher,
-                         const Matcher<Node*>& value_matcher,
-                         const Matcher<Node*>& feedback_vector_matcher,
-                         const Matcher<Node*>& effect_matcher,
-                         const Matcher<Node*>& control_matcher)
-      : NodeMatcher(IrOpcode::kJSStoreGlobal),
-        name_matcher_(name_matcher),
+  IsJSStorePropertyMatcher(const Matcher<Node*>& object_matcher,
+                           const Matcher<Node*>& key_matcher,
+                           const Matcher<Node*>& value_matcher,
+                           const Matcher<Node*>& feedback_vector_matcher,
+                           const Matcher<Node*>& effect_matcher,
+                           const Matcher<Node*>& control_matcher)
+      : NodeMatcher(IrOpcode::kJSStoreProperty),
+        object_matcher_(object_matcher),
+        key_matcher_(key_matcher),
         value_matcher_(value_matcher),
         feedback_vector_matcher_(feedback_vector_matcher),
         effect_matcher_(effect_matcher),
         control_matcher_(control_matcher) {}
 
   void DescribeTo(std::ostream* os) const final {
     NodeMatcher::DescribeTo(os);
-    *os << " whose name (";
-    name_matcher_.DescribeTo(os);
+    *os << " whose object (";
+    object_matcher_.DescribeTo(os);
+    *os << "), key (";
+    key_matcher_.DescribeTo(os);
     *os << "), value (";
     value_matcher_.DescribeTo(os);
     *os << "), feedback vector (";
     feedback_vector_matcher_.DescribeTo(os);
     *os << "), effect (";
     effect_matcher_.DescribeTo(os);
     *os << "), and control (";
-    control_matcher_.DescribeTo(os);
-    *os << ")";
   }
 
   bool MatchAndExplain(Node* node, MatchResultListener* listener) const final {
-    return (
-        NodeMatcher::MatchAndExplain(node, listener) &&
-        PrintMatchAndExplain(OpParameter<StoreGlobalParameters>(node).name(),
-                             "name", name_matcher_, listener) &&
-        PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0), "value",
-                             value_matcher_, listener) &&
-        PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1),
-                             "feedback vector", feedback_vector_matcher_,
-                             listener) &&
-        PrintMatchAndExplain(NodeProperties::GetEffectInput(node), "effect",
-                             effect_matcher_, listener) &&
-        PrintMatchAndExplain(NodeProperties::GetControlInput(node), "control",
-                             control_matcher_, listener));
+    return (NodeMatcher::MatchAndExplain(node, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0),
+                                 "object", object_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1), "key",
+                                 key_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 2),
+                                 "value", value_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 3),
+                                 "feedback vector", feedback_vector_matcher_,
+                                 listener) &&
+            PrintMatchAndExplain(NodeProperties::GetEffectInput(node), "effect",
+                                 effect_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetControlInput(node),
+                                 "control", control_matcher_, listener));
   }
 
  private:
-  const Matcher<Handle<Name>> name_matcher_;
+  const Matcher<Node*> object_matcher_;
+  const Matcher<Node*> key_matcher_;
   const Matcher<Node*> value_matcher_;
   const Matcher<Node*> feedback_vector_matcher_;
   const Matcher<Node*> effect_matcher_;
   const Matcher<Node*> control_matcher_;
 };
 
 
 class IsJSCallFunctionMatcher final : public NodeMatcher {
  public:
   IsJSCallFunctionMatcher(const std::vector<Matcher<Node*>>& value_matchers,
@@ skipping 662 matching lines @@
 
 
 Matcher<Node*> IsJSCallFunction(std::vector<Matcher<Node*>> value_matchers,
                                 const Matcher<Node*>& effect_matcher,
                                 const Matcher<Node*>& control_matcher) {
   return MakeMatcher(new IsJSCallFunctionMatcher(value_matchers, effect_matcher,
                                                  control_matcher));
 }
 
 
+Matcher<Node*> IsJSLoadProperty(const Matcher<Node*>& object_matcher,
+                                const Matcher<Node*>& key_matcher,
+                                const Matcher<Node*>& feedback_vector_matcher,
+                                const Matcher<Node*>& effect_matcher,
+                                const Matcher<Node*>& control_matcher) {
+  return MakeMatcher(new IsJSLoadPropertyMatcher(
+      object_matcher, key_matcher, feedback_vector_matcher, effect_matcher,
+      control_matcher));
+}
+
+
+Matcher<Node*> IsJSStoreNamed(const Handle<Name> name,
+                              const Matcher<Node*>& object_matcher,
+                              const Matcher<Node*>& value_matcher,
+                              const Matcher<Node*>& feedback_vector_matcher,
+                              const Matcher<Node*>& effect_matcher,
+                              const Matcher<Node*>& control_matcher) {
+  return MakeMatcher(new IsJSStoreNamedMatcher(
+      _, object_matcher, value_matcher, feedback_vector_matcher, effect_matcher,
+      control_matcher));
+}
+
+
+Matcher<Node*> IsJSStoreProperty(const Matcher<Node*>& object_matcher,
+                                 const Matcher<Node*>& key_matcher,
+                                 const Matcher<Node*>& value_matcher,
+                                 const Matcher<Node*>& feedback_vector_matcher,
+                                 const Matcher<Node*>& effect_matcher,
+                                 const Matcher<Node*>& control_matcher) {
+  return MakeMatcher(new IsJSStorePropertyMatcher(
+      object_matcher, key_matcher, value_matcher, feedback_vector_matcher,
+      effect_matcher, control_matcher));
+}
+
 #define IS_BINOP_MATCHER(Name)                                            \
   Matcher<Node*> Is##Name(const Matcher<Node*>& lhs_matcher,              \
                           const Matcher<Node*>& rhs_matcher) {            \
     return MakeMatcher(                                                   \
         new IsBinopMatcher(IrOpcode::k##Name, lhs_matcher, rhs_matcher)); \
   }
 IS_BINOP_MATCHER(NumberEqual)
 IS_BINOP_MATCHER(NumberLessThan)
 IS_BINOP_MATCHER(NumberSubtract)
 IS_BINOP_MATCHER(NumberMultiply)
@@ skipping 65 matching lines @@
 IS_UNOP_MATCHER(NumberToUint32)
 IS_UNOP_MATCHER(ObjectIsSmi)
 IS_UNOP_MATCHER(Word32Clz)
 IS_UNOP_MATCHER(JSUnaryNot)
 IS_UNOP_MATCHER(JSTypeOf)
 #undef IS_UNOP_MATCHER
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8