diff options
Diffstat (limited to 'deps/v8/test/cctest/compiler/graph-builder-tester.h')
| -rw-r--r-- | deps/v8/test/cctest/compiler/graph-builder-tester.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/deps/v8/test/cctest/compiler/graph-builder-tester.h b/deps/v8/test/cctest/compiler/graph-builder-tester.h index ea2c3ad139..de2713a5ac 100644 --- a/deps/v8/test/cctest/compiler/graph-builder-tester.h +++ b/deps/v8/test/cctest/compiler/graph-builder-tester.h @@ -24,7 +24,7 @@ class GraphAndBuilders { explicit GraphAndBuilders(Zone* zone) : main_graph_(new (zone) Graph(zone)), main_common_(zone), - main_machine_(zone, kMachPtr, + main_machine_(zone, MachineType::PointerRepresentation(), InstructionSelector::SupportedMachineOperatorFlags()), main_simplified_(zone) {} @@ -48,11 +48,11 @@ class GraphBuilderTester : public HandleAndZoneScope, public GraphAndBuilders, public CallHelper<ReturnType> { public: - explicit GraphBuilderTester(MachineType p0 = kMachNone, - MachineType p1 = kMachNone, - MachineType p2 = kMachNone, - MachineType p3 = kMachNone, - MachineType p4 = kMachNone) + explicit GraphBuilderTester(MachineType p0 = MachineType::None(), + MachineType p1 = MachineType::None(), + MachineType p2 = MachineType::None(), + MachineType p3 = MachineType::None(), + MachineType p4 = MachineType::None()) : GraphAndBuilders(main_zone()), CallHelper<ReturnType>( main_isolate(), @@ -68,7 +68,7 @@ class GraphBuilderTester : public HandleAndZoneScope, void GenerateCode() { Generate(); } Node* Parameter(size_t index) { - DCHECK(index < parameter_count()); + CHECK_LT(index, parameter_count()); return parameters_[index]; } @@ -77,7 +77,7 @@ class GraphBuilderTester : public HandleAndZoneScope, // Initialize graph and builder. void Begin(int num_parameters) { - DCHECK(graph()->start() == NULL); + CHECK_NULL(graph()->start()); Node* start = graph()->NewNode(common()->Start(num_parameters + 3)); graph()->SetStart(start); effect_ = start; @@ -235,15 +235,15 @@ class GraphBuilderTester : public HandleAndZoneScope, protected: Node* MakeNode(const Operator* op, int value_input_count, Node** value_inputs) { - DCHECK(op->ValueInputCount() == value_input_count); + CHECK_EQ(op->ValueInputCount(), value_input_count); - DCHECK(!OperatorProperties::HasContextInput(op)); - DCHECK_EQ(0, OperatorProperties::GetFrameStateInputCount(op)); + CHECK(!OperatorProperties::HasContextInput(op)); + CHECK_EQ(0, OperatorProperties::GetFrameStateInputCount(op)); bool has_control = op->ControlInputCount() == 1; bool has_effect = op->EffectInputCount() == 1; - DCHECK(op->ControlInputCount() < 2); - DCHECK(op->EffectInputCount() < 2); + CHECK_LT(op->ControlInputCount(), 2); + CHECK_LT(op->EffectInputCount(), 2); Node* result = NULL; if (!has_control && !has_effect) { |