Index: src/compiler/mips/instruction-selector-mips.cc |
diff --git a/src/compiler/mips/instruction-selector-mips.cc b/src/compiler/mips/instruction-selector-mips.cc |
index 4d3577fd26f80cfc3330690eb22b262e63b83065..d6840172779538df58303882abe2eeccd8b95fa4 100644 |
--- a/src/compiler/mips/instruction-selector-mips.cc |
+++ b/src/compiler/mips/instruction-selector-mips.cc |
@@ -5,6 +5,7 @@ |
#include "src/base/bits.h" |
#include "src/compiler/instruction-selector-impl.h" |
#include "src/compiler/node-matchers.h" |
+#include "src/compiler/node-properties.h" |
namespace v8 { |
namespace internal { |
@@ -468,10 +469,10 @@ void InstructionSelector::VisitCall(Node* node) { |
Emit(kMipsStackClaim | MiscField::encode(push_count), NULL); |
} |
int slot = buffer.pushed_nodes.size() - 1; |
- for (NodeVectorRIter input = buffer.pushed_nodes.rbegin(); |
- input != buffer.pushed_nodes.rend(); input++) { |
- Emit(kMipsStoreToStackSlot | MiscField::encode(slot), NULL, |
- g.UseRegister(*input)); |
+ for (auto i = buffer.pushed_nodes.rbegin(); i != buffer.pushed_nodes.rend(); |
+ ++i) { |
+ Emit(kMipsStoreToStackSlot | MiscField::encode(slot), nullptr, |
+ g.UseRegister(*i)); |
slot--; |
} |
@@ -691,14 +692,14 @@ void VisitWordCompareZero(InstructionSelector* selector, Node* user, |
case IrOpcode::kProjection: |
// Check if this is the overflow output projection of an |
// <Operation>WithOverflow node. |
- if (OpParameter<size_t>(value) == 1u) { |
+ if (ProjectionIndexOf(value->op()) == 1u) { |
// We cannot combine the <Operation>WithOverflow with this branch |
// unless the 0th projection (the use of the actual value of the |
// <Operation> is either NULL, which means there's no use of the |
// actual value, or was already defined, which means it is scheduled |
// *AFTER* this branch). |
Node* const node = value->InputAt(0); |
- Node* const result = node->FindProjection(0); |
+ Node* const result = NodeProperties::FindProjection(node, 0); |
if (!result || selector->IsDefined(result)) { |
switch (node->opcode()) { |
case IrOpcode::kInt32AddWithOverflow: |
@@ -778,7 +779,7 @@ void InstructionSelector::VisitUint32LessThanOrEqual(Node* node) { |
void InstructionSelector::VisitInt32AddWithOverflow(Node* node) { |
- if (Node* ovf = node->FindProjection(1)) { |
+ if (Node* ovf = NodeProperties::FindProjection(node, 1)) { |
FlagsContinuation cont(kOverflow, ovf); |
return VisitBinop(this, node, kMipsAddOvf, &cont); |
} |
@@ -788,7 +789,7 @@ void InstructionSelector::VisitInt32AddWithOverflow(Node* node) { |
void InstructionSelector::VisitInt32SubWithOverflow(Node* node) { |
- if (Node* ovf = node->FindProjection(1)) { |
+ if (Node* ovf = NodeProperties::FindProjection(node, 1)) { |
FlagsContinuation cont(kOverflow, ovf); |
return VisitBinop(this, node, kMipsSubOvf, &cont); |
} |