Change PC for OSR entries to point to something more sensible (i.e. the first UnknownOsrValue), rem…

src/lithium-allocator.cc

Index: src/lithium-allocator.cc
diff --git a/src/lithium-allocator.cc b/src/lithium-allocator.cc
index 1fd921f191b82beb6f2e840a55ecaf65e7f7e08c..cbfa2d556b471322b9339171aa546c6c6dfa19bd 100644
--- a/src/lithium-allocator.cc
+++ b/src/lithium-allocator.cc
@@ -1093,7 +1093,6 @@ bool LAllocator::Allocate(LChunk* chunk) {
   AllocateDoubleRegisters();
   if (!AllocationOk()) return false;
   PopulatePointerMaps();
-  if (has_osr_entry_) ProcessOsrEntry();
   ConnectRanges();
   ResolveControlFlow();
   return true;
@@ -1464,37 +1463,6 @@ void LAllocator::PopulatePointerMaps() {
 }
 
 
-void LAllocator::ProcessOsrEntry() {

[Michael Starzinger, 2013/06/11 17:24:07]

Also remove the declaration of this method in the lithium-allocator.h file.

[titzer, 2013/06/12 09:30:04]

Done.

-  const ZoneList<LInstruction*>* instrs = chunk_->instructions();
-
-  // Linear search for the OSR entry instruction in the chunk.
-  int index = -1;
-  while (++index < instrs->length() &&
-         !instrs->at(index)->IsOsrEntry()) {
-  }
-  ASSERT(index < instrs->length());
-  LOsrEntry* instruction = LOsrEntry::cast(instrs->at(index));
-
-  LifetimePosition position = LifetimePosition::FromInstructionIndex(index);
-  for (int i = 0; i < live_ranges()->length(); ++i) {
-    LiveRange* range = live_ranges()->at(i);
-    if (range != NULL) {
-      if (range->Covers(position) &&
-          range->HasRegisterAssigned() &&
-          range->TopLevel()->HasAllocatedSpillOperand()) {
-        int reg_index = range->assigned_register();
-        LOperand* spill_operand = range->TopLevel()->GetSpillOperand();
-        if (range->IsDouble()) {
-          instruction->MarkSpilledDoubleRegister(reg_index, spill_operand);
-        } else {
-          instruction->MarkSpilledRegister(reg_index, spill_operand);
-        }
-      }
-    }
-  }
-}
-
-
 void LAllocator::AllocateGeneralRegisters() {
   HPhase phase("L_Allocate general registers", this);
   num_registers_ = Register::NumAllocatableRegisters();