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 cfa4de9b3c0a02a4a17be5a1ced19a48c2cdbe08..7513dfef135a9fca7d5da5d37041d2e1870dd769 100644 |
--- a/src/compiler/arm/code-generator-arm.cc |
+++ b/src/compiler/arm/code-generator-arm.cc |
@@ -9,6 +9,7 @@ |
#include "src/compiler/gap-resolver.h" |
#include "src/compiler/node-matchers.h" |
#include "src/compiler/node-properties-inl.h" |
+#include "src/compiler/osr.h" |
#include "src/scopes.h" |
namespace v8 { |
@@ -883,6 +884,22 @@ void CodeGenerator::AssemblePrologue() { |
StandardFrameConstants::kFixedFrameSizeFromFp); |
} |
int stack_slots = frame()->GetSpillSlotCount(); |
+ |
+ if (info()->is_osr()) { |
+ // TurboFan OSR-compiled functions cannot be entered directly. |
+ // TODO(titzer): put an abort into the header of OSR functions on arm. |
Benedikt Meurer
2014/12/18 11:21:22
MacroAssembler::Abort()
titzer
2015/01/09 14:17:47
Done.
|
+ |
+ // Unoptimized code jumps directly to this entrypoint while the unoptimized |
+ // frame is still on the stack. Optimized code uses OSR values directly from |
+ // the unoptimized frame. Thus, all that needs to be done is to allocate the |
+ // remaining stack slots. |
+ if (FLAG_code_comments) __ RecordComment("-- OSR entrypoint --"); |
+ osr_pc_offset_ = __ pc_offset(); |
+ size_t unoptimized_slots = OsrHelper(info()).UnoptimizedFrameSlots(); |
+ DCHECK(stack_slots >= static_cast<int>(unoptimized_slots)); |
+ stack_slots -= unoptimized_slots; |
+ } |
+ |
if (stack_slots > 0) { |
__ sub(sp, sp, Operand(stack_slots * kPointerSize)); |
} |