Commit e35ec4a7 authored by Toon Verwaest's avatar Toon Verwaest Committed by Commit Bot

[ic] General cleanup after moving more ICs to data handlers

BUG=v8:5561

Change-Id: Ibc64f2a42089b40a605313a5f24b1da85722fde8
Reviewed-on: https://chromium-review.googlesource.com/457370
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Reviewed-by: 's avatarIgor Sheludko <ishell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#44005}
parent c8e4c8b9
...@@ -762,7 +762,6 @@ class RuntimeCallTimer final { ...@@ -762,7 +762,6 @@ class RuntimeCallTimer final {
V(UnexpectedStubMiss) V(UnexpectedStubMiss)
#define FOR_EACH_HANDLER_COUNTER(V) \ #define FOR_EACH_HANDLER_COUNTER(V) \
V(IC_HandlerCacheHit) \
V(KeyedLoadIC_LoadIndexedStringStub) \ V(KeyedLoadIC_LoadIndexedStringStub) \
V(KeyedLoadIC_LoadIndexedInterceptorStub) \ V(KeyedLoadIC_LoadIndexedInterceptorStub) \
V(KeyedLoadIC_KeyedLoadSloppyArgumentsStub) \ V(KeyedLoadIC_KeyedLoadSloppyArgumentsStub) \
...@@ -774,32 +773,20 @@ class RuntimeCallTimer final { ...@@ -774,32 +773,20 @@ class RuntimeCallTimer final {
V(KeyedStoreIC_StoreFastElementStub) \ V(KeyedStoreIC_StoreFastElementStub) \
V(KeyedStoreIC_StoreElementStub) \ V(KeyedStoreIC_StoreElementStub) \
V(LoadIC_FunctionPrototypeStub) \ V(LoadIC_FunctionPrototypeStub) \
V(LoadIC_HandlerCacheHit_AccessCheck) \
V(LoadIC_HandlerCacheHit_Exotic) \
V(LoadIC_HandlerCacheHit_Interceptor) \
V(LoadIC_HandlerCacheHit_JSProxy) \
V(LoadIC_HandlerCacheHit_NonExistent) \
V(LoadIC_HandlerCacheHit_Accessor) \ V(LoadIC_HandlerCacheHit_Accessor) \
V(LoadIC_HandlerCacheHit_Data) \
V(LoadIC_HandlerCacheHit_Transition) \
V(LoadIC_LoadApiGetterDH) \ V(LoadIC_LoadApiGetterDH) \
V(LoadIC_LoadApiGetterFromPrototypeDH) \ V(LoadIC_LoadApiGetterFromPrototypeDH) \
V(LoadIC_LoadApiGetterStub) \
V(LoadIC_LoadCallback) \ V(LoadIC_LoadCallback) \
V(LoadIC_LoadConstantDH) \ V(LoadIC_LoadConstantDH) \
V(LoadIC_LoadConstantFromPrototypeDH) \ V(LoadIC_LoadConstantFromPrototypeDH) \
V(LoadIC_LoadConstant) \
V(LoadIC_LoadConstantStub) \
V(LoadIC_LoadFieldDH) \ V(LoadIC_LoadFieldDH) \
V(LoadIC_LoadFieldFromPrototypeDH) \ V(LoadIC_LoadFieldFromPrototypeDH) \
V(LoadIC_LoadField) \
V(LoadIC_LoadGlobalFromPrototypeDH) \ V(LoadIC_LoadGlobalFromPrototypeDH) \
V(LoadIC_LoadIntegerIndexedExoticDH) \ V(LoadIC_LoadIntegerIndexedExoticDH) \
V(LoadIC_LoadInterceptorDH) \ V(LoadIC_LoadInterceptorDH) \
V(LoadIC_LoadNonMaskingInterceptorDH) \ V(LoadIC_LoadNonMaskingInterceptorDH) \
V(LoadIC_LoadInterceptorFromPrototypeDH) \ V(LoadIC_LoadInterceptorFromPrototypeDH) \
V(LoadIC_LoadNonexistentDH) \ V(LoadIC_LoadNonexistentDH) \
V(LoadIC_LoadNonexistent) \
V(LoadIC_LoadNormalDH) \ V(LoadIC_LoadNormalDH) \
V(LoadIC_LoadNormalFromPrototypeDH) \ V(LoadIC_LoadNormalFromPrototypeDH) \
V(LoadIC_LoadScriptContextFieldStub) \ V(LoadIC_LoadScriptContextFieldStub) \
...@@ -808,27 +795,17 @@ class RuntimeCallTimer final { ...@@ -808,27 +795,17 @@ class RuntimeCallTimer final {
V(LoadIC_Premonomorphic) \ V(LoadIC_Premonomorphic) \
V(LoadIC_SlowStub) \ V(LoadIC_SlowStub) \
V(LoadIC_StringLengthStub) \ V(LoadIC_StringLengthStub) \
V(StoreIC_HandlerCacheHit_AccessCheck) \
V(StoreIC_HandlerCacheHit_Exotic) \
V(StoreIC_HandlerCacheHit_Interceptor) \
V(StoreIC_HandlerCacheHit_JSProxy) \
V(StoreIC_HandlerCacheHit_NonExistent) \
V(StoreIC_HandlerCacheHit_Accessor) \ V(StoreIC_HandlerCacheHit_Accessor) \
V(StoreIC_HandlerCacheHit_Data) \
V(StoreIC_HandlerCacheHit_Transition) \
V(StoreIC_NonReceiver) \ V(StoreIC_NonReceiver) \
V(StoreIC_Premonomorphic) \ V(StoreIC_Premonomorphic) \
V(StoreIC_SlowStub) \ V(StoreIC_SlowStub) \
V(StoreIC_StoreCallback) \ V(StoreIC_StoreCallback) \
V(StoreIC_StoreField) \
V(StoreIC_StoreFieldDH) \ V(StoreIC_StoreFieldDH) \
V(StoreIC_StoreFieldStub) \
V(StoreIC_StoreGlobalDH) \ V(StoreIC_StoreGlobalDH) \
V(StoreIC_StoreGlobalTransitionDH) \ V(StoreIC_StoreGlobalTransitionDH) \
V(StoreIC_StoreInterceptorStub) \ V(StoreIC_StoreInterceptorStub) \
V(StoreIC_StoreNormalDH) \ V(StoreIC_StoreNormalDH) \
V(StoreIC_StoreScriptContextFieldStub) \ V(StoreIC_StoreScriptContextFieldStub) \
V(StoreIC_StoreTransition) \
V(StoreIC_StoreTransitionDH) \ V(StoreIC_StoreTransitionDH) \
V(StoreIC_StoreViaSetter) V(StoreIC_StoreViaSetter)
......
This diff is collapsed.
...@@ -117,16 +117,14 @@ class IC { ...@@ -117,16 +117,14 @@ class IC {
void TraceHandlerCacheHitStats(LookupIterator* lookup); void TraceHandlerCacheHitStats(LookupIterator* lookup);
// Compute the handler either by compiling or by retrieving a cached version. // Compute the handler either by compiling or by retrieving a cached version.
Handle<Object> ComputeHandler(LookupIterator* lookup, Handle<Object> ComputeHandler(LookupIterator* lookup);
Handle<Object> value = Handle<Code>::null());
virtual Handle<Object> GetMapIndependentHandler(LookupIterator* lookup) { virtual Handle<Object> GetMapIndependentHandler(LookupIterator* lookup) {
UNREACHABLE(); UNREACHABLE();
return Handle<Code>::null(); return Handle<Code>::null();
} }
virtual Handle<Object> CompileHandler(LookupIterator* lookup, virtual Handle<Code> CompileHandler(LookupIterator* lookup) {
Handle<Object> value) {
UNREACHABLE(); UNREACHABLE();
return Handle<Object>::null(); return Handle<Code>::null();
} }
void UpdateMonomorphicIC(Handle<Object> handler, Handle<Name> name); void UpdateMonomorphicIC(Handle<Object> handler, Handle<Name> name);
...@@ -273,8 +271,7 @@ class LoadIC : public IC { ...@@ -273,8 +271,7 @@ class LoadIC : public IC {
Handle<Object> GetMapIndependentHandler(LookupIterator* lookup) override; Handle<Object> GetMapIndependentHandler(LookupIterator* lookup) override;
Handle<Object> CompileHandler(LookupIterator* lookup, Handle<Code> CompileHandler(LookupIterator* lookup) override;
Handle<Object> unused) override;
private: private:
// Creates a data handler that represents a load of a field by given index. // Creates a data handler that represents a load of a field by given index.
...@@ -360,8 +357,7 @@ class StoreIC : public IC { ...@@ -360,8 +357,7 @@ class StoreIC : public IC {
void UpdateCaches(LookupIterator* lookup, Handle<Object> value, void UpdateCaches(LookupIterator* lookup, Handle<Object> value,
JSReceiver::StoreFromKeyed store_mode); JSReceiver::StoreFromKeyed store_mode);
Handle<Object> GetMapIndependentHandler(LookupIterator* lookup) override; Handle<Object> GetMapIndependentHandler(LookupIterator* lookup) override;
Handle<Object> CompileHandler(LookupIterator* lookup, Handle<Code> CompileHandler(LookupIterator* lookup) override;
Handle<Object> value) override;
private: private:
Handle<Object> StoreTransition(Handle<Map> receiver_map, Handle<Object> StoreTransition(Handle<Map> receiver_map,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment