Remove dummy control / effect edges from RMA Call nodes.

test/unittests/compiler/interpreter-assembler-unittest.cc

 // Copyright 2015 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 "test/unittests/compiler/interpreter-assembler-unittest.h"
 
 #include "src/code-factory.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/node.h"
 #include "src/interface-descriptors.h"
@@ skipping 66 matching lines @@
 Matcher<Node*> InterpreterAssemblerTest::InterpreterAssemblerForTest::IsStore(
     const Matcher<StoreRepresentation>& rep_matcher,
     const Matcher<Node*>& base_matcher, const Matcher<Node*>& index_matcher,
     const Matcher<Node*>& value_matcher) {
   return ::i::compiler::IsStore(rep_matcher, base_matcher, index_matcher,
                                 value_matcher, graph()->start(),
                                 graph()->start());
 }
 
 
-template <class... A>
-Matcher<Node*> InterpreterAssemblerTest::InterpreterAssemblerForTest::IsCall(
-    const Matcher<const CallDescriptor*>& descriptor_matcher, A... args) {
-  return ::i::compiler::IsCall(descriptor_matcher, args..., graph()->start(),
-                               graph()->start());
-}
-
-
 Matcher<Node*>
 InterpreterAssemblerTest::InterpreterAssemblerForTest::IsBytecodeOperand(
     int offset) {
   return IsLoad(
       kMachUint8, IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
       IsIntPtrAdd(IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
                   IsInt32Constant(offset)));
 }
 
 
@@ skipping 64 matching lines @@
     EXPECT_EQ(CallDescriptor::kCallCodeObject, m.call_descriptor()->kind());
     EXPECT_TRUE(m.call_descriptor()->flags() & CallDescriptor::kCanUseRoots);
     EXPECT_THAT(
         tail_call_node,
         IsTailCall(m.call_descriptor(), code_target_matcher,
                    IsParameter(Linkage::kInterpreterAccumulatorParameter),
                    IsParameter(Linkage::kInterpreterRegisterFileParameter),
                    next_bytecode_offset_matcher,
                    IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
                    IsParameter(Linkage::kInterpreterDispatchTableParameter),
-                   IsParameter(Linkage::kInterpreterContextParameter),
-                   graph->start(), graph->start()));
+                   IsParameter(Linkage::kInterpreterContextParameter), _, _));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, Jump) {
   int jump_offsets[] = {-9710, -77, 0, +3, +97109};
   TRACED_FOREACH(int, jump_offset, jump_offsets) {
     TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
       InterpreterAssemblerForTest m(this, bytecode);
       m.Jump(m.Int32Constant(jump_offset));
@@ skipping 16 matching lines @@
       EXPECT_EQ(CallDescriptor::kCallCodeObject, m.call_descriptor()->kind());
       EXPECT_TRUE(m.call_descriptor()->flags() & CallDescriptor::kCanUseRoots);
       EXPECT_THAT(
           tail_call_node,
           IsTailCall(m.call_descriptor(), code_target_matcher,
                      IsParameter(Linkage::kInterpreterAccumulatorParameter),
                      IsParameter(Linkage::kInterpreterRegisterFileParameter),
                      next_bytecode_offset_matcher,
                      IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
                      IsParameter(Linkage::kInterpreterDispatchTableParameter),
-                     IsParameter(Linkage::kInterpreterContextParameter),
-                     graph->start(), graph->start()));
+                     IsParameter(Linkage::kInterpreterContextParameter), _, _));
     }
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, JumpIfWordEqual) {
   static const int kJumpIfTrueOffset = 73;
 
   MachineOperatorBuilder machine(zone());
 
@@ skipping 20 matching lines @@
           IsWord32Shl(target_bytecode_matcher,
                       IsInt32Constant(kPointerSizeLog2)));
       EXPECT_THAT(
           end->InputAt(i),
           IsTailCall(m.call_descriptor(), code_target_matcher,
                      IsParameter(Linkage::kInterpreterAccumulatorParameter),
                      IsParameter(Linkage::kInterpreterRegisterFileParameter),
                      next_bytecode_offset_matcher,
                      IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
                      IsParameter(Linkage::kInterpreterDispatchTableParameter),
-                     IsParameter(Linkage::kInterpreterContextParameter),
-                     graph->start(), graph->start()));
+                     IsParameter(Linkage::kInterpreterContextParameter), _, _));
     }
 
     // TODO(oth): test control flow paths.
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, Return) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     m.Return();
     Graph* graph = m.graph();
 
     Node* end = graph->end();
     EXPECT_EQ(1, end->InputCount());
     Node* tail_call_node = end->InputAt(0);
 
     EXPECT_EQ(CallDescriptor::kCallCodeObject, m.call_descriptor()->kind());
     EXPECT_TRUE(m.call_descriptor()->flags() & CallDescriptor::kCanUseRoots);
     Handle<HeapObject> exit_trampoline =
         isolate()->builtins()->InterpreterExitTrampoline();
     EXPECT_THAT(
         tail_call_node,
         IsTailCall(m.call_descriptor(), IsHeapConstant(exit_trampoline),
                    IsParameter(Linkage::kInterpreterAccumulatorParameter),
                    IsParameter(Linkage::kInterpreterRegisterFileParameter),
                    IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
                    IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
                    IsParameter(Linkage::kInterpreterDispatchTableParameter),
-                   IsParameter(Linkage::kInterpreterContextParameter),
-                   graph->start(), graph->start()));
+                   IsParameter(Linkage::kInterpreterContextParameter), _, _));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, BytecodeOperand) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     int number_of_operands = interpreter::Bytecodes::NumberOfOperands(bytecode);
     for (int i = 0; i < number_of_operands; i++) {
       int offset = interpreter::Bytecodes::GetOperandOffset(bytecode, i);
@@ skipping 48 matching lines @@
     // Should be passed to next bytecode handler on dispatch.
     m.Dispatch();
     Graph* graph = m.graph();
 
     Node* end = graph->end();
     EXPECT_EQ(1, end->InputCount());
     Node* tail_call_node = end->InputAt(0);
 
     EXPECT_THAT(tail_call_node,
                 IsTailCall(m.call_descriptor(), _, accumulator_value_2, _, _, _,
-                           _, graph->start(), graph->start()));
+                           _, _, _));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, RegisterLocation) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* reg_index_node = m.Int32Constant(44);
     Node* reg_location_node = m.RegisterLocation(reg_index_node);
     EXPECT_THAT(
@@ skipping 161 matching lines @@
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, CallRuntime2) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* arg1 = m.Int32Constant(2);
     Node* arg2 = m.Int32Constant(3);
     Node* call_runtime = m.CallRuntime(Runtime::kAdd, arg1, arg2);
