[builtins]: Uniformly push argument count in TF-generated builtins

src/compiler/linkage.cc

Index: src/compiler/linkage.cc
diff --git a/src/compiler/linkage.cc b/src/compiler/linkage.cc
index 51c54fb80643466b66ab7ba1f740b238db570475..37dbbe4303599125fa5c10e90648e01927514650 100644
--- a/src/compiler/linkage.cc
+++ b/src/compiler/linkage.cc
@@ -107,6 +107,18 @@ bool CallDescriptor::CanTailCall(const Node* node) const {
   return HasSameReturnLocationsAs(CallDescriptorOf(node->op()));
 }
 
+int CallDescriptor::CalculateFixedFrameSize() const {
+  if (IsJSFunctionCall()) {

[Benedikt Meurer, 2016/11/03 05:00:03]

Please turn this into a switch over the call descriptor kind instead of this
nested ifs plus some tenary magic at the end.

[danno, 2016/11/03 07:55:38]

Done.

+    if (PushArgumentCount()) {
+      return OptimizedBuiltinFrameConstants::kFixedSlotCount;
+    } else {
+      return StandardFrameConstants::kFixedSlotCount;
+    }
+  }
+  return IsCFunctionCall() ? (CommonFrameConstants::kFixedSlotCountAboveFp +
+                              CommonFrameConstants::kCPSlotCount)
+                           : TypedFrameConstants::kFixedSlotCount;
+}
 
 CallDescriptor* Linkage::ComputeIncoming(Zone* zone, CompilationInfo* info) {
   DCHECK(!info->IsStub());