Get rid of ContextualMode for call ICs.

src/ic.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 106 matching lines @@
     state_ = MONOMORPHIC_PROTOTYPE_FAILURE;
   }
 
   // Clear the inline cache to initial state.
   static void Clear(Isolate* isolate, Address address);
 
   // Returns if this IC is for contextual (no explicit receiver)
   // access to properties.
   bool IsUndeclaredGlobal(Handle<Object> receiver) {
     if (receiver->IsGlobalObject()) {
-      return IsContextual();
+      return IsCallStub() || IsContextual();
     } else {
       ASSERT(!IsContextual());
       return false;
     }
   }
 
 #ifdef DEBUG
   bool IsLoadStub() {
     return target()->is_load_stub() || target()->is_keyed_load_stub();
   }
 
   bool IsStoreStub() {
     return target()->is_store_stub() || target()->is_keyed_store_stub();
   }
 
+#endif
   bool IsCallStub() {
     return target()->is_call_stub() || target()->is_keyed_call_stub();
   }
-#endif
 
   // Determines which map must be used for keeping the code stub.
   // These methods should not be called with undefined or null.
   static inline InlineCacheHolderFlag GetCodeCacheForObject(Object* object);
   // TODO(verwaest): This currently returns a HeapObject rather than JSObject*
   // since loading the IC for loading the length from strings are stored on
   // the string map directly, rather than on the JSObject-typed prototype.
   static inline HeapObject* GetCodeCacheHolder(Isolate* isolate,
                                                Object* object,
                                                InlineCacheHolderFlag holder);
@@ skipping 159 matching lines @@
 
 enum StringStubFeedback {
   DEFAULT_STRING_STUB = 0,
   STRING_INDEX_OUT_OF_BOUNDS = 1
 };
 
 
 class CallICBase: public IC {
  public:
   // ExtraICState bits
-  class StringStubState: public BitField<StringStubFeedback, 1, 1> {};
-  static ExtraICState ComputeExtraICState(ContextualMode mode,
-                                          StringStubFeedback feedback) {
-    return Contextual::encode(mode) | StringStubState::encode(feedback);
+  class StringStubState: public BitField<StringStubFeedback, 0, 1> {};
+  static ExtraICState ComputeExtraICState(StringStubFeedback feedback) {
+    return StringStubState::encode(feedback);
   }
 
   // Returns a JSFunction or a Failure.
   MUST_USE_RESULT MaybeObject* LoadFunction(Handle<Object> object,
                                             Handle<String> name);
 
  protected:
   CallICBase(Code::Kind kind, Isolate* isolate)
       : IC(EXTRA_CALL_FRAME, isolate), kind_(kind) {}
 
@@ skipping 685 matching lines @@
 DECLARE_RUNTIME_FUNCTION(MaybeObject*, ElementsTransitionAndStoreIC_Miss);
 DECLARE_RUNTIME_FUNCTION(MaybeObject*, BinaryOpIC_Miss);
 DECLARE_RUNTIME_FUNCTION(MaybeObject*, BinaryOpIC_MissWithAllocationSite);
 DECLARE_RUNTIME_FUNCTION(MaybeObject*, CompareNilIC_Miss);
 DECLARE_RUNTIME_FUNCTION(MaybeObject*, ToBooleanIC_Miss);
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_IC_H_