Unify SoftDeoptimize and Deoptimize hydrogen instructions

src/arm/lithium-codegen-arm.cc

Index: src/arm/lithium-codegen-arm.cc
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
index 9900a1e9848f0515b093bb423c4b212de5e81fb2..b053db0daf1d6b70f4a6ab6ab11f18dfd30b4589 100644
--- a/src/arm/lithium-codegen-arm.cc
+++ b/src/arm/lithium-codegen-arm.cc
@@ -808,7 +808,7 @@ void LCodeGen::DeoptimizeIf(Condition cc,
 }
 
 
-void LCodeGen::SoftDeoptimize(LEnvironment* environment) {
+void LCodeGen::Deoptimize(LEnvironment* environment) {
   ASSERT(!info()->IsStub());
   DeoptimizeIf(al, environment, Deoptimizer::SOFT);
 }
@@ -5629,8 +5629,8 @@ void LCodeGen::DoLazyBailout(LLazyBailout* instr) {
 
 
 void LCodeGen::DoDeoptimize(LDeoptimize* instr) {
-  if (instr->hydrogen_value()->IsSoftDeoptimize()) {
-    SoftDeoptimize(instr->environment());
+  if (instr->hydrogen_value()->IsDeoptimize()) {

[Jakob Kummerow, 2013/07/22 16:53:12]

Uhm, what? What else would the hydrogen_value be? I think you meant to check for
hydrogen()->type() here (but see my comments on the ia32 version).

[danno, 2013/07/23 12:18:14]

Done.

+    Deoptimize(instr->environment());
   } else {
     DeoptimizeIf(al, instr->environment());
   }