Unify SoftDeoptimize and Deoptimize hydrogen instructions

src/ia32/lithium-codegen-ia32.cc

Index: src/ia32/lithium-codegen-ia32.cc
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc
index 8b7a494f7c1e39c2ebd35ec3c646c6f91624eee0..82231ce8abc17d0e4cb69e22abc861ef59b51dae 100644
--- a/src/ia32/lithium-codegen-ia32.cc
+++ b/src/ia32/lithium-codegen-ia32.cc
@@ -1011,7 +1011,7 @@ void LCodeGen::DeoptimizeIf(Condition cc,
 }
 
 
-void LCodeGen::SoftDeoptimize(LEnvironment* environment) {
+void LCodeGen::Deoptimize(LEnvironment* environment) {
   ASSERT(!info()->IsStub());
   DeoptimizeIf(no_condition, environment, Deoptimizer::SOFT);
 }
@@ -6319,8 +6319,9 @@ void LCodeGen::DoLazyBailout(LLazyBailout* instr) {
 
 
 void LCodeGen::DoDeoptimize(LDeoptimize* instr) {
-  if (instr->hydrogen_value()->IsSoftDeoptimize()) {
-    SoftDeoptimize(instr->environment());
+  ASSERT(instr->hydrogen_value()->IsDeoptimize());

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

This explicit ASSERT is unnecessary, as "instr->hydrogen()" below implicitly
checks for that too.

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

Done.

+  if (instr->hydrogen()->type() == Deoptimizer::SOFT) {
+    Deoptimize(instr->environment());

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

I think I'd prefer to extend Deoptimize()'s signature to take a
Deoptimizer::BailoutType as an additional parameter. Then you could just always
call:
    Deoptimize(instr->environment, instr->hydrogen()->type());
here.

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

Done

   } else {
     DeoptimizeIf(no_condition, instr->environment());
   }