Index: src/compiler/arm/code-generator-arm.cc |
diff --git a/src/compiler/arm/code-generator-arm.cc b/src/compiler/arm/code-generator-arm.cc |
index 79767a84b3ebc58a035b5d86d342c839334d702a..bd5c7d360314a10e60769fa645f7fcef7cd00940 100644 |
--- a/src/compiler/arm/code-generator-arm.cc |
+++ b/src/compiler/arm/code-generator-arm.cc |
@@ -874,8 +874,13 @@ void CodeGenerator::AssemblePrologue() { |
osr_pc_offset_ = __ pc_offset(); |
// TODO(titzer): cannot address target function == local #-1 |
__ ldr(r1, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); |
- DCHECK(stack_slots >= frame()->GetOsrStackSlotCount()); |
- stack_slots -= frame()->GetOsrStackSlotCount(); |
+ int osr_stack_slot_count = frame()->GetOsrStackSlotCount(); |
+ DCHECK(stack_slots >= osr_stack_slot_count); |
+ stack_slots -= osr_stack_slot_count; |
+ |
+ // Full-code javascript functions have a type feedback vector in the frame. |
+ // Shift any locals down one slot, and adjust the stack pointer. |
+ __ AdaptUnoptimizedFrameForOsrEntry(osr_stack_slot_count, r2, r0); |
} |
if (stack_slots > 0) { |