[Interpreter] Add support for cast operators to bytecode graph builder and

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 1388 matching lines @@
     return (NodeMatcher::MatchAndExplain(node, listener) &&
             PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0),
                                  "input", input_matcher_, listener));
   }
 
  private:
   const Matcher<Node*> input_matcher_;
 };
 
 
+class IsJSBinopMatcher final : public NodeMatcher {

[mythria, 2015/11/30 12:34:25]

I removed this part.

+ public:
+  IsJSBinopMatcher(IrOpcode::Value opcode, const Matcher<Node*>& lhs_matcher,
+                   const Matcher<Node*>& rhs_matcher,
+                   const Matcher<Node*>& effect_matcher,
+                   const Matcher<Node*>& control_matcher)
+      : NodeMatcher(opcode),
+        lhs_matcher_(lhs_matcher),
+        rhs_matcher_(rhs_matcher),
+        effect_matcher_(effect_matcher),
+        control_matcher_(control_matcher) {}
+
+  void DescribeTo(std::ostream* os) const final {
+    NodeMatcher::DescribeTo(os);
+    *os << " whose lhs (";
+    lhs_matcher_.DescribeTo(os);
+    *os << "), and rhs (";
+    rhs_matcher_.DescribeTo(os);
+    *os << "), and effect (";
+    rhs_matcher_.DescribeTo(os);
+    *os << "), and control (";
+    rhs_matcher_.DescribeTo(os);
+    *os << ")";
+  }
+
+  bool MatchAndExplain(Node* node, MatchResultListener* listener) const final {
+    return (NodeMatcher::MatchAndExplain(node, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0), "lhs",
+                                 lhs_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1), "rhs",
+                                 rhs_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetEffectInput(node), "effect",
+                                 effect_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetControlInput(node),
+                                 "control", control_matcher_, listener));
+  }
+
+ private:
+  const Matcher<Node*> lhs_matcher_;
+  const Matcher<Node*> rhs_matcher_;
+  const Matcher<Node*> effect_matcher_;
+  const Matcher<Node*> control_matcher_;
+};
+
+
+class IsUnopWithEffectMatcher final : public NodeMatcher {
+ public:
+  IsUnopWithEffectMatcher(IrOpcode::Value opcode,
+                          const Matcher<Node*>& input_matcher,
+                          const Matcher<Node*>& effect_matcher)
+      : NodeMatcher(opcode),
+        input_matcher_(input_matcher),
+        effect_matcher_(effect_matcher) {}
+
+  void DescribeTo(std::ostream* os) const final {
+    NodeMatcher::DescribeTo(os);
+    *os << " whose input (";
+    input_matcher_.DescribeTo(os);
+    *os << "), effect (";
+    effect_matcher_.DescribeTo(os);
+    *os << ")";
+  }
+
+  bool MatchAndExplain(Node* node, MatchResultListener* listener) const final {
+    return (NodeMatcher::MatchAndExplain(node, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0),
+                                 "input", input_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetEffectInput(node), "effect",
+                                 effect_matcher_, listener));
+  }
+
+ private:
+  const Matcher<Node*> input_matcher_;
+  const Matcher<Node*> effect_matcher_;
+};
+
+
+class IsUnopEffectControlMatcher final : public NodeMatcher {
+ public:
+  IsUnopEffectControlMatcher(IrOpcode::Value opcode,
+                             const Matcher<Node*>& input_matcher,
+                             const Matcher<Node*>& effect_matcher,
+                             const Matcher<Node*>& control_matcher)
+      : NodeMatcher(opcode),
+        input_matcher_(input_matcher),
+        effect_matcher_(effect_matcher),
+        control_matcher_(control_matcher) {}
+
+  void DescribeTo(std::ostream* os) const final {
+    NodeMatcher::DescribeTo(os);
+    *os << " whose input (";
+    input_matcher_.DescribeTo(os);
+    *os << "), effect (";
+    effect_matcher_.DescribeTo(os);
+    *os << "), control (";
+    control_matcher_.DescribeTo(os);
+    *os << ")";
+  }
+
+  bool MatchAndExplain(Node* node, MatchResultListener* listener) const final {
+    return (NodeMatcher::MatchAndExplain(node, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0),
+                                 "input", input_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetEffectInput(node), "effect",
+                                 effect_matcher_, listener) &&
+            PrintMatchAndExplain(NodeProperties::GetControlInput(node),
+                                 "control", control_matcher_, listener));
+  }
+
+ private:
+  const Matcher<Node*> input_matcher_;
+  const Matcher<Node*> effect_matcher_;
+  const Matcher<Node*> control_matcher_;
+};
+
+
 class IsParameterMatcher final : public NodeMatcher {
  public:
   explicit IsParameterMatcher(const Matcher<int>& index_matcher)
       : NodeMatcher(IrOpcode::kParameter), index_matcher_(index_matcher) {}
 
   void DescribeTo(std::ostream* os) const override {
     *os << "is a Parameter node with index(";
     index_matcher_.DescribeTo(os);
     *os << ")";
   }
 
   bool MatchAndExplain(Node* node, MatchResultListener* listener) const final {
     return (NodeMatcher::MatchAndExplain(node, listener) &&
             PrintMatchAndExplain(ParameterIndexOf(node->op()), "index",
                                  index_matcher_, listener));
   }
 
  private:
   const Matcher<int> index_matcher_;
 };
 

