Revert r6543 and r6441.

src/arm/lithium-codegen-arm.cc

 // Copyright 2011 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 583 matching lines @@
   } else {
     RecordSafepoint(instr->pointer_map(), Safepoint::kNoDeoptimizationIndex);
   }
 }
 
 
 void LCodeGen::RegisterLazyDeoptimization(LInstruction* instr) {
   // Create the environment to bailout to. If the call has side effects
   // execution has to continue after the call otherwise execution can continue
   // from a previous bailout point repeating the call.
-  LEnvironment* lazy_deoptimization_environment;
-  ASSERT(!instr->IsControl());
-  ASSERT(instructions_->at(current_instruction_ + 1)->IsGap());
-  LInstruction* next_instr = instructions_->at(current_instruction_ + 2);
-  if (next_instr->IsLazyBailout()) {
-    ASSERT(next_instr->HasEnvironment());
-    lazy_deoptimization_environment = next_instr->environment();
+  LEnvironment* deoptimization_environment;
+  if (instr->HasDeoptimizationEnvironment()) {
+    deoptimization_environment = instr->deoptimization_environment();
   } else {
-    lazy_deoptimization_environment = instr->environment();
+    deoptimization_environment = instr->environment();
   }
 
-  RegisterEnvironmentForDeoptimization(lazy_deoptimization_environment);
+  RegisterEnvironmentForDeoptimization(deoptimization_environment);
   RecordSafepoint(instr->pointer_map(),
-                  lazy_deoptimization_environment->deoptimization_index());
+                  deoptimization_environment->deoptimization_index());
 }
 
 
 void LCodeGen::RegisterEnvironmentForDeoptimization(LEnvironment* environment) {
   if (!environment->HasBeenRegistered()) {
     // Physical stack frame layout:
     // -x ............. -4  0 ..................................... y
     // [incoming arguments] [spill slots] [pushed outgoing arguments]
 
     // Layout of the environment:
@@ skipping 3046 matching lines @@
 
 
 void LCodeGen::DoOsrEntry(LOsrEntry* instr) {
   Abort("DoOsrEntry unimplemented.");
 }
 
 
 #undef __
 
 } }  // namespace v8::internal