Revert "Upgrade to 5.0.71.48"
This reverts commit 8389745919cae02139ddc085a63c00d024269cf2.
Change-Id: Ic5c75c8b3ddaf795972372fbc863a514862953c1
diff --git a/test/unittests/compiler/node-test-utils.cc b/test/unittests/compiler/node-test-utils.cc
index ee4cf54..54168ee 100644
--- a/test/unittests/compiler/node-test-utils.cc
+++ b/test/unittests/compiler/node-test-utils.cc
@@ -323,30 +323,13 @@
const Matcher<Node*>& control_matcher)
: NodeMatcher(IrOpcode::kReturn),
value_matcher_(value_matcher),
- value2_matcher_(_),
effect_matcher_(effect_matcher),
- control_matcher_(control_matcher),
- has_second_return_value_(false) {}
-
- IsReturnMatcher(const Matcher<Node*>& value_matcher,
- const Matcher<Node*>& value2_matcher,
- const Matcher<Node*>& effect_matcher,
- const Matcher<Node*>& control_matcher)
- : NodeMatcher(IrOpcode::kReturn),
- value_matcher_(value_matcher),
- value2_matcher_(value2_matcher),
- effect_matcher_(effect_matcher),
- control_matcher_(control_matcher),
- has_second_return_value_(true) {}
+ control_matcher_(control_matcher) {}
void DescribeTo(std::ostream* os) const final {
NodeMatcher::DescribeTo(os);
*os << " whose value (";
value_matcher_.DescribeTo(os);
- if (has_second_return_value_) {
- *os << ") and second value (";
- value2_matcher_.DescribeTo(os);
- }
*os << ") and effect (";
effect_matcher_.DescribeTo(os);
*os << ") and control (";
@@ -358,9 +341,6 @@
return (NodeMatcher::MatchAndExplain(node, listener) &&
PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0),
"value", value_matcher_, listener) &&
- (!has_second_return_value_ ||
- PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1),
- "value2", value2_matcher_, listener)) &&
PrintMatchAndExplain(NodeProperties::GetEffectInput(node), "effect",
effect_matcher_, listener) &&
PrintMatchAndExplain(NodeProperties::GetControlInput(node),
@@ -369,10 +349,8 @@
private:
const Matcher<Node*> value_matcher_;
- const Matcher<Node*> value2_matcher_;
const Matcher<Node*> effect_matcher_;
const Matcher<Node*> control_matcher_;
- bool has_second_return_value_;
};
@@ -1489,6 +1467,7 @@
return MakeMatcher(new NodeMatcher(IrOpcode::kDead));
}
+
Matcher<Node*> IsEnd(const Matcher<Node*>& control0_matcher) {
return MakeMatcher(new IsControl1Matcher(IrOpcode::kEnd, control0_matcher));
}
@@ -1598,13 +1577,6 @@
new IsReturnMatcher(value_matcher, effect_matcher, control_matcher));
}
-Matcher<Node*> IsReturn2(const Matcher<Node*>& value_matcher,
- const Matcher<Node*>& value2_matcher,
- const Matcher<Node*>& effect_matcher,
- const Matcher<Node*>& control_matcher) {
- return MakeMatcher(new IsReturnMatcher(value_matcher, value2_matcher,
- effect_matcher, control_matcher));
-}
Matcher<Node*> IsTerminate(const Matcher<Node*>& effect_matcher,
const Matcher<Node*>& control_matcher) {
@@ -1703,15 +1675,6 @@
return MakeMatcher(new IsProjectionMatcher(index_matcher, base_matcher));
}
-Matcher<Node*> IsCall(const Matcher<const CallDescriptor*>& descriptor_matcher,
- const Matcher<Node*>& value0_matcher,
- const Matcher<Node*>& effect_matcher,
- const Matcher<Node*>& control_matcher) {
- std::vector<Matcher<Node*>> value_matchers;
- value_matchers.push_back(value0_matcher);
- return MakeMatcher(new IsCallMatcher(descriptor_matcher, value_matchers,
- effect_matcher, control_matcher));
-}
Matcher<Node*> IsCall(const Matcher<const CallDescriptor*>& descriptor_matcher,
const Matcher<Node*>& value0_matcher,
@@ -2143,7 +2106,6 @@
IS_UNOP_MATCHER(Float64ExtractHighWord32)
IS_UNOP_MATCHER(NumberToInt32)
IS_UNOP_MATCHER(NumberToUint32)
-IS_UNOP_MATCHER(ObjectIsReceiver)
IS_UNOP_MATCHER(ObjectIsSmi)
IS_UNOP_MATCHER(Word32Clz)
#undef IS_UNOP_MATCHER