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

src/compiler/common-operator.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/common-operator.h"
 
 #include "src/assembler.h"
 #include "src/base/lazy-instance.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/opcodes.h"
@@ skipping 238 matching lines @@
   V(LoopExit, Operator::kKontrol, 0, 0, 2, 0, 0, 1)                           \
   V(LoopExitValue, Operator::kPure, 1, 0, 1, 1, 0, 0)                         \
   V(LoopExitEffect, Operator::kNoThrow, 0, 1, 1, 0, 1, 0)                     \
   V(Checkpoint, Operator::kKontrol, 0, 1, 1, 0, 1, 0)                         \
   V(FinishRegion, Operator::kKontrol, 1, 1, 0, 1, 1, 0)                       \
   V(Retain, Operator::kKontrol, 1, 1, 0, 0, 1, 0)
 
 #define CACHED_RETURN_LIST(V) \
   V(1)                        \
   V(2)                        \
-  V(3)                        \
-  V(4)
+  V(3)
+
 
 #define CACHED_END_LIST(V) \
   V(1)                     \
   V(2)                     \
   V(3)                     \
   V(4)                     \
   V(5)                     \
   V(6)                     \
   V(7)                     \
   V(8)
@@ skipping 118 matching lines @@
         : Operator(                                // --
               IrOpcode::kEnd, Operator::kKontrol,  // opcode
               "End",                               // name
               0, 0, kInputCount, 0, 0, 0) {}       // counts
   };
 #define CACHED_END(input_count) \
   EndOperator<input_count> kEnd##input_count##Operator;
   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
+        : Operator(                                   // --
+              IrOpcode::kReturn, Operator::kNoThrow,  // opcode
+              "Return",                               // name
+              kInputCount, 1, 1, 0, 0, 1) {}          // counts
   };
-#define CACHED_RETURN(value_input_count) \
-  ReturnOperator<value_input_count> kReturn##value_input_count##Operator;
+#define CACHED_RETURN(input_count) \
+  ReturnOperator<input_count> kReturn##input_count##Operator;
   CACHED_RETURN_LIST(CACHED_RETURN)
 #undef CACHED_RETURN
 
   template <BranchHint kBranchHint>
   struct BranchOperator final : public Operator1<BranchHint> {
     BranchOperator()
         : Operator1<BranchHint>(                      // --
               IrOpcode::kBranch, Operator::kKontrol,  // opcode
               "Branch",                               // name
               1, 0, 1, 0, 0, 2,                       // counts
@@ skipping 206 matching lines @@
     default:
       break;
   }
   // Uncached.
   return new (zone()) Operator(             //--
       IrOpcode::kEnd, Operator::kKontrol,   // opcode
       "End",                                // name
       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) \
   case input_count:                \
     return &cache_.kReturn##input_count##Operator;
     CACHED_RETURN_LIST(CACHED_RETURN)
 #undef CACHED_RETURN
     default:
       break;
   }
   // Uncached.
   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
 }
 
 
 const Operator* CommonOperatorBuilder::Branch(BranchHint hint) {
   switch (hint) {
     case BranchHint::kNone:
       return &cache_.kBranchNoneOperator;
     case BranchHint::kTrue:
       return &cache_.kBranchTrueOperator;
     case BranchHint::kFalse:
@@ skipping 455 matching lines @@
 CommonOperatorBuilder::CreateFrameStateFunctionInfo(
     FrameStateType type, int parameter_count, int local_count,
     Handle<SharedFunctionInfo> shared_info) {
   return new (zone()->New(sizeof(FrameStateFunctionInfo)))
       FrameStateFunctionInfo(type, parameter_count, local_count, shared_info);
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8