Index: src/compiler/ia32/code-generator-ia32.cc |
diff --git a/src/compiler/ia32/code-generator-ia32.cc b/src/compiler/ia32/code-generator-ia32.cc |
index 1f61af8abf9c14f56ff27a7eb4dae6bcd8b40f6a..bcaab48148088e607ab128a590cafd96d6fb0955 100644 |
--- a/src/compiler/ia32/code-generator-ia32.cc |
+++ b/src/compiler/ia32/code-generator-ia32.cc |
@@ -1476,16 +1476,12 @@ void CodeGenerator::AssembleDeoptimizerCall( |
void CodeGenerator::AssemblePrologue() { |
CallDescriptor* descriptor = linkage()->GetIncomingDescriptor(); |
- if (descriptor->IsCFunctionCall()) { |
- // Assemble a prologue similar the to cdecl calling convention. |
- __ push(ebp); |
- __ mov(ebp, esp); |
- } else if (descriptor->IsJSFunctionCall()) { |
- // TODO(turbofan): this prologue is redundant with OSR, but still needed for |
- // code aging. |
- __ Prologue(this->info()->GeneratePreagedPrologue()); |
- } else if (frame()->needs_frame()) { |
- __ StubPrologue(); |
+ if (frame()->needs_frame()) { |
+ if (descriptor->flags() & CallDescriptor::kHasStandardFrameHeader) { |
+ __ Prologue(this->info()->GeneratePreagedPrologue()); |
+ } else { |
+ __ StubPrologue(info()->GetOutputStackFrameType()); |
+ } |
} else { |
frame()->SetElidedFrameSizeInSlots(kPCOnStackSize / kPointerSize); |
} |