Commit 26ac49bf authored by Mostyn Bramley-Moore's avatar Mostyn Bramley-Moore Committed by Commit Bot

[jumbo] fix android/windows kDummyOperator collision

Bug: chromium:770684
Change-Id: I4e4efc10dad1d3bb438fddc74098b36a6b9e1054
Reviewed-on: https://chromium-review.googlesource.com/730203Reviewed-by: 's avatarClemens Hammacher <clemensh@chromium.org>
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Cr-Commit-Position: refs/heads/master@{#48787}
parent c877c779
......@@ -119,14 +119,11 @@ Node* TypedGraphTest::Parameter(Type* type, int32_t index) {
return node;
}
namespace {
namespace graph_unittest {
const Operator kDummyOperator(0, Operator::kNoProperties, "Dummy", 0, 0, 0, 1,
0, 0);
} // namespace
TEST_F(GraphTest, NewNode) {
Node* n0 = graph()->NewNode(&kDummyOperator);
......@@ -139,6 +136,7 @@ TEST_F(GraphTest, NewNode) {
EXPECT_EQ(&kDummyOperator, n1->op());
}
} // namespace graph_unittest
} // namespace compiler
} // namespace internal
} // namespace v8
......@@ -12,6 +12,7 @@ using testing::ElementsAre;
namespace v8 {
namespace internal {
namespace compiler {
namespace schedule_unittest {
typedef TestWithIsolateAndZone BasicBlockTest;
......@@ -71,8 +72,6 @@ TEST_F(BasicBlockTest, GetCommonDominator3) {
typedef TestWithZone ScheduleTest;
namespace {
const Operator kCallOperator(IrOpcode::kCall, Operator::kNoProperties,
"MockCall", 0, 0, 0, 0, 0, 0);
const Operator kBranchOperator(IrOpcode::kBranch, Operator::kNoProperties,
......@@ -80,8 +79,6 @@ const Operator kBranchOperator(IrOpcode::kBranch, Operator::kNoProperties,
const Operator kDummyOperator(IrOpcode::kParameter, Operator::kNoProperties,
"Dummy", 0, 0, 0, 0, 0, 0);
} // namespace
TEST_F(ScheduleTest, Constructor) {
Schedule schedule(zone());
......@@ -244,6 +241,7 @@ TEST_F(ScheduleTest, InsertBranch) {
EXPECT_THAT(end->predecessors(), ElementsAre(mblock));
}
} // namespace schedule_unittest
} // namespace compiler
} // namespace internal
} // namespace v8
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment