[Interpreter] Collect type feedback for calls in the bytecode handler

src/builtins.h

 
 // Copyright 2011 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.
 
 #ifndef V8_BUILTINS_H_
 #define V8_BUILTINS_H_
 
 #include "src/base/flags.h"
 #include "src/handles.h"
@@ skipping 221 matching lines @@
   V(CompileOptimized, BUILTIN, kNoExtraICState)                              \
   V(CompileOptimizedConcurrent, BUILTIN, kNoExtraICState)                    \
   V(NotifyDeoptimized, BUILTIN, kNoExtraICState)                             \
   V(NotifySoftDeoptimized, BUILTIN, kNoExtraICState)                         \
   V(NotifyLazyDeoptimized, BUILTIN, kNoExtraICState)                         \
   V(NotifyStubFailure, BUILTIN, kNoExtraICState)                             \
   V(NotifyStubFailureSaveDoubles, BUILTIN, kNoExtraICState)                  \
                                                                              \
   V(InterpreterEntryTrampoline, BUILTIN, kNoExtraICState)                    \
   V(InterpreterMarkBaselineOnReturn, BUILTIN, kNoExtraICState)               \
+  V(InterpreterPushArgsAndCallFunction, BUILTIN, kNoExtraICState)            \
+  V(InterpreterPushArgsAndTailCallFunction, BUILTIN, kNoExtraICState)        \
   V(InterpreterPushArgsAndCall, BUILTIN, kNoExtraICState)                    \
   V(InterpreterPushArgsAndTailCall, BUILTIN, kNoExtraICState)                \
   V(InterpreterPushArgsAndConstruct, BUILTIN, kNoExtraICState)               \
   V(InterpreterEnterBytecodeDispatch, BUILTIN, kNoExtraICState)              \
                                                                              \
   V(KeyedLoadIC_Miss, BUILTIN, kNoExtraICState)                              \
   V(StoreIC_Miss, BUILTIN, kNoExtraICState)                                  \
   V(KeyedStoreIC_Miss, BUILTIN, kNoExtraICState)                             \
   V(LoadIC_Getter_ForDeopt, LOAD_IC, kNoExtraICState)                        \
   V(KeyedLoadIC_Megamorphic, KEYED_LOAD_IC, kNoExtraICState)                 \
@@ skipping 191 matching lines @@
 #undef DECLARE_BUILTIN_ACCESSOR_S
 #undef DECLARE_BUILTIN_ACCESSOR_H
 
   // Convenience wrappers.
   Handle<Code> CallFunction(
       ConvertReceiverMode = ConvertReceiverMode::kAny,
       TailCallMode tail_call_mode = TailCallMode::kDisallow);
   Handle<Code> Call(ConvertReceiverMode = ConvertReceiverMode::kAny,
                     TailCallMode tail_call_mode = TailCallMode::kDisallow);
   Handle<Code> CallBoundFunction(TailCallMode tail_call_mode);
-  Handle<Code> InterpreterPushArgsAndCall(TailCallMode tail_call_mode);
+  Handle<Code> InterpreterPushArgsAndCall(TailCallMode tail_call_mode,
+                                          bool is_js_function = false);

[rmcilroy, 2016/07/08 09:57:59]

nit - could you make this bool an enum instead.

[Benedikt Meurer, 2016/07/09 18:19:22]

Yes, please.

[mythria, 2016/07/11 15:25:24]

Thanks, Done.

 
   Code* builtin(Name name) {
     // Code::cast cannot be used here since we access builtins
     // during the marking phase of mark sweep. See IC::Clear.
     return reinterpret_cast<Code*>(builtins_[name]);
   }
 
   Address builtin_address(Name name) {
     return reinterpret_cast<Address>(&builtins_[name]);
   }
@@ skipping 319 matching lines @@
   static void Generate_TypedArrayPrototypeLength(CodeStubAssembler* assembler);
 
   static void Generate_OnStackReplacement(MacroAssembler* masm);
   static void Generate_InterruptCheck(MacroAssembler* masm);
   static void Generate_StackCheck(MacroAssembler* masm);
 
   static void Generate_InterpreterEntryTrampoline(MacroAssembler* masm);
   static void Generate_InterpreterEnterBytecodeDispatch(MacroAssembler* masm);
   static void Generate_InterpreterMarkBaselineOnReturn(MacroAssembler* masm);
   static void Generate_InterpreterPushArgsAndCall(MacroAssembler* masm) {
-    return Generate_InterpreterPushArgsAndCallImpl(masm,
-                                                   TailCallMode::kDisallow);
+    return Generate_InterpreterPushArgsAndCallImpl(
+        masm, TailCallMode::kDisallow, false);
   }
   static void Generate_InterpreterPushArgsAndTailCall(MacroAssembler* masm) {
-    return Generate_InterpreterPushArgsAndCallImpl(masm, TailCallMode::kAllow);
+    return Generate_InterpreterPushArgsAndCallImpl(masm, TailCallMode::kAllow,
+                                                   false);
+  }
+  static void Generate_InterpreterPushArgsAndCallFunction(
+      MacroAssembler* masm) {
+    return Generate_InterpreterPushArgsAndCallImpl(
+        masm, TailCallMode::kDisallow, true);
+  }
+  static void Generate_InterpreterPushArgsAndTailCallFunction(
+      MacroAssembler* masm) {
+    return Generate_InterpreterPushArgsAndCallImpl(masm, TailCallMode::kAllow,
+                                                   true);
   }
   static void Generate_InterpreterPushArgsAndCallImpl(
-      MacroAssembler* masm, TailCallMode tail_call_mode);
+      MacroAssembler* masm, TailCallMode tail_call_mode, bool is_js_function);
   static void Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm);
 
 #define DECLARE_CODE_AGE_BUILTIN_GENERATOR(C)                \
   static void Generate_Make##C##CodeYoungAgainEvenMarking(   \
       MacroAssembler* masm);                                 \
   static void Generate_Make##C##CodeYoungAgainOddMarking(    \
       MacroAssembler* masm);
   CODE_AGE_LIST(DECLARE_CODE_AGE_BUILTIN_GENERATOR)
 #undef DECLARE_CODE_AGE_BUILTIN_GENERATOR
 
@@ skipping 11 matching lines @@
   friend class BuiltinFunctionTable;
   friend class Isolate;
 
   DISALLOW_COPY_AND_ASSIGN(Builtins);
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_BUILTINS_H_