| 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 f81f5760632b95bb63938443e3efbb54b06130a5..d5156d9590eacdf8819444ddfe6b941fa9903999 100644
|
| --- a/src/compiler/ia32/code-generator-ia32.cc
|
| +++ b/src/compiler/ia32/code-generator-ia32.cc
|
| @@ -1484,16 +1484,15 @@ 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->IsCFunctionCall()) {
|
| + __ push(ebp);
|
| + __ mov(ebp, esp);
|
| + } else if (descriptor->IsJSFunctionCall()) {
|
| + __ Prologue(this->info()->GeneratePreagedPrologue());
|
| + } else {
|
| + __ StubPrologue(info()->GetOutputStackFrameType());
|
| + }
|
| } else {
|
| frame()->SetElidedFrameSizeInSlots(kPCOnStackSize / kPointerSize);
|
| }
|
|
|