Revert of [turbofan] Support variable size argument popping in TF-generated functions

src/compiler/common-operator.cc

Index: src/compiler/common-operator.cc
diff --git a/src/compiler/common-operator.cc b/src/compiler/common-operator.cc
index 12a06530e39fdc8a46b5fdbbe3f1659532e6c385..eb5ff7411c44295ae21256cec54d7f003d2ea203 100644
--- a/src/compiler/common-operator.cc
+++ b/src/compiler/common-operator.cc
@@ -256,8 +256,8 @@
 #define CACHED_RETURN_LIST(V) \
   V(1)                        \
   V(2)                        \
-  V(3)                        \
-  V(4)
+  V(3)
+
 
 #define CACHED_END_LIST(V) \
   V(1)                     \
@@ -396,16 +396,16 @@
   CACHED_END_LIST(CACHED_END)
 #undef CACHED_END
 
-  template <size_t kValueInputCount>
+  template <size_t kInputCount>
   struct ReturnOperator final : public Operator {
     ReturnOperator()
-        : Operator(                                    // --
-              IrOpcode::kReturn, Operator::kNoThrow,   // opcode
-              "Return",                                // name
-              kValueInputCount + 1, 1, 1, 0, 0, 1) {}  // counts
-  };
-#define CACHED_RETURN(value_input_count) \
-  ReturnOperator<value_input_count> kReturn##value_input_count##Operator;
+        : Operator(                                   // --
+              IrOpcode::kReturn, Operator::kNoThrow,  // opcode
+              "Return",                               // name
+              kInputCount, 1, 1, 0, 0, 1) {}          // counts
+  };
+#define CACHED_RETURN(input_count) \
+  ReturnOperator<input_count> kReturn##input_count##Operator;
   CACHED_RETURN_LIST(CACHED_RETURN)
 #undef CACHED_RETURN
 
@@ -632,6 +632,7 @@
       0, 0, control_input_count, 0, 0, 0);  // counts
 }
 
+
 const Operator* CommonOperatorBuilder::Return(int value_input_count) {
   switch (value_input_count) {
 #define CACHED_RETURN(input_count) \
@@ -646,7 +647,7 @@
   return new (zone()) Operator(               //--
       IrOpcode::kReturn, Operator::kNoThrow,  // opcode
       "Return",                               // name
-      value_input_count + 1, 1, 1, 0, 0, 1);  // counts
+      value_input_count, 1, 1, 0, 0, 1);      // counts
 }