Merged: Squashed multiple commits.

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 319 matching lines @@
   V(StringFromCharCode, 2)            \
   V(StringPrototypeCharAt, 2)         \
   V(StringPrototypeCharCodeAt, 2)     \
   V(TypedArrayPrototypeByteLength, 1) \
   V(TypedArrayPrototypeByteOffset, 1) \
   V(TypedArrayPrototypeLength, 1)     \
   V(AtomicsLoad, 3)                   \
   V(AtomicsStore, 4)
 
 // Define list of builtins implemented in TurboFan (with CallStub linkage).
-#define BUILTIN_LIST_S(V)                                              \
-  V(LoadGlobalIC_Miss, BUILTIN, kNoExtraICState, LoadGlobalWithVector) \
-  V(LoadGlobalIC_SlowNotInsideTypeof, HANDLER, Code::LOAD_GLOBAL_IC,   \
-    LoadGlobalWithVector)                                              \
-  V(LoadGlobalIC_SlowInsideTypeof, HANDLER, Code::LOAD_GLOBAL_IC,      \
-    LoadGlobalWithVector)                                              \
-  V(LoadIC_Miss, BUILTIN, kNoExtraICState, LoadWithVector)             \
+#define BUILTIN_LIST_S(V)                                                   \
+  V(LoadGlobalIC_Miss, BUILTIN, kNoExtraICState, LoadGlobalWithVector)      \
+  V(LoadGlobalIC_Slow, HANDLER, Code::LOAD_GLOBAL_IC, LoadGlobalWithVector) \
+  V(LoadIC_Miss, BUILTIN, kNoExtraICState, LoadWithVector)                  \
   V(LoadIC_Slow, HANDLER, Code::LOAD_IC, LoadWithVector)
 
 // Define list of builtin handlers implemented in assembly.
 #define BUILTIN_LIST_H(V)                    \
   V(KeyedLoadIC_Slow,        KEYED_LOAD_IC)  \
   V(StoreIC_Slow,            STORE_IC)       \
   V(KeyedStoreIC_Slow,       KEYED_STORE_IC) \
   V(LoadIC_Normal,           LOAD_IC)        \
   V(StoreIC_Normal,          STORE_IC)
 
@@ skipping 397 matching lines @@
   friend class BuiltinFunctionTable;
   friend class Isolate;
 
   DISALLOW_COPY_AND_ASSIGN(Builtins);
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_BUILTINS_H_