Merged r19834, r19843 into 3.24 branch.

src/hydrogen-instructions.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 2395 matching lines @@
         stream->Add(" push ");
       }
       values_[i]->PrintNameTo(stream);
       if (i > 0) stream->Add(",");
     }
   }
 }
 
 
 void HSimulate::ReplayEnvironment(HEnvironment* env) {
+  if (done_with_replay_) return;
   ASSERT(env != NULL);
   env->set_ast_id(ast_id());
   env->Drop(pop_count());
   for (int i = values()->length() - 1; i >= 0; --i) {
     HValue* value = values()->at(i);
     if (HasAssignedIndexAt(i)) {
       env->Bind(GetAssignedIndexAt(i), value);
     } else {
       env->Push(value);
     }
   }
+  done_with_replay_ = true;
 }
 
 
 static void ReplayEnvironmentNested(const ZoneList<HValue*>* values,
                                     HCapturedObject* other) {
   for (int i = 0; i < values->length(); ++i) {
     HValue* value = values->at(i);
     if (value->IsCapturedObject()) {
       if (HCapturedObject::cast(value)->capture_id() == other->capture_id()) {
         values->at(i) = other;
@@ skipping 2039 matching lines @@
       break;
     case kExternalMemory:
       stream->Add("[external-memory]");
       break;
   }
 
   stream->Add("@%d", offset());
 }
 
 } }  // namespace v8::internal