From 00013a5692d53b99f934e17d564fcdb10b88f38f Mon Sep 17 00:00:00 2001 From: bmeurer Date: Mon, 22 Dec 2014 06:37:16 -0800 Subject: [PATCH] [turbofan] Minor cleanup to reduce code duplication. TEST=unittests R=jochen@chromium.org Review URL: https://codereview.chromium.org/819103002 Cr-Commit-Position: refs/heads/master@{#25927} --- test/unittests/compiler/change-lowering-unittest.cc | 4 ---- test/unittests/compiler/graph-unittest.cc | 16 ++++++++++++++-- test/unittests/compiler/graph-unittest.h | 12 +++++++----- test/unittests/compiler/js-builtin-reducer-unittest.cc | 6 ------ test/unittests/compiler/js-typed-lowering-unittest.cc | 6 ------ .../compiler/simplified-operator-reducer-unittest.cc | 4 ++-- 6 files changed, 23 insertions(+), 25 deletions(-) diff --git a/test/unittests/compiler/change-lowering-unittest.cc b/test/unittests/compiler/change-lowering-unittest.cc index e7abe23..199fb30 100644 --- a/test/unittests/compiler/change-lowering-unittest.cc +++ b/test/unittests/compiler/change-lowering-unittest.cc @@ -61,10 +61,6 @@ class ChangeLoweringTest : public GraphTest { : SmiTagging<8>::SmiValueSize(); } - Node* Parameter(int32_t index = 0) { - return graph()->NewNode(common()->Parameter(index), graph()->start()); - } - Reduction Reduce(Node* node) { MachineOperatorBuilder machine(zone(), WordRepresentation()); JSOperatorBuilder javascript(zone()); diff --git a/test/unittests/compiler/graph-unittest.cc b/test/unittests/compiler/graph-unittest.cc index 2cfd23a..9543258 100644 --- a/test/unittests/compiler/graph-unittest.cc +++ b/test/unittests/compiler/graph-unittest.cc @@ -4,8 +4,6 @@ #include "test/unittests/compiler/graph-unittest.h" -#include // NOLINT(readability/streams) - #include "src/compiler/node-properties-inl.h" #include "test/unittests/compiler/node-test-utils.h" @@ -93,6 +91,20 @@ Matcher GraphTest::IsTrueConstant() { Unique::CreateImmovable(factory()->true_value())); } + +TypedGraphTest::TypedGraphTest(int num_parameters) + : GraphTest(num_parameters), typer_(graph(), MaybeHandle()) {} + + +TypedGraphTest::~TypedGraphTest() {} + + +Node* TypedGraphTest::Parameter(Type* type, int32_t index) { + Node* node = GraphTest::Parameter(index); + NodeProperties::SetBounds(node, Bounds(type)); + return node; +} + } // namespace compiler } // namespace internal } // namespace v8 diff --git a/test/unittests/compiler/graph-unittest.h b/test/unittests/compiler/graph-unittest.h index 32341e9..7c75161 100644 --- a/test/unittests/compiler/graph-unittest.h +++ b/test/unittests/compiler/graph-unittest.h @@ -7,7 +7,6 @@ #include "src/compiler/common-operator.h" #include "src/compiler/graph.h" -#include "src/compiler/machine-operator.h" #include "src/compiler/typer.h" #include "test/unittests/test-utils.h" #include "testing/gmock/include/gmock/gmock.h" @@ -29,11 +28,11 @@ using ::testing::Matcher; class GraphTest : public TestWithContext, public TestWithZone { public: - explicit GraphTest(int parameters = 1); + explicit GraphTest(int num_parameters = 1); ~GraphTest() OVERRIDE; protected: - Node* Parameter(int32_t index); + Node* Parameter(int32_t index = 0); Node* Float32Constant(volatile float value); Node* Float64Constant(volatile double value); Node* Int32Constant(int32_t value); @@ -62,10 +61,13 @@ class GraphTest : public TestWithContext, public TestWithZone { class TypedGraphTest : public GraphTest { public: - explicit TypedGraphTest(int parameters = 1) - : GraphTest(parameters), typer_(graph(), MaybeHandle()) {} + explicit TypedGraphTest(int num_parameters = 1); + ~TypedGraphTest() OVERRIDE; protected: + Node* Parameter(int32_t index = 0) { return GraphTest::Parameter(index); } + Node* Parameter(Type* type, int32_t index = 0); + Typer* typer() { return &typer_; } private: diff --git a/test/unittests/compiler/js-builtin-reducer-unittest.cc b/test/unittests/compiler/js-builtin-reducer-unittest.cc index 0747f0c..87d1ad5 100644 --- a/test/unittests/compiler/js-builtin-reducer-unittest.cc +++ b/test/unittests/compiler/js-builtin-reducer-unittest.cc @@ -29,12 +29,6 @@ class JSBuiltinReducerTest : public TypedGraphTest { return reducer.Reduce(node); } - Node* Parameter(Type* t, int32_t index = 0) { - Node* n = graph()->NewNode(common()->Parameter(index), graph()->start()); - NodeProperties::SetBounds(n, Bounds(Type::None(), t)); - return n; - } - Handle MathFunction(const char* name) { Handle m = JSObject::GetProperty(isolate()->global_object(), diff --git a/test/unittests/compiler/js-typed-lowering-unittest.cc b/test/unittests/compiler/js-typed-lowering-unittest.cc index 883683d..e4ea4a5 100644 --- a/test/unittests/compiler/js-typed-lowering-unittest.cc +++ b/test/unittests/compiler/js-typed-lowering-unittest.cc @@ -50,12 +50,6 @@ class JSTypedLoweringTest : public TypedGraphTest { return reducer.Reduce(node); } - Node* Parameter(Type* type, int index = 0) { - Node* node = graph()->NewNode(common()->Parameter(index), graph()->start()); - NodeProperties::SetBounds(node, Bounds(Type::None(), type)); - return node; - } - Handle NewArrayBuffer(void* bytes, size_t byte_length) { Handle buffer = factory()->NewJSArrayBuffer(); Runtime::SetupArrayBuffer(isolate(), buffer, true, bytes, byte_length); diff --git a/test/unittests/compiler/simplified-operator-reducer-unittest.cc b/test/unittests/compiler/simplified-operator-reducer-unittest.cc index 8a42f7d..066cbe9 100644 --- a/test/unittests/compiler/simplified-operator-reducer-unittest.cc +++ b/test/unittests/compiler/simplified-operator-reducer-unittest.cc @@ -18,7 +18,7 @@ class SimplifiedOperatorReducerTest : public GraphTest { public: explicit SimplifiedOperatorReducerTest(int num_parameters = 1) : GraphTest(num_parameters), simplified_(zone()) {} - virtual ~SimplifiedOperatorReducerTest() {} + ~SimplifiedOperatorReducerTest() OVERRIDE {} protected: Reduction Reduce(Node* node) { @@ -43,7 +43,7 @@ class SimplifiedOperatorReducerTestWithParam public: explicit SimplifiedOperatorReducerTestWithParam(int num_parameters = 1) : SimplifiedOperatorReducerTest(num_parameters) {} - virtual ~SimplifiedOperatorReducerTestWithParam() {} + ~SimplifiedOperatorReducerTestWithParam() OVERRIDE {} }; -- 2.7.4