[mythria, 2015/11/30 12:34:25]

Part of rebase

 
 class IsJSDeletePropertyMatcher final : public NodeMatcher {
  public:
   IsJSDeletePropertyMatcher(const Matcher<Node*>& object_value_matcher,
                             const Matcher<Node*>& key_matcher,
                             const Matcher<Node*>& effect_matcher,
                             const Matcher<Node*>& control_matcher)
       : NodeMatcher(IrOpcode::kJSDeleteProperty),
         object_value_matcher_(object_value_matcher),
         key_matcher_(key_matcher),
@@ skipping 984 matching lines @@
 Matcher<Node*> IsParameter(const Matcher<int> index_matcher) {
   return MakeMatcher(new IsParameterMatcher(index_matcher));
 }
 
 
 Matcher<Node*> IsLoadFramePointer() {
   return MakeMatcher(new NodeMatcher(IrOpcode::kLoadFramePointer));
 }
 
 
 Matcher<Node*> IsJSDeleteProperty(const Matcher<Node*>& object_value_matcher,

[mythria, 2015/11/30 12:34:25]

Part of rebase

                                   const Matcher<Node*>& key_matcher,
                                   const Matcher<Node*>& effect_matcher,
                                   const Matcher<Node*>& control_matcher) {
   return MakeMatcher(new IsJSDeletePropertyMatcher(
       object_value_matcher, key_matcher, effect_matcher, control_matcher));
 }
 
 
 Matcher<Node*> IsJSLoadNamed(const Handle<Name> name,
                              const Matcher<Node*>& object_value_matcher,
@@ skipping 83 matching lines @@
 
 Matcher<Node*> IsJSCallRuntime(std::vector<Matcher<Node*>> value_matchers,
                                const Matcher<Node*>& effect_matcher,
                                const Matcher<Node*>& control_matcher) {
   return MakeMatcher(new IsJSCallMatcher(IrOpcode::kJSCallRuntime,
                                          value_matchers, effect_matcher,
                                          control_matcher));
 }
 
 
+Matcher<Node*> IsJSBinaryOperation(IrOpcode::Value opcode,

[mythria, 2015/11/30 12:34:25]

I removed this

+                                   const Matcher<Node*>& lhs_matcher,
+                                   const Matcher<Node*>& rhs_matcher,
+                                   const Matcher<Node*>& effect_matcher,
+                                   const Matcher<Node*>& control_matcher) {
+  return MakeMatcher(new IsJSBinopMatcher(opcode, lhs_matcher, rhs_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)
 IS_BINOP_MATCHER(NumberShiftLeft)
 IS_BINOP_MATCHER(NumberShiftRight)
 IS_BINOP_MATCHER(NumberShiftRightLogical)
 IS_BINOP_MATCHER(Word32And)
 IS_BINOP_MATCHER(Word32Or)
 IS_BINOP_MATCHER(Word32Sar)
 IS_BINOP_MATCHER(Word32Shl)
 IS_BINOP_MATCHER(Word32Shr)
 IS_BINOP_MATCHER(Word32Ror)
 IS_BINOP_MATCHER(Word32Equal)
 IS_BINOP_MATCHER(Word64And)
 IS_BINOP_MATCHER(Word64Or)
 IS_BINOP_MATCHER(Word64Sar)
 IS_BINOP_MATCHER(Word64Shl)
 IS_BINOP_MATCHER(Word64Shr)

[mythria, 2015/11/30 12:34:25]

Part of rebase

 IS_BINOP_MATCHER(Word64Equal)
 IS_BINOP_MATCHER(Int32AddWithOverflow)
 IS_BINOP_MATCHER(Int32Add)
 IS_BINOP_MATCHER(Int32Sub)
 IS_BINOP_MATCHER(Int32Mul)
 IS_BINOP_MATCHER(Int32MulHigh)
 IS_BINOP_MATCHER(Int32LessThan)
 IS_BINOP_MATCHER(Uint32LessThan)
 IS_BINOP_MATCHER(Uint32LessThanOrEqual)
 IS_BINOP_MATCHER(Int64Add)
 IS_BINOP_MATCHER(Int64Sub)
 IS_BINOP_MATCHER(Int64Mul)
-IS_BINOP_MATCHER(JSAdd)
 IS_BINOP_MATCHER(Float32Max)
 IS_BINOP_MATCHER(Float32Min)
 IS_BINOP_MATCHER(Float32Equal)
 IS_BINOP_MATCHER(Float32LessThan)
 IS_BINOP_MATCHER(Float32LessThanOrEqual)
 IS_BINOP_MATCHER(Float64Max)
 IS_BINOP_MATCHER(Float64Min)
 IS_BINOP_MATCHER(Float64Sub)
 IS_BINOP_MATCHER(Float64InsertLowWord32)
 IS_BINOP_MATCHER(Float64InsertHighWord32)
@@ skipping 20 matching lines @@
 IS_UNOP_MATCHER(Float64Sqrt)
 IS_UNOP_MATCHER(Float64RoundDown)
 IS_UNOP_MATCHER(Float64RoundTruncate)
 IS_UNOP_MATCHER(Float64RoundTiesAway)
 IS_UNOP_MATCHER(Float64ExtractLowWord32)
 IS_UNOP_MATCHER(Float64ExtractHighWord32)
 IS_UNOP_MATCHER(NumberToInt32)
 IS_UNOP_MATCHER(NumberToUint32)
 IS_UNOP_MATCHER(ObjectIsSmi)
 IS_UNOP_MATCHER(Word32Clz)
-IS_UNOP_MATCHER(JSUnaryNot)
-IS_UNOP_MATCHER(JSTypeOf)
 #undef IS_UNOP_MATCHER
 
+

[mythria, 2015/11/30 12:34:25]

I removed this.

+#define IS_UNOP_EFFECT_MATCHER(Name)                              \
+  Matcher<Node*> Is##Name(const Matcher<Node*>& input_matcher,    \
+                          const Matcher<Node*>& effect_matcher) { \
+    return MakeMatcher(new IsUnopWithEffectMatcher(               \
+        IrOpcode::k##Name, input_matcher, effect_matcher));       \
+  }
+IS_UNOP_EFFECT_MATCHER(JSUnaryNot)
+IS_UNOP_EFFECT_MATCHER(JSTypeOf)
+IS_UNOP_EFFECT_MATCHER(JSToBoolean)
+#undef IS_UNOP_EFFECT_MATCHER
+
+
+#define IS_UNOP_EFFECT_CONTROL_MATCHER(Name)                                 \
+  Matcher<Node*> Is##Name(const Matcher<Node*>& input_matcher,               \
+                          const Matcher<Node*>& effect_matcher,              \
+                          const Matcher<Node*>& control_matcher) {           \
+    return MakeMatcher(new IsUnopEffectControlMatcher(                       \
+        IrOpcode::k##Name, input_matcher, effect_matcher, control_matcher)); \
+  }
+IS_UNOP_EFFECT_CONTROL_MATCHER(JSToName)
+IS_UNOP_EFFECT_CONTROL_MATCHER(JSToObject)
+#undef IS_UNOP_EFFECT_CONTROL_MATCHER
+
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8