-    EXPECT_THAT(call_runtime,
-                m.IsCall(_, _, arg1, arg2, _, IsInt32Constant(2),
-                         IsParameter(Linkage::kInterpreterContextParameter)));
+    EXPECT_THAT(
+        call_runtime,
+        IsCall(_, _, arg1, arg2, _, IsInt32Constant(2),
+               IsParameter(Linkage::kInterpreterContextParameter), _, _));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, CallRuntime) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Callable builtin = CodeFactory::InterpreterCEntry(isolate());
 
     Node* function_id = m.Int32Constant(0);
     Node* first_arg = m.Int32Constant(1);
     Node* arg_count = m.Int32Constant(2);
 
     Matcher<Node*> function_table = IsExternalConstant(
         ExternalReference::runtime_function_table_address(isolate()));
     Matcher<Node*> function = IsIntPtrAdd(
         function_table,
         IsInt32Mul(function_id, IsInt32Constant(sizeof(Runtime::Function))));
     Matcher<Node*> function_entry =
         m.IsLoad(kMachPtr, function,
                  IsInt32Constant(offsetof(Runtime::Function, entry)));
 
     Node* call_runtime = m.CallRuntime(function_id, first_arg, arg_count);
-    EXPECT_THAT(call_runtime,
-                m.IsCall(_, IsHeapConstant(builtin.code()), arg_count,
-                         first_arg, function_entry,
-                         IsParameter(Linkage::kInterpreterContextParameter)));
+    EXPECT_THAT(
+        call_runtime,
+        IsCall(_, IsHeapConstant(builtin.code()), arg_count, first_arg,
+               function_entry,
+               IsParameter(Linkage::kInterpreterContextParameter), _, _));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, CallIC) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     LoadWithVectorDescriptor descriptor(isolate());
     Node* target = m.Int32Constant(1);
     Node* arg1 = m.Int32Constant(2);
     Node* arg2 = m.Int32Constant(3);
     Node* arg3 = m.Int32Constant(4);
     Node* arg4 = m.Int32Constant(5);
     Node* call_ic = m.CallIC(descriptor, target, arg1, arg2, arg3, arg4);
-    EXPECT_THAT(call_ic,
-                m.IsCall(_, target, arg1, arg2, arg3, arg4,
-                         IsParameter(Linkage::kInterpreterContextParameter)));
+    EXPECT_THAT(
+        call_ic,
+        IsCall(_, target, arg1, arg2, arg3, arg4,
+               IsParameter(Linkage::kInterpreterContextParameter), _, _));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, CallJS) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Callable builtin = CodeFactory::InterpreterPushArgsAndCall(isolate());
     Node* function = m.Int32Constant(0);
     Node* first_arg = m.Int32Constant(1);
     Node* arg_count = m.Int32Constant(2);
     Node* call_js = m.CallJS(function, first_arg, arg_count);
     EXPECT_THAT(
         call_js,
-        m.IsCall(_, IsHeapConstant(builtin.code()), arg_count, first_arg,
-                 function, IsParameter(Linkage::kInterpreterContextParameter)));
+        IsCall(_, IsHeapConstant(builtin.code()), arg_count, first_arg,
+               function, IsParameter(Linkage::kInterpreterContextParameter), _,
+               _));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, LoadTypeFeedbackVector) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* feedback_vector = m.LoadTypeFeedbackVector();
 
     Matcher<Node*> load_function_matcher = m.IsLoad(
         kMachAnyTagged, IsParameter(Linkage::kInterpreterRegisterFileParameter),
         IsIntPtrConstant(
             InterpreterFrameConstants::kFunctionFromRegisterPointer));
     Matcher<Node*> load_shared_function_info_matcher =
         m.IsLoad(kMachAnyTagged, load_function_matcher,
                  IsIntPtrConstant(JSFunction::kSharedFunctionInfoOffset -
                                   kHeapObjectTag));
 
     EXPECT_THAT(
         feedback_vector,
         m.IsLoad(kMachAnyTagged, load_shared_function_info_matcher,
                  IsIntPtrConstant(SharedFunctionInfo::kFeedbackVectorOffset -
                                   kHeapObjectTag)));
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8