Revert of [Interpreter] Implements calls through CallICStub in the interpreter.

test/cctest/interpreter/test-interpreter.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 "src/v8.h"
 
 #include "src/execution.h"
 #include "src/handles.h"
 #include "src/interpreter/bytecode-array-builder.h"
 #include "src/interpreter/interpreter.h"
@@ skipping 910 matching lines @@
   CHECK_EQ(Smi::cast(*result), Smi::FromInt(999));
 
   // Test transition to megamorphic IC.
   Handle<Object> object2 =
       InterpreterTester::NewObject("({ val : 456, other : 123 })");
   callable(object2).ToHandleChecked();
   CHECK(Runtime::GetObjectProperty(isolate, object2, name).ToHandle(&result));
   CHECK_EQ(Smi::cast(*result), Smi::FromInt(999));
 }
 
-static void TestInterpreterCall(TailCallMode tail_call_mode,
-                                bool has_feedback_slot) {
+static void TestInterpreterCall(TailCallMode tail_call_mode) {
   HandleAndZoneScope handles;
   i::Isolate* isolate = handles.main_isolate();
   i::Factory* factory = isolate->factory();
   i::Zone zone;
 
   i::FeedbackVectorSpec feedback_spec(&zone);
   i::FeedbackVectorSlot slot = feedback_spec.AddLoadICSlot();
-  i::FeedbackVectorSlot call_slot = feedback_spec.AddCallICSlot();
 
   Handle<i::TypeFeedbackVector> vector =
       i::NewTypeFeedbackVector(isolate, &feedback_spec);
   int slot_index = vector->GetIndex(slot);
-  int call_slot_index = -1;
-  if (has_feedback_slot) {
-    call_slot_index = vector->GetIndex(call_slot);
-  }
 
   Handle<i::String> name = factory->NewStringFromAsciiChecked("func");
   name = factory->string_table()->LookupString(isolate, name);
 
   // Check with no args.
   {
     BytecodeArrayBuilder builder(handles.main_isolate(), handles.main_zone(), 1,
                                  0, 1);
     builder.LoadNamedProperty(builder.Parameter(0), name, slot_index)
-        .StoreAccumulatorInRegister(Register(0));
-
-    if (has_feedback_slot) {
-      builder.CallIC(Register(0), builder.Parameter(0), 1, call_slot_index,
-                     tail_call_mode);
-    } else {
-      builder.Call(Register(0), builder.Parameter(0), 1, tail_call_mode);
-    }
-
-    builder.Return();
+        .StoreAccumulatorInRegister(Register(0))
+        .Call(Register(0), builder.Parameter(0), 1, 0, tail_call_mode)
+        .Return();
     Handle<BytecodeArray> bytecode_array = builder.ToBytecodeArray();
 
     InterpreterTester tester(handles.main_isolate(), bytecode_array, vector);
     auto callable = tester.GetCallable<Handle<Object>>();
 
     Handle<Object> object = InterpreterTester::NewObject(
         "new (function Obj() { this.func = function() { return 0x265; }})()");
     Handle<Object> return_val = callable(object).ToHandleChecked();
     CHECK_EQ(Smi::cast(*return_val), Smi::FromInt(0x265));
   }
 
   // Check that receiver is passed properly.
   {
     BytecodeArrayBuilder builder(handles.main_isolate(), handles.main_zone(), 1,
                                  0, 1);
     builder.LoadNamedProperty(builder.Parameter(0), name, slot_index)
-        .StoreAccumulatorInRegister(Register(0));
-    if (has_feedback_slot) {
-      builder.CallIC(Register(0), builder.Parameter(0), 1, call_slot_index,
-                     tail_call_mode);
-    } else {
-      builder.Call(Register(0), builder.Parameter(0), 1, tail_call_mode);
-    }
-    builder.Return();
+        .StoreAccumulatorInRegister(Register(0))
+        .Call(Register(0), builder.Parameter(0), 1, 0, tail_call_mode)
+        .Return();
     Handle<BytecodeArray> bytecode_array = builder.ToBytecodeArray();
 
     InterpreterTester tester(handles.main_isolate(), bytecode_array, vector);
     auto callable = tester.GetCallable<Handle<Object>>();
 
     Handle<Object> object = InterpreterTester::NewObject(
         "new (function Obj() {"
         "  this.val = 1234;"
         "  this.func = function() { return this.val; };"
         "})()");
     Handle<Object> return_val = callable(object).ToHandleChecked();
     CHECK_EQ(Smi::cast(*return_val), Smi::FromInt(1234));
   }
 
   // Check with two parameters (+ receiver).
   {
     BytecodeArrayBuilder builder(handles.main_isolate(), handles.main_zone(), 1,
                                  0, 4);
     builder.LoadNamedProperty(builder.Parameter(0), name, slot_index)
         .StoreAccumulatorInRegister(Register(0))
         .LoadAccumulatorWithRegister(builder.Parameter(0))
         .StoreAccumulatorInRegister(Register(1))
         .LoadLiteral(Smi::FromInt(51))
         .StoreAccumulatorInRegister(Register(2))
         .LoadLiteral(Smi::FromInt(11))
-        .StoreAccumulatorInRegister(Register(3));
-
-    if (has_feedback_slot) {
-      builder.CallIC(Register(0), Register(1), 3, call_slot_index,
-                     tail_call_mode);
-    } else {
-      builder.Call(Register(0), Register(1), 3, tail_call_mode);
-    }
-
-    builder.Return();
-
+        .StoreAccumulatorInRegister(Register(3))
+        .Call(Register(0), Register(1), 3, 0, tail_call_mode)
+        .Return();
     Handle<BytecodeArray> bytecode_array = builder.ToBytecodeArray();
 
     InterpreterTester tester(handles.main_isolate(), bytecode_array, vector);
     auto callable = tester.GetCallable<Handle<Object>>();
 
     Handle<Object> object = InterpreterTester::NewObject(
         "new (function Obj() { "
         "  this.func = function(a, b) { return a - b; }"
         "})()");
     Handle<Object> return_val = callable(object).ToHandleChecked();
@@ skipping 20 matching lines @@
         .StoreAccumulatorInRegister(Register(6))
         .LoadLiteral(factory->NewStringFromAsciiChecked("f"))
         .StoreAccumulatorInRegister(Register(7))
         .LoadLiteral(factory->NewStringFromAsciiChecked("g"))
         .StoreAccumulatorInRegister(Register(8))
         .LoadLiteral(factory->NewStringFromAsciiChecked("h"))
         .StoreAccumulatorInRegister(Register(9))
         .LoadLiteral(factory->NewStringFromAsciiChecked("i"))
         .StoreAccumulatorInRegister(Register(10))
         .LoadLiteral(factory->NewStringFromAsciiChecked("j"))
-        .StoreAccumulatorInRegister(Register(11));
-
-    if (has_feedback_slot) {
-      builder.CallIC(Register(0), Register(1), 11, call_slot_index,
-                     tail_call_mode);
-    } else {
-      builder.Call(Register(0), Register(1), 11, tail_call_mode);
-    }
-
-    builder.Return();
-
+        .StoreAccumulatorInRegister(Register(11))
+        .Call(Register(0), Register(1), 11, 0, tail_call_mode)
+        .Return();
     Handle<BytecodeArray> bytecode_array = builder.ToBytecodeArray();
 
     InterpreterTester tester(handles.main_isolate(), bytecode_array, vector);
     auto callable = tester.GetCallable<Handle<Object>>();
 
     Handle<Object> object = InterpreterTester::NewObject(
         "new (function Obj() { "
         "  this.prefix = \"prefix_\";"
         "  this.func = function(a, b, c, d, e, f, g, h, i, j) {"
         "      return this.prefix + a + b + c + d + e + f + g + h + i + j;"
         "  }"
         "})()");
     Handle<Object> return_val = callable(object).ToHandleChecked();
     Handle<i::String> expected =
         factory->NewStringFromAsciiChecked("prefix_abcdefghij");
     CHECK(i::String::cast(*return_val)->Equals(*expected));
   }
 }
 
-TEST(InterpreterCall) { TestInterpreterCall(TailCallMode::kDisallow, false); }
+TEST(InterpreterCall) { TestInterpreterCall(TailCallMode::kDisallow); }
 
-TEST(InterpreterTailCall) { TestInterpreterCall(TailCallMode::kAllow, false); }
-
-TEST(InterpreterCallIC) { TestInterpreterCall(TailCallMode::kDisallow, true); }
-
-TEST(InterpreterTailCallIC) { TestInterpreterCall(TailCallMode::kAllow, true); }
+TEST(InterpreterTailCall) { TestInterpreterCall(TailCallMode::kAllow); }
 
 static BytecodeArrayBuilder& SetRegister(BytecodeArrayBuilder& builder,
                                          Register reg, int value,
                                          Register scratch) {
   return builder.StoreAccumulatorInRegister(scratch)
       .LoadLiteral(Smi::FromInt(value))
       .StoreAccumulatorInRegister(reg)
       .LoadAccumulatorWithRegister(scratch);
 }
 
@@ skipping 3081 matching lines @@
     Handle<i::Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*const_decl[i].second));
   }
 
   FLAG_legacy_const = old_flag_legacy_const;
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8