Unify SoftDeoptimize and Deoptimize hydrogen instructions

src/ia32/lithium-codegen-ia32.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 993 matching lines @@
 
 void LCodeGen::DeoptimizeIf(Condition cc,
                             LEnvironment* environment) {
   Deoptimizer::BailoutType bailout_type = info()->IsStub()
       ? Deoptimizer::LAZY
       : Deoptimizer::EAGER;
   DeoptimizeIf(cc, environment, bailout_type);
 }
 
 
-void LCodeGen::SoftDeoptimize(LEnvironment* environment) {
+void LCodeGen::Deoptimize(LEnvironment* environment) {
   ASSERT(!info()->IsStub());
   DeoptimizeIf(no_condition, environment, Deoptimizer::SOFT);
 }
 
 
 void LCodeGen::RegisterDependentCodeForEmbeddedMaps(Handle<Code> code) {
   ZoneList<Handle<Map> > maps(1, zone());
   int mode_mask = RelocInfo::ModeMask(RelocInfo::EMBEDDED_OBJECT);
   for (RelocIterator it(*code, mode_mask); !it.done(); it.next()) {
     RelocInfo::Mode mode = it.rinfo()->rmode();
@@ skipping 5287 matching lines @@
 void LCodeGen::DoLazyBailout(LLazyBailout* instr) {
   EnsureSpaceForLazyDeopt();
   ASSERT(instr->HasEnvironment());
   LEnvironment* env = instr->environment();
   RegisterEnvironmentForDeoptimization(env, Safepoint::kLazyDeopt);
   safepoints_.RecordLazyDeoptimizationIndex(env->deoptimization_index());
 }
 
 
 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());
   }
 }
 
 
 void LCodeGen::DoDummyUse(LDummyUse* instr) {
   // Nothing to see here, move on!
 }
 
@@ skipping 163 matching lines @@
                               FixedArray::kHeaderSize - kPointerSize));
   __ bind(&done);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32