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

test/unittests/compiler/int64-lowering-unittest.cc

 // Copyright 2016 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/int64-lowering.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node.h"
 
@@ skipping 22 matching lines @@
         machine_(zone(), MachineRepresentation::kWord32,
                  MachineOperatorBuilder::Flag::kAllOptionalOps) {
     value_[0] = 0x1234567890abcdef;
     value_[1] = 0x1edcba098765432f;
     value_[2] = 0x1133557799886644;
   }
 
   MachineOperatorBuilder* machine() { return &machine_; }
 
   void LowerGraph(Node* node, Signature<MachineRepresentation>* signature) {
-    Node* zero = graph()->NewNode(common()->Int32Constant(0));
-    Node* ret = graph()->NewNode(common()->Return(), zero, node,
-                                 graph()->start(), graph()->start());
+    Node* ret = graph()->NewNode(common()->Return(), node, graph()->start(),
+                                 graph()->start());
     NodeProperties::MergeControlToEnd(graph(), common(), ret);
 
     Int64Lowering lowering(graph(), machine(), common(), zone(), signature);
     lowering.LowerGraph();
   }
 
   void LowerGraph(Node* node, MachineRepresentation return_type,
                   MachineRepresentation rep = MachineRepresentation::kWord32,
                   int num_params = 0) {
     Signature<MachineRepresentation>::Builder sig_builder(zone(), 1,
@@ skipping 154 matching lines @@
   int32_t index = 2222;                                                      \
   int32_t return_value = 0x5555;                                             \
                                                                              \
   Signature<MachineRepresentation>::Builder sig_builder(zone(), 1, 0);       \
   sig_builder.AddReturn(MachineRepresentation::kWord32);                     \
                                                                              \
   Node* store = graph()->NewNode(machine()->kStore(kRep64),                  \
                                  Int32Constant(base), Int32Constant(index),  \
                                  Int64Constant(value(0)), start(), start()); \
                                                                              \
-  Node* zero = graph()->NewNode(common()->Int32Constant(0));                 \
-  Node* ret = graph()->NewNode(common()->Return(), zero,                     \
+  Node* ret = graph()->NewNode(common()->Return(),                           \
                                Int32Constant(return_value), store, start()); \
                                                                              \
   NodeProperties::MergeControlToEnd(graph(), common(), ret);                 \
                                                                              \
   Int64Lowering lowering(graph(), machine(), common(), zone(),               \
                          sig_builder.Build());                               \
   lowering.LowerGraph();                                                     \
                                                                              \
   STORE_VERIFY(kStore, kRep32)
 
@@ skipping 76 matching lines @@
   Matcher<Node*> call_matcher =
       IsCall(testing::_, IsInt32Constant(function), start(), start());
 
   EXPECT_THAT(graph()->end()->InputAt(1),
               IsReturn2(IsProjection(0, AllOf(CaptureEq(&call), call_matcher)),
                         IsProjection(1, AllOf(CaptureEq(&call), call_matcher)),
                         start(), start()));
 
   CompareCallDescriptors(
       OpParameter<const CallDescriptor*>(
-          graph()->end()->InputAt(1)->InputAt(1)->InputAt(0)),
+          graph()->end()->InputAt(1)->InputAt(0)->InputAt(0)),
       wasm::ModuleEnv::GetI32WasmCallDescriptor(zone(), desc));
 }
 
 TEST_F(Int64LoweringTest, CallI64Parameter) {
   int32_t function = 0x9999;
 
   Signature<MachineRepresentation>::Builder sig_builder(zone(), 1, 3);
   sig_builder.AddReturn(MachineRepresentation::kWord32);
   sig_builder.AddParam(MachineRepresentation::kWord64);
   sig_builder.AddParam(MachineRepresentation::kWord32);
@@ skipping 13 matching lines @@
       IsReturn(IsCall(testing::_, IsInt32Constant(function),
                       IsInt32Constant(low_word_value(0)),
                       IsInt32Constant(high_word_value(0)),
                       IsInt32Constant(low_word_value(1)),
                       IsInt32Constant(low_word_value(2)),
                       IsInt32Constant(high_word_value(2)), start(), start()),
                start(), start()));
 
   CompareCallDescriptors(
       OpParameter<const CallDescriptor*>(
-          graph()->end()->InputAt(1)->InputAt(1)),
+          graph()->end()->InputAt(1)->InputAt(0)),
       wasm::ModuleEnv::GetI32WasmCallDescriptor(zone(), desc));
 }
 
 TEST_F(Int64LoweringTest, Int64Add) {
   LowerGraph(graph()->NewNode(machine()->Int64Add(), Int64Constant(value(0)),
                               Int64Constant(value(1))),
              MachineRepresentation::kWord64);
 
   Capture<Node*> add;
   Matcher<Node*> add_matcher = IsInt32PairAdd(
@@ skipping 508 matching lines @@
 
   eff_phi->InsertInput(zone(), 1, store);
   NodeProperties::ChangeOp(eff_phi,
                            common()->ResizeMergeOrPhi(eff_phi->op(), 2));
 
   LowerGraph(load, MachineRepresentation::kWord64);
 }
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8