Merged: Squashed multiple commits.

src/ic/ic.h

 // Copyright 2012 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_IC_H_
 #define V8_IC_H_
 
 #include "src/ic/ic-state.h"
 #include "src/macro-assembler.h"
 #include "src/messages.h"
@@ skipping 310 matching lines @@
 
   static Handle<Code> initialize_stub_in_optimized_code(
       Isolate* isolate, ExtraICState extra_state);
 
   MUST_USE_RESULT MaybeHandle<Object> Load(Handle<Name> name);
 
   static void Clear(Isolate* isolate, Code* host, LoadGlobalICNexus* nexus);
 
  protected:
   Handle<Code> slow_stub() const override {
-    if (LoadGlobalICState::GetTypeofMode(extra_ic_state()) ==
-        NOT_INSIDE_TYPEOF) {
-      return isolate()->builtins()->LoadGlobalIC_SlowNotInsideTypeof();
-    } else {
-      return isolate()->builtins()->LoadGlobalIC_SlowInsideTypeof();
-    }
+    return isolate()->builtins()->LoadGlobalIC_Slow();
   }
 };
 
 class KeyedLoadIC : public LoadIC {
  public:
   KeyedLoadIC(FrameDepth depth, Isolate* isolate,
               KeyedLoadICNexus* nexus = NULL)
       : LoadIC(depth, isolate, nexus) {
     DCHECK(nexus != NULL);
   }
@@ skipping 167 matching lines @@
 
 // Helper for BinaryOpIC and CompareIC.
 enum InlinedSmiCheck { ENABLE_INLINED_SMI_CHECK, DISABLE_INLINED_SMI_CHECK };
 void PatchInlinedSmiCode(Isolate* isolate, Address address,
                          InlinedSmiCheck check);
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_IC_H_