Remove Reloc::Mode CODE_TARGET_CONTEXT

src/stub-cache.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 120 matching lines @@
                                  Code::Kind,
                                  ExtraICState extra_state,
                                  Handle<Name> name,
                                  Handle<JSObject> object,
                                  Handle<GlobalObject> holder,
                                  Handle<PropertyCell> cell,
                                  Handle<JSFunction> function);
 
   // ---
 
-  Handle<Code> ComputeCallInitialize(int argc, RelocInfo::Mode mode);
+  Handle<Code> ComputeCallInitialize(int argc, ContextualMode mode);
 
   Handle<Code> ComputeKeyedCallInitialize(int argc);
 
   Handle<Code> ComputeCallPreMonomorphic(int argc,
                                          Code::Kind kind,
                                          ExtraICState extra_state);
 
   Handle<Code> ComputeCallNormal(int argc,
                                  Code::Kind kind,
                                  ExtraICState state);
 
   Handle<Code> ComputeCallArguments(int argc);
 
   Handle<Code> ComputeCallMegamorphic(int argc,
                                       Code::Kind kind,
                                       ExtraICState state);
 
   Handle<Code> ComputeCallMiss(int argc,
                                Code::Kind kind,
                                ExtraICState state);
 
   // ---
 
+  Handle<Code> ComputeLoad(InlineCacheState ic_state, ExtraICState extra_state);
+  Handle<Code> ComputeStore(InlineCacheState ic_state,
+                            ExtraICState extra_state);
+
+  // ---
+
   Handle<Code> ComputeCompareNil(Handle<Map> receiver_map,
                                  CompareNilICStub& stub);
 
   // ---
 
   Handle<Code> ComputeLoadElementPolymorphic(MapHandleList* receiver_maps);
   Handle<Code> ComputeStoreElementPolymorphic(MapHandleList* receiver_maps,
                                               KeyedAccessStoreMode store_mode,
                                               StrictModeFlag strict_mode);
 
   Handle<Code> ComputePolymorphicIC(TypeHandleList* types,
                                     CodeHandleList* handlers,
                                     int number_of_valid_maps,
                                     Handle<Name> name,
                                     ExtraICState extra_ic_state);
 
   // Finds the Code object stored in the Heap::non_monomorphic_cache().
-  Code* FindCallInitialize(int argc, RelocInfo::Mode mode, Code::Kind kind);
+  Code* FindCallInitialize(int argc, ContextualMode mode, Code::Kind kind);

[Toon Verwaest, 2013/12/04 18:10:52]

We should probably also reset calls to premonomorphic rather than initialize.
But meh, another CL.

[mvstanton, 2013/12/04 22:08:10]

Good point, I was wondering about that. But you are going to remove CallIC, and
you are best positioned to do the right thing.

+  Code* FindPreMonomorphicIC(Code::Kind kind, ExtraICState extra_ic_state);
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
   Handle<Code> ComputeCallDebugBreak(int argc, Code::Kind kind);
 
   Handle<Code> ComputeCallDebugPrepareStepIn(int argc, Code::Kind kind);
 #endif
 
   // Update cache for entry hash(name, map).
   Code* Set(Name* name, Map* map, Code* code);
 
@@ skipping 63 matching lines @@
   static const int kInterceptorArgsNameIndex = 0;
   static const int kInterceptorArgsInfoIndex = 1;
   static const int kInterceptorArgsThisIndex = 2;
   static const int kInterceptorArgsHolderIndex = 3;
   static const int kInterceptorArgsLength = 4;
 
  private:
   explicit StubCache(Isolate* isolate);
 
   Handle<Code> ComputeCallInitialize(int argc,
-                                     RelocInfo::Mode mode,
+                                     ContextualMode mode,
                                      Code::Kind kind);
 
   // The stub cache has a primary and secondary level.  The two levels have
   // different hashing algorithms in order to avoid simultaneous collisions
   // in both caches.  Unlike a probing strategy (quadratic or otherwise) the
   // update strategy on updates is fairly clear and simple:  Any existing entry
   // in the primary cache is moved to the secondary cache, and secondary cache
   // entries are overwritten.
 
   // Hash algorithm for the primary table.  This algorithm is replicated in
@@ skipping 94 matching lines @@
 
   // Functions to compile either CallIC or KeyedCallIC.  The specific kind
   // is extracted from the code flags.
   Handle<Code> CompileCallInitialize(Code::Flags flags);
   Handle<Code> CompileCallPreMonomorphic(Code::Flags flags);
   Handle<Code> CompileCallNormal(Code::Flags flags);
   Handle<Code> CompileCallMegamorphic(Code::Flags flags);
   Handle<Code> CompileCallArguments(Code::Flags flags);
   Handle<Code> CompileCallMiss(Code::Flags flags);
 
+  Handle<Code> CompileLoadInitialize(Code::Flags flags);
+  Handle<Code> CompileLoadPreMonomorphic(Code::Flags flags);
+  Handle<Code> CompileLoadMegamorphic(Code::Flags flags);
+
+  Handle<Code> CompileStoreInitialize(Code::Flags flags);
+  Handle<Code> CompileStorePreMonomorphic(Code::Flags flags);
+  Handle<Code> CompileStoreGeneric(Code::Flags flags);
+  Handle<Code> CompileStoreMegamorphic(Code::Flags flags);
+
 #ifdef ENABLE_DEBUGGER_SUPPORT
   Handle<Code> CompileCallDebugBreak(Code::Flags flags);
   Handle<Code> CompileCallDebugPrepareStepIn(Code::Flags flags);
 #endif
 
   // Static functions for generating parts of stubs.
   static void GenerateLoadGlobalFunctionPrototype(MacroAssembler* masm,
                                                   int index,
                                                   Register prototype);
 
@@ skipping 105 matching lines @@
   MacroAssembler* masm() { return &masm_; }
   void set_failure(Failure* failure) { failure_ = failure; }
 
   static void LookupPostInterceptor(Handle<JSObject> holder,
                                     Handle<Name> name,
                                     LookupResult* lookup);
 
   Isolate* isolate() { return isolate_; }
   Heap* heap() { return isolate()->heap(); }
   Factory* factory() { return isolate()->factory(); }
+  ContextualMode contextual_mode() {
+    return IC::GetContextualMode(extra_state());
+  }
 
   static void GenerateTailCall(MacroAssembler* masm, Handle<Code> code);
 
  private:
   Isolate* isolate_;
   const ExtraICState extra_ic_state_;
   MacroAssembler masm_;
   Failure* failure_;
 };
 
@@ skipping 542 matching lines @@
   Handle<JSFunction> constant_function_;
   bool is_simple_api_call_;
   Handle<FunctionTemplateInfo> expected_receiver_type_;
   Handle<CallHandlerInfo> api_call_info_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_STUB_CACHE_H_