Index: src/compiler/arm/instruction-selector-arm.cc |
diff --git a/src/compiler/arm/instruction-selector-arm.cc b/src/compiler/arm/instruction-selector-arm.cc |
index f6147883b417af6a69ce8749eaad0d9ee3bf218e..0cffff7a1cf63d40dd9a9ff48af79211bdbed264 100644 |
--- a/src/compiler/arm/instruction-selector-arm.cc |
+++ b/src/compiler/arm/instruction-selector-arm.cc |
@@ -84,7 +84,6 @@ void VisitRR(InstructionSelector* selector, ArchOpcode opcode, Node* node) { |
g.UseRegister(node->InputAt(0))); |
} |
- |
void VisitRRR(InstructionSelector* selector, ArchOpcode opcode, Node* node) { |
ArmOperandGenerator g(selector); |
selector->Emit(opcode, g.DefineAsRegister(node), |
@@ -94,8 +93,10 @@ void VisitRRR(InstructionSelector* selector, ArchOpcode opcode, Node* node) { |
void VisitRRRR(InstructionSelector* selector, ArchOpcode opcode, Node* node) { |
ArmOperandGenerator g(selector); |
+ // Use DefineSameAsFirst for ternary ops that clobber their first input, |
+ // e.g. the NEON vbsl instruction. |
selector->Emit( |
- opcode, g.DefineAsRegister(node), g.UseRegister(node->InputAt(0)), |
+ opcode, g.DefineSameAsFirst(node), g.UseRegister(node->InputAt(0)), |
g.UseRegister(node->InputAt(1)), g.UseRegister(node->InputAt(2))); |
} |
@@ -427,6 +428,9 @@ void InstructionSelector::VisitLoad(Node* node) { |
break; |
case MachineRepresentation::kWord64: // Fall through. |
case MachineRepresentation::kSimd128: // Fall through. |
+ case MachineRepresentation::kSimd1x4: // Fall through. |
+ case MachineRepresentation::kSimd1x8: // Fall through. |
+ case MachineRepresentation::kSimd1x16: // Fall through. |
case MachineRepresentation::kNone: |
UNREACHABLE(); |
return; |
@@ -512,6 +516,9 @@ void InstructionSelector::VisitStore(Node* node) { |
break; |
case MachineRepresentation::kWord64: // Fall through. |
case MachineRepresentation::kSimd128: // Fall through. |
+ case MachineRepresentation::kSimd1x4: // Fall through. |
+ case MachineRepresentation::kSimd1x8: // Fall through. |
+ case MachineRepresentation::kSimd1x16: // Fall through. |
case MachineRepresentation::kNone: |
UNREACHABLE(); |
return; |
@@ -675,6 +682,9 @@ void InstructionSelector::VisitCheckedLoad(Node* node) { |
case MachineRepresentation::kTagged: // Fall through. |
case MachineRepresentation::kWord64: // Fall through. |
case MachineRepresentation::kSimd128: // Fall through. |
+ case MachineRepresentation::kSimd1x4: // Fall through. |
+ case MachineRepresentation::kSimd1x8: // Fall through. |
+ case MachineRepresentation::kSimd1x16: // Fall through. |
case MachineRepresentation::kNone: |
UNREACHABLE(); |
return; |
@@ -719,6 +729,9 @@ void InstructionSelector::VisitCheckedStore(Node* node) { |
case MachineRepresentation::kTagged: // Fall through. |
case MachineRepresentation::kWord64: // Fall through. |
case MachineRepresentation::kSimd128: // Fall through. |
+ case MachineRepresentation::kSimd1x4: // Fall through. |
+ case MachineRepresentation::kSimd1x8: // Fall through. |
+ case MachineRepresentation::kSimd1x16: // Fall through. |
case MachineRepresentation::kNone: |
UNREACHABLE(); |
return; |