Merged: Squashed multiple commits.

src/builtins.h

Index: src/builtins.h
diff --git a/src/builtins.h b/src/builtins.h
index d838b713c094cfd770a04933b7d3db82b194c94a..cbce37525c0ad6b70e62d81d2a95b81d41104d7e 100644
--- a/src/builtins.h
+++ b/src/builtins.h
@@ -337,13 +337,10 @@ class CodeStubAssembler;
   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.