AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Revert "Handle non-JSObject heap objects using slow-path IC stub guarded by the map."

Browse Source 
TBR=mstarzinger@chromium.org

Review URL: https://chromiumcodereview.appspot.com/23475039

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16692 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
verwaest@chromium.org 2013-09-12 16:57:37 +00:00
parent cb10ceb19d
commit ff412d8c37
8 changed files with 101 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/builtins.h
View File

@ -120,7 +120,7 @@ enum BuiltinExtraArguments {
Code::kNoExtraICState) \
V(KeyedLoadIC_MissForceGeneric, BUILTIN, UNINITIALIZED, \
Code::kNoExtraICState) \
V(KeyedLoadIC_Slow, STUB, MONOMORPHIC, \
V(KeyedLoadIC_Slow, BUILTIN, UNINITIALIZED, \
Code::kNoExtraICState) \
V(StoreIC_Miss, BUILTIN, UNINITIALIZED, \
Code::kNoExtraICState) \
@ -142,7 +142,7 @@ enum BuiltinExtraArguments {
Code::kNoExtraICState) \
V(LoadIC_Getter_ForDeopt, LOAD_IC, MONOMORPHIC, \
Code::kNoExtraICState) \
V(LoadIC_Slow, STUB, MONOMORPHIC, \
V(LoadIC_Slow, LOAD_IC, GENERIC, \
Code::kNoExtraICState) \
\
V(KeyedLoadIC_Initialize, KEYED_LOAD_IC, UNINITIALIZED, \

10
src/hydrogen.cc
View File

@ -4005,9 +4005,7 @@ void HOptimizedGraphBuilder::VisitRegExpLiteral(RegExpLiteral* expr) {
static bool CanInlinePropertyAccess(Map* type) {
return type->IsJSObjectMap() &&
!type->is_dictionary_map() &&
!type->has_named_interceptor();
return !type->is_dictionary_map() && !type->has_named_interceptor();
}
@ -5394,12 +5392,6 @@ HInstruction* HOptimizedGraphBuilder::BuildLoadNamedMonomorphic(
return New<HConstant>(constant);
}
if (lookup.IsFound()) {
// Cannot handle the property, do a generic load instead.
HValue* context = environment()->context();
return new(zone()) HLoadNamedGeneric(context, object, name);
}
// Handle a load from a known field somewhere in the prototype chain.
LookupInPrototypes(map, name, &lookup);
if (lookup.IsField()) {

48
src/ic.cc
View File

@ -996,7 +996,7 @@ static bool AddOneReceiverMapIfMissing(MapHandleList* receiver_maps,
bool IC::UpdatePolymorphicIC(State state,
Handle<HeapObject> receiver,
Handle<JSObject> receiver,
Handle<String> name,
Handle<Code> code,
StrictModeFlag strict_mode) {
@ -1077,44 +1077,44 @@ Handle<Code> StoreIC::ComputePolymorphicIC(MapHandleList* receiver_maps,
}
void LoadIC::UpdateMonomorphicIC(Handle<HeapObject> receiver,
void LoadIC::UpdateMonomorphicIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<String> name,
StrictModeFlag strict_mode) {
if (handler->is_load_stub()) return set_target(*handler);
if (handler->type() == Code::NORMAL) return set_target(*handler);
Handle<Code> ic = isolate()->stub_cache()->ComputeMonomorphicLoadIC(
receiver, handler, name);
set_target(*ic);
}
void KeyedLoadIC::UpdateMonomorphicIC(Handle<HeapObject> receiver,
void KeyedLoadIC::UpdateMonomorphicIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<String> name,
StrictModeFlag strict_mode) {
if (handler->is_keyed_load_stub()) return set_target(*handler);
if (handler->type() == Code::NORMAL) return set_target(*handler);
Handle<Code> ic = isolate()->stub_cache()->ComputeMonomorphicKeyedLoadIC(
receiver, handler, name);
set_target(*ic);
}
void StoreIC::UpdateMonomorphicIC(Handle<HeapObject> receiver,
void StoreIC::UpdateMonomorphicIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<String> name,
StrictModeFlag strict_mode) {
if (handler->is_store_stub()) return set_target(*handler);
if (handler->type() == Code::NORMAL) return set_target(*handler);
Handle<Code> ic = isolate()->stub_cache()->ComputeMonomorphicStoreIC(
receiver, handler, name, strict_mode);
set_target(*ic);
}
void KeyedStoreIC::UpdateMonomorphicIC(Handle<HeapObject> receiver,
void KeyedStoreIC::UpdateMonomorphicIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<String> name,
StrictModeFlag strict_mode) {
if (handler->is_keyed_store_stub()) return set_target(*handler);
if (handler->type() == Code::NORMAL) return set_target(*handler);
Handle<Code> ic = isolate()->stub_cache()->ComputeMonomorphicKeyedStoreIC(
receiver, handler, name, strict_mode);
set_target(*ic);
@ -1155,7 +1155,7 @@ bool IC::IsTransitionedMapOfMonomorphicTarget(Map* receiver_map) {
// not necessarily equal to target()->state().
void IC::PatchCache(State state,
StrictModeFlag strict_mode,
Handle<HeapObject> receiver,
Handle<JSObject> receiver,
Handle<String> name,
Handle<Code> code) {
switch (state) {
@ -1265,26 +1265,32 @@ void LoadIC::UpdateCaches(LookupResult* lookup,
State state,
Handle<Object> object,
Handle<String> name) {
if (!object->IsHeapObject()) return;
// Bail out if the result is not cacheable.
if (!lookup->IsCacheable()) {
set_target(*generic_stub());
return;
}
Handle<HeapObject> receiver = Handle<HeapObject>::cast(object);
// TODO(jkummerow): It would be nice to support non-JSObjects in
// UpdateCaches, then we wouldn't need to go generic here.
if (!object->IsJSObject()) {
set_target(*generic_stub());
return;
}
Handle<JSObject> receiver = Handle<JSObject>::cast(object);
Handle<Code> code;
if (state == UNINITIALIZED) {
// This is the first time we execute this inline cache.
// Set the target to the pre monomorphic stub to delay
// setting the monomorphic state.
code = pre_monomorphic_stub();
} else if (!lookup->IsCacheable()) {
// Bail out if the result is not cacheable.
code = slow_stub();
} else if (!object->IsJSObject()) {
// TODO(jkummerow): It would be nice to support non-JSObjects in
// ComputeLoadHandler, then we wouldn't need to go generic here.
code = slow_stub();
} else {
code = ComputeLoadHandler(lookup, Handle<JSObject>::cast(receiver), name);
if (code.is_null()) code = slow_stub();
code = ComputeLoadHandler(lookup, receiver, name);
if (code.is_null()) {
set_target(*generic_stub());
return;
}
}
PatchCache(state, kNonStrictMode, receiver, name, code);

19
src/ic.h
View File

@ -167,14 +167,14 @@ class IC {
static inline void SetTargetAtAddress(Address address, Code* target);
static void PostPatching(Address address, Code* target, Code* old_target);
virtual void UpdateMonomorphicIC(Handle<HeapObject> receiver,
virtual void UpdateMonomorphicIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<String> name,
StrictModeFlag strict_mode) {
set_target(*handler);
}
bool UpdatePolymorphicIC(State state,
Handle<HeapObject> receiver,
Handle<JSObject> receiver,
Handle<String> name,
Handle<Code> code,
StrictModeFlag strict_mode);
@ -192,7 +192,7 @@ class IC {
bool IsTransitionedMapOfMonomorphicTarget(Map* receiver_map);
void PatchCache(State state,
StrictModeFlag strict_mode,
Handle<HeapObject> receiver,
Handle<JSObject> receiver,
Handle<String> name,
Handle<Code> code);
virtual void UpdateMegamorphicCache(Map* map, Name* name, Code* code);
@ -388,7 +388,7 @@ class LoadIC: public IC {
protected:
virtual Code::Kind kind() const { return Code::LOAD_IC; }
virtual Handle<Code> slow_stub() const {
virtual Handle<Code> generic_stub() const {
return isolate()->builtins()->LoadIC_Slow();
}
@ -403,7 +403,7 @@ class LoadIC: public IC {
Handle<Object> object,
Handle<String> name);
virtual void UpdateMonomorphicIC(Handle<HeapObject> receiver,
virtual void UpdateMonomorphicIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<String> name,
StrictModeFlag strict_mode);
@ -483,12 +483,9 @@ class KeyedLoadIC: public LoadIC {
virtual Handle<Code> generic_stub() const {
return isolate()->builtins()->KeyedLoadIC_Generic();
}
virtual Handle<Code> slow_stub() const {
return isolate()->builtins()->KeyedLoadIC_Slow();
}
// Update the inline cache.
virtual void UpdateMonomorphicIC(Handle<HeapObject> receiver,
virtual void UpdateMonomorphicIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<String> name,
StrictModeFlag strict_mode);
@ -577,7 +574,7 @@ class StoreIC: public IC {
return isolate()->builtins()->StoreIC_GlobalProxy_Strict();
}
virtual void UpdateMonomorphicIC(Handle<HeapObject> receiver,
virtual void UpdateMonomorphicIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<String> name,
StrictModeFlag strict_mode);
@ -692,7 +689,7 @@ class KeyedStoreIC: public StoreIC {
KeyedAccessStoreMode store_mode,
StrictModeFlag strict_mode);
virtual void UpdateMonomorphicIC(Handle<HeapObject> receiver,
virtual void UpdateMonomorphicIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<String> name,
StrictModeFlag strict_mode);

13
src/objects.cc
View File

@ -4479,19 +4479,18 @@ void NormalizedMapCache::Clear() {
}
void HeapObject::UpdateMapCodeCache(Handle<HeapObject> object,
Handle<Name> name,
Handle<Code> code) {
void JSObject::UpdateMapCodeCache(Handle<JSObject> object,
Handle<Name> name,
Handle<Code> code) {
Handle<Map> map(object->map());
if (map->is_shared()) {
Handle<JSObject> receiver = Handle<JSObject>::cast(object);
// Fast case maps are never marked as shared.
ASSERT(!receiver->HasFastProperties());
ASSERT(!object->HasFastProperties());
// Replace the map with an identical copy that can be safely modified.
map = Map::CopyNormalized(map, KEEP_INOBJECT_PROPERTIES,
UNIQUE_NORMALIZED_MAP);
receiver->GetIsolate()->counters()->normalized_maps()->Increment();
receiver->set_map(*map);
object->GetIsolate()->counters()->normalized_maps()->Increment();
object->set_map(*map);
}
Map::UpdateCodeCache(map, name, code);
}

15
src/objects.h
View File

@ -1756,13 +1756,6 @@ class HeapObject: public Object {
// during marking GC.
static inline Object** RawField(HeapObject* obj, int offset);
// Adds the |code| object related to |name| to the code cache of this map. If
// this map is a dictionary map that is shared, the map copied and installed
// onto the object.
static void UpdateMapCodeCache(Handle<HeapObject> object,
Handle<Name> name,
Handle<Code> code);
// Casting.
static inline HeapObject* cast(Object* obj);
@ -2574,6 +2567,10 @@ class JSObject: public JSReceiver {
MUST_USE_RESULT MaybeObject* NormalizeElements();
static void UpdateMapCodeCache(Handle<JSObject> object,
Handle<Name> name,
Handle<Code> code);
// Transform slow named properties to fast variants.
// Returns failure if allocation failed.
static void TransformToFastProperties(Handle<JSObject> object,
@ -5924,10 +5921,6 @@ class Map: public HeapObject {
return instance_type() >= FIRST_JS_OBJECT_TYPE;
}
bool IsJSObjectMap() {
return instance_type() >= FIRST_JS_OBJECT_TYPE;
}
// Fires when the layout of an object with a leaf map changes.
// This includes adding transitions to the leaf map or changing
// the descriptor array.

98
src/stub-cache.cc
View File

@ -166,68 +166,68 @@ Handle<Code> StubCache::FindStoreHandler(Handle<Name> name,
}
Handle<Code> StubCache::ComputeMonomorphicLoadIC(Handle<HeapObject> receiver,
Handle<Code> StubCache::ComputeMonomorphicLoadIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<Name> name) {
Handle<Map> map(receiver->map());
Handle<Code> ic = FindIC(name, map, Code::LOAD_IC, handler->type());
Handle<Code> ic = FindIC(name, receiver, Code::LOAD_IC, handler->type());
if (!ic.is_null()) return ic;
LoadStubCompiler ic_compiler(isolate());
ic = ic_compiler.CompileMonomorphicIC(map, handler, name);
ic = ic_compiler.CompileMonomorphicIC(
Handle<Map>(receiver->map()), handler, name);
HeapObject::UpdateMapCodeCache(receiver, name, ic);
JSObject::UpdateMapCodeCache(receiver, name, ic);
return ic;
}
Handle<Code> StubCache::ComputeMonomorphicKeyedLoadIC(
Handle<HeapObject> receiver,
Handle<Code> handler,
Handle<Name> name) {
Handle<Map> map(receiver->map());
Handle<Code> ic = FindIC(name, map, Code::KEYED_LOAD_IC, handler->type());
Handle<Code> StubCache::ComputeMonomorphicKeyedLoadIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<Name> name) {
Handle<Code> ic = FindIC(
name, receiver, Code::KEYED_LOAD_IC, handler->type());
if (!ic.is_null()) return ic;
KeyedLoadStubCompiler ic_compiler(isolate());
ic = ic_compiler.CompileMonomorphicIC(map, handler, name);
ic = ic_compiler.CompileMonomorphicIC(
Handle<Map>(receiver->map()), handler, name);
HeapObject::UpdateMapCodeCache(receiver, name, ic);
JSObject::UpdateMapCodeCache(receiver, name, ic);
return ic;
}
Handle<Code> StubCache::ComputeMonomorphicStoreIC(Handle<HeapObject> receiver,
Handle<Code> StubCache::ComputeMonomorphicStoreIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<Name> name,
StrictModeFlag strict_mode) {
Handle<Map> map(receiver->map());
Handle<Code> ic = FindIC(
name, map, Code::STORE_IC, handler->type(), strict_mode);
name, receiver, Code::STORE_IC, handler->type(), strict_mode);
if (!ic.is_null()) return ic;
StoreStubCompiler ic_compiler(isolate(), strict_mode);
ic = ic_compiler.CompileMonomorphicIC(map, handler, name);
ic = ic_compiler.CompileMonomorphicIC(
Handle<Map>(receiver->map()), handler, name);
HeapObject::UpdateMapCodeCache(receiver, name, ic);
JSObject::UpdateMapCodeCache(receiver, name, ic);
return ic;
}
Handle<Code> StubCache::ComputeMonomorphicKeyedStoreIC(
Handle<HeapObject> receiver,
Handle<JSObject> receiver,
Handle<Code> handler,
Handle<Name> name,
StrictModeFlag strict_mode) {
Handle<Map> map(receiver->map());
Handle<Code> ic = FindIC(
name, map, Code::KEYED_STORE_IC, handler->type(), strict_mode);
name, receiver, Code::KEYED_STORE_IC, handler->type(), strict_mode);
if (!ic.is_null()) return ic;
KeyedStoreStubCompiler ic_compiler(isolate(), strict_mode, STANDARD_STORE);
ic = ic_compiler.CompileMonomorphicIC(map, handler, name);
ic = ic_compiler.CompileMonomorphicIC(
Handle<Map>(receiver->map()), handler, name);
HeapObject::UpdateMapCodeCache(receiver, name, ic);
JSObject::UpdateMapCodeCache(receiver, name, ic);
return ic;
}
@ -264,7 +264,7 @@ Handle<Code> StubCache::ComputeLoadNonexistent(Handle<Name> name,
LoadStubCompiler compiler(isolate_);
handler =
compiler.CompileLoadNonexistent(receiver, current, cache_name, global);
HeapObject::UpdateMapCodeCache(receiver, cache_name, handler);
JSObject::UpdateMapCodeCache(receiver, cache_name, handler);
return handler;
}
@ -289,7 +289,7 @@ Handle<Code> StubCache::ComputeLoadField(Handle<Name> name,
LoadStubCompiler compiler(isolate_);
Handle<Code> handler =
compiler.CompileLoadField(receiver, holder, name, field, representation);
HeapObject::UpdateMapCodeCache(stub_holder, name, handler);
JSObject::UpdateMapCodeCache(stub_holder, name, handler);
return handler;
}
@ -308,7 +308,7 @@ Handle<Code> StubCache::ComputeLoadCallback(
LoadStubCompiler compiler(isolate_);
Handle<Code> handler =
compiler.CompileLoadCallback(receiver, holder, name, callback);
HeapObject::UpdateMapCodeCache(stub_holder, name, handler);
JSObject::UpdateMapCodeCache(stub_holder, name, handler);
return handler;
}
@ -326,7 +326,7 @@ Handle<Code> StubCache::ComputeLoadCallback(
LoadStubCompiler compiler(isolate_);
Handle<Code> handler =
compiler.CompileLoadCallback(receiver, holder, name, call_optimization);
HeapObject::UpdateMapCodeCache(stub_holder, name, handler);
JSObject::UpdateMapCodeCache(stub_holder, name, handler);
return handler;
}
@ -343,7 +343,7 @@ Handle<Code> StubCache::ComputeLoadViaGetter(Handle<Name> name,
LoadStubCompiler compiler(isolate_);
Handle<Code> handler =
compiler.CompileLoadViaGetter(receiver, holder, name, getter);
HeapObject::UpdateMapCodeCache(stub_holder, name, handler);
JSObject::UpdateMapCodeCache(stub_holder, name, handler);
return handler;
}
@ -359,7 +359,7 @@ Handle<Code> StubCache::ComputeLoadConstant(Handle<Name> name,
LoadStubCompiler compiler(isolate_);
handler = compiler.CompileLoadConstant(receiver, holder, name, value);
HeapObject::UpdateMapCodeCache(stub_holder, name, handler);
JSObject::UpdateMapCodeCache(stub_holder, name, handler);
return handler;
}
@ -376,7 +376,7 @@ Handle<Code> StubCache::ComputeLoadInterceptor(Handle<Name> name,
LoadStubCompiler compiler(isolate_);
Handle<Code> handler =
compiler.CompileLoadInterceptor(receiver, holder, name);
HeapObject::UpdateMapCodeCache(stub_holder, name, handler);
JSObject::UpdateMapCodeCache(stub_holder, name, handler);
return handler;
}
@ -399,7 +399,7 @@ Handle<Code> StubCache::ComputeLoadGlobal(Handle<Name> name,
LoadStubCompiler compiler(isolate_);
Handle<Code> ic =
compiler.CompileLoadGlobal(receiver, holder, cell, name, is_dont_delete);
HeapObject::UpdateMapCodeCache(stub_holder, name, ic);
JSObject::UpdateMapCodeCache(stub_holder, name, ic);
return ic;
}
@ -425,7 +425,7 @@ Handle<Code> StubCache::ComputeKeyedLoadField(Handle<Name> name,
KeyedLoadStubCompiler compiler(isolate_);
Handle<Code> handler =
compiler.CompileLoadField(receiver, holder, name, field, representation);
HeapObject::UpdateMapCodeCache(stub_holder, name, handler);
JSObject::UpdateMapCodeCache(stub_holder, name, handler);
return handler;
}
@ -442,7 +442,7 @@ Handle<Code> StubCache::ComputeKeyedLoadConstant(Handle<Name> name,
KeyedLoadStubCompiler compiler(isolate_);
handler = compiler.CompileLoadConstant(receiver, holder, name, value);
HeapObject::UpdateMapCodeCache(stub_holder, name, handler);
JSObject::UpdateMapCodeCache(stub_holder, name, handler);
return handler;
}
@ -458,7 +458,7 @@ Handle<Code> StubCache::ComputeKeyedLoadInterceptor(Handle<Name> name,
KeyedLoadStubCompiler compiler(isolate_);
Handle<Code> handler =
compiler.CompileLoadInterceptor(receiver, holder, name);
HeapObject::UpdateMapCodeCache(stub_holder, name, handler);
JSObject::UpdateMapCodeCache(stub_holder, name, handler);
return handler;
}
@ -476,7 +476,7 @@ Handle<Code> StubCache::ComputeKeyedLoadCallback(
KeyedLoadStubCompiler compiler(isolate_);
Handle<Code> handler =
compiler.CompileLoadCallback(receiver, holder, name, callback);
HeapObject::UpdateMapCodeCache(stub_holder, name, handler);
JSObject::UpdateMapCodeCache(stub_holder, name, handler);
return handler;
}
@ -494,7 +494,7 @@ Handle<Code> StubCache::ComputeKeyedLoadCallback(
KeyedLoadStubCompiler compiler(isolate_);
Handle<Code> handler =
compiler.CompileLoadCallback(receiver, holder, name, call_optimization);
HeapObject::UpdateMapCodeCache(stub_holder, name, handler);
JSObject::UpdateMapCodeCache(stub_holder, name, handler);
return handler;
}
@ -509,7 +509,7 @@ Handle<Code> StubCache::ComputeStoreField(Handle<Name> name,
StoreStubCompiler compiler(isolate_, strict_mode);
Handle<Code> handler = compiler.CompileStoreField(receiver, lookup, name);
HeapObject::UpdateMapCodeCache(receiver, name, handler);
JSObject::UpdateMapCodeCache(receiver, name, handler);
return handler;
}
@ -526,7 +526,7 @@ Handle<Code> StubCache::ComputeStoreTransition(Handle<Name> name,
StoreStubCompiler compiler(isolate_, strict_mode);
Handle<Code> handler =
compiler.CompileStoreTransition(receiver, lookup, transition, name);
HeapObject::UpdateMapCodeCache(receiver, name, handler);
JSObject::UpdateMapCodeCache(receiver, name, handler);
return handler;
}
@ -606,7 +606,7 @@ Handle<Code> StubCache::ComputeStoreGlobal(Handle<Name> name,
Handle<Map> cell_map(isolate_->heap()->global_property_cell_map());
code->ReplaceNthObject(1, *cell_map, *cell);
HeapObject::UpdateMapCodeCache(receiver, name, code);
JSObject::UpdateMapCodeCache(receiver, name, code);
return code;
}
@ -626,7 +626,7 @@ Handle<Code> StubCache::ComputeStoreCallback(
StoreStubCompiler compiler(isolate_, strict_mode);
Handle<Code> handler = compiler.CompileStoreCallback(
receiver, holder, name, callback);
HeapObject::UpdateMapCodeCache(receiver, name, handler);
JSObject::UpdateMapCodeCache(receiver, name, handler);
return handler;
}
@ -644,7 +644,7 @@ Handle<Code> StubCache::ComputeStoreCallback(
StoreStubCompiler compiler(isolate_, strict_mode);
Handle<Code> handler = compiler.CompileStoreCallback(
receiver, holder, name, call_optimization);
HeapObject::UpdateMapCodeCache(receiver, name, handler);
JSObject::UpdateMapCodeCache(receiver, name, handler);
return handler;
}
@ -661,7 +661,7 @@ Handle<Code> StubCache::ComputeStoreViaSetter(Handle<Name> name,
StoreStubCompiler compiler(isolate_, strict_mode);
Handle<Code> handler = compiler.CompileStoreViaSetter(
receiver, holder, name, setter);
HeapObject::UpdateMapCodeCache(receiver, name, handler);
JSObject::UpdateMapCodeCache(receiver, name, handler);
return handler;
}
@ -675,7 +675,7 @@ Handle<Code> StubCache::ComputeStoreInterceptor(Handle<Name> name,
StoreStubCompiler compiler(isolate_, strict_mode);
Handle<Code> handler = compiler.CompileStoreInterceptor(receiver, name);
HeapObject::UpdateMapCodeCache(receiver, name, handler);
JSObject::UpdateMapCodeCache(receiver, name, handler);
return handler;
}
@ -690,7 +690,7 @@ Handle<Code> StubCache::ComputeKeyedStoreField(Handle<Name> name,
KeyedStoreStubCompiler compiler(isolate(), strict_mode, STANDARD_STORE);
Handle<Code> handler = compiler.CompileStoreField(receiver, lookup, name);
HeapObject::UpdateMapCodeCache(receiver, name, handler);
JSObject::UpdateMapCodeCache(receiver, name, handler);
return handler;
}
@ -708,7 +708,7 @@ Handle<Code> StubCache::ComputeKeyedStoreTransition(
KeyedStoreStubCompiler compiler(isolate(), strict_mode, STANDARD_STORE);
Handle<Code> handler =
compiler.CompileStoreTransition(receiver, lookup, transition, name);
HeapObject::UpdateMapCodeCache(receiver, name, handler);
JSObject::UpdateMapCodeCache(receiver, name, handler);
return handler;
}
@ -765,7 +765,7 @@ Handle<Code> StubCache::ComputeCallConstant(int argc,
GDBJIT(AddCode(GDBJITInterface::CALL_IC, *name, *code));
if (CallStubCompiler::CanBeCached(function)) {
HeapObject::UpdateMapCodeCache(stub_holder, name, code);
JSObject::UpdateMapCodeCache(stub_holder, name, code);
}
return code;
}
@ -806,7 +806,7 @@ Handle<Code> StubCache::ComputeCallField(int argc,
PROFILE(isolate_,
CodeCreateEvent(CALL_LOGGER_TAG(kind, CALL_IC_TAG), *code, *name));
GDBJIT(AddCode(GDBJITInterface::CALL_IC, *name, *code));
HeapObject::UpdateMapCodeCache(stub_holder, name, code);
JSObject::UpdateMapCodeCache(stub_holder, name, code);
return code;
}
@ -845,7 +845,7 @@ Handle<Code> StubCache::ComputeCallInterceptor(int argc,
PROFILE(isolate(),
CodeCreateEvent(CALL_LOGGER_TAG(kind, CALL_IC_TAG), *code, *name));
GDBJIT(AddCode(GDBJITInterface::CALL_IC, *name, *code));
HeapObject::UpdateMapCodeCache(stub_holder, name, code);
JSObject::UpdateMapCodeCache(stub_holder, name, code);
return code;
}
@ -876,7 +876,7 @@ Handle<Code> StubCache::ComputeCallGlobal(int argc,
CodeCreateEvent(CALL_LOGGER_TAG(kind, CALL_IC_TAG), *code, *name));
GDBJIT(AddCode(GDBJITInterface::CALL_IC, *name, *code));
if (CallStubCompiler::CanBeCached(function)) {
HeapObject::UpdateMapCodeCache(stub_holder, name, code);
JSObject::UpdateMapCodeCache(stub_holder, name, code);
}
return code;
}

8
src/stub-cache.h
View File

@ -104,20 +104,20 @@ class StubCache {
Code::StubType type,
StrictModeFlag strict_mode);
Handle<Code> ComputeMonomorphicLoadIC(Handle<HeapObject> receiver,
Handle<Code> ComputeMonomorphicLoadIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<Name> name);
Handle<Code> ComputeMonomorphicKeyedLoadIC(Handle<HeapObject> receiver,
Handle<Code> ComputeMonomorphicKeyedLoadIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<Name> name);
Handle<Code> ComputeMonomorphicStoreIC(Handle<HeapObject> receiver,
Handle<Code> ComputeMonomorphicStoreIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<Name> name,
StrictModeFlag strict_mode);
Handle<Code> ComputeMonomorphicKeyedStoreIC(Handle<HeapObject> receiver,
Handle<Code> ComputeMonomorphicKeyedStoreIC(Handle<JSObject> receiver,
Handle<Code> handler,
Handle<Name> name,
StrictModeFlag strict_mode);