[runtime] Unify and simplify how frames are marked

src/compiler/arm/code-generator-arm.cc

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 5c94ccf7c3b2d07bb6ce1b379cf99d14135080db..c6fcf3822629da72ba5d18c77b428d3e6c89cedd 100644
--- a/src/compiler/arm/code-generator-arm.cc
+++ b/src/compiler/arm/code-generator-arm.cc
@@ -1166,19 +1166,12 @@ void CodeGenerator::AssembleDeoptimizerCall(
 
 void CodeGenerator::AssemblePrologue() {
   CallDescriptor* descriptor = linkage()->GetIncomingDescriptor();
-  if (descriptor->IsCFunctionCall()) {
-    if (FLAG_enable_embedded_constant_pool) {
-      __ Push(lr, fp, pp);
-      // Adjust FP to point to saved FP.
-      __ sub(fp, sp, Operand(StandardFrameConstants::kConstantPoolOffset));
+  if (frame()->needs_frame()) {
+    if (descriptor->flags() & CallDescriptor::kHasStandardFrameHeader) {
+      __ Prologue(this->info()->GeneratePreagedPrologue());
     } else {
-      __ Push(lr, fp);
-      __ mov(fp, sp);
+      __ StubPrologue(info()->GetOutputStackFrameType());

[titzer, 2016/03/07 10:48:43]

Would it be possible to unify the two cases and put the logic of which prologue
sequence to generate completely into the macro assembler?

[danno, 2016/03/08 07:04:44]

Yes, but I'd prefer to save that for a separate CL.

     }
-  } else if (descriptor->IsJSFunctionCall()) {
-    __ Prologue(this->info()->GeneratePreagedPrologue());
-  } else if (frame()->needs_frame()) {
-    __ StubPrologue();
   } else {
     frame()->SetElidedFrameSizeInSlots(0);
   }