Index: src/arm/lithium-gap-resolver-arm.cc |
diff --git a/src/arm/lithium-gap-resolver-arm.cc b/src/arm/lithium-gap-resolver-arm.cc |
index a65ab7e7d52aa312f1ce77f84fb0fe1e91aef0d3..596d58f470c5b10947d24f6f0249648899b5216a 100644 |
--- a/src/arm/lithium-gap-resolver-arm.cc |
+++ b/src/arm/lithium-gap-resolver-arm.cc |
@@ -171,10 +171,8 @@ void LGapResolver::BreakCycle(int index) { |
} else if (source->IsStackSlot()) { |
__ ldr(kSavedValueRegister, cgen_->ToMemOperand(source)); |
} else if (source->IsDoubleRegister()) { |
- CpuFeatureScope scope(cgen_->masm(), VFP2); |
__ vmov(kScratchDoubleReg, cgen_->ToDoubleRegister(source)); |
} else if (source->IsDoubleStackSlot()) { |
- CpuFeatureScope scope(cgen_->masm(), VFP2); |
__ vldr(kScratchDoubleReg, cgen_->ToMemOperand(source)); |
} else { |
UNREACHABLE(); |
@@ -194,10 +192,8 @@ void LGapResolver::RestoreValue() { |
} else if (saved_destination_->IsStackSlot()) { |
__ str(kSavedValueRegister, cgen_->ToMemOperand(saved_destination_)); |
} else if (saved_destination_->IsDoubleRegister()) { |
- CpuFeatureScope scope(cgen_->masm(), VFP2); |
__ vmov(cgen_->ToDoubleRegister(saved_destination_), kScratchDoubleReg); |
} else if (saved_destination_->IsDoubleStackSlot()) { |
- CpuFeatureScope scope(cgen_->masm(), VFP2); |
__ vstr(kScratchDoubleReg, cgen_->ToMemOperand(saved_destination_)); |
} else { |
UNREACHABLE(); |
@@ -233,8 +229,7 @@ void LGapResolver::EmitMove(int index) { |
MemOperand destination_operand = cgen_->ToMemOperand(destination); |
if (in_cycle_) { |
if (!destination_operand.OffsetIsUint12Encodable()) { |
- CpuFeatureScope scope(cgen_->masm(), VFP2); |
- // ip is overwritten while saving the value to the destination. |
+ // ip is overwritten while saving the value to the destination. |
// Therefore we can't use ip. It is OK if the read from the source |
// destroys ip, since that happens before the value is read. |
__ vldr(kScratchDoubleReg.low(), source_operand); |
@@ -272,7 +267,6 @@ void LGapResolver::EmitMove(int index) { |
} |
} else if (source->IsDoubleRegister()) { |
- CpuFeatureScope scope(cgen_->masm(), VFP2); |
DwVfpRegister source_register = cgen_->ToDoubleRegister(source); |
if (destination->IsDoubleRegister()) { |
__ vmov(cgen_->ToDoubleRegister(destination), source_register); |
@@ -282,8 +276,7 @@ void LGapResolver::EmitMove(int index) { |
} |
} else if (source->IsDoubleStackSlot()) { |
- CpuFeatureScope scope(cgen_->masm(), VFP2); |
- MemOperand source_operand = cgen_->ToMemOperand(source); |
+ MemOperand source_operand = cgen_->ToMemOperand(source); |
if (destination->IsDoubleRegister()) { |
__ vldr(cgen_->ToDoubleRegister(destination), source_operand); |
} else { |