Skip to content

V
V8
Commit ae6e6a68 authored by ulan@chromium.org's avatar ulan@chromium.org
Browse files
Options

Handlify KeyedIC::ComputeStub. 

BUG=
TEST=

Review URL: http://codereview.chromium.org/8356041

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9741 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 9b0626b5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 255 additions and 170 deletions
src/ic.cc
View file @ ae6e6a68
This diff is collapsed.
src/ic.h
View file @ ae6e6a68
......@@ -365,7 +365,7 @@ class KeyedIC: public IC {
explicit KeyedIC(Isolate* isolate) : IC(NO_EXTRA_FRAME, isolate) {}
virtual ~KeyedIC() {}
virtual MaybeObject* GetElementStubWithoutMapCheck(
virtual Handle<Code> GetElementStubWithoutMapCheck(
bool is_js_array,
ElementsKind elements_kind) = 0;
......@@ -381,27 +381,23 @@ class KeyedIC: public IC {
StrictModeFlag strict_mode,
Handle<Code> default_stub);
MaybeObject* ComputeStub(JSObject* receiver,
StubKind stub_kind,
StrictModeFlag strict_mode,
Code* default_stub);
virtual MaybeObject* ComputePolymorphicStub(MapList* receiver_maps,
virtual Handle<Code> ComputePolymorphicStub(MapHandleList* receiver_maps,
StrictModeFlag strict_mode) = 0;
MaybeObject* ComputeMonomorphicStubWithoutMapCheck(
Map* receiver_map,
Handle<Code> ComputeMonomorphicStubWithoutMapCheck(
Handle<Map> receiver_map,
StrictModeFlag strict_mode);
private:
void GetReceiverMapsForStub(Code* stub, MapList* result);
void GetReceiverMapsForStub(Handle<Code> stub, MapHandleList* result);
MaybeObject* ComputeMonomorphicStub(JSObject* receiver,
Handle<Code> ComputeMonomorphicStub(Handle<JSObject> receiver,
StubKind stub_kind,
StrictModeFlag strict_mode,
Code* default_stub);
Handle<Code> default_stub);
MaybeObject* ComputeTransitionedMap(JSObject* receiver, StubKind stub_kind);
Handle<Map> ComputeTransitionedMap(Handle<JSObject> receiver,
StubKind stub_kind);
static bool IsTransitionStubKind(StubKind stub_kind) {
return stub_kind > STORE_NO_TRANSITION;
......@@ -441,16 +437,15 @@ class KeyedLoadIC: public KeyedIC {
static const int kSlowCaseBitFieldMask =
(1 << Map::kIsAccessCheckNeeded) | (1 << Map::kHasIndexedInterceptor);
virtual MaybeObject* GetElementStubWithoutMapCheck(
virtual Handle<Code> GetElementStubWithoutMapCheck(
bool is_js_array,
ElementsKind elements_kind);
protected:
virtual Code::Kind kind() const { return Code::KEYED_LOAD_IC; }
virtual MaybeObject* ComputePolymorphicStub(
MapList* receiver_maps,
StrictModeFlag strict_mode);
virtual Handle<Code> ComputePolymorphicStub(MapHandleList* receiver_maps,
StrictModeFlag strict_mode);
virtual Handle<Code> string_stub() {
return isolate()->builtins()->KeyedLoadIC_String();
......@@ -585,16 +580,15 @@ class KeyedStoreIC: public KeyedIC {
static void GenerateTransitionElementsSmiToDouble(MacroAssembler* masm);
static void GenerateTransitionElementsDoubleToObject(MacroAssembler* masm);
virtual MaybeObject* GetElementStubWithoutMapCheck(
virtual Handle<Code> GetElementStubWithoutMapCheck(
bool is_js_array,
ElementsKind elements_kind);
protected:
virtual Code::Kind kind() const { return Code::KEYED_STORE_IC; }
virtual MaybeObject* ComputePolymorphicStub(
MapList* receiver_maps,
StrictModeFlag strict_mode);
virtual Handle<Code> ComputePolymorphicStub(MapHandleList* receiver_maps,
StrictModeFlag strict_mode);
private:
// Update the inline cache.
......
src/list-inl.h
View file @ ae6e6a68
......@@ -236,6 +236,19 @@ int SortedListBSearch(const List<T>& list, T elem) {
return SortedListBSearch<T>(list, elem, PointerValueCompare<T>);
}
template <class T>
List<T*>* UnwrapHandleList(List<T*>* destination, List<Handle<T> >* source) {
ASSERT(destination->is_empty());
int length = source->length();
for (int i = 0; i < length; ++i) {
Handle<T> handle = source->at(i);
destination->Add(handle.is_null() ? NULL : *handle);
}
return destination;
}
} } // namespace v8::internal
#endif // V8_LIST_INL_H_
src/list.h
View file @ ae6e6a68
......@@ -165,8 +165,11 @@ class List {
class Map;
class Code;
template<typename T> class Handle;
typedef List<Map*> MapList;
typedef List<Code*> CodeList;
typedef List<Handle<Map> > MapHandleList;
typedef List<Handle<Code> > CodeHandleList;
// Perform binary search for an element in an already sorted
// list. Returns the index of the element of -1 if it was not found.
......@@ -176,6 +179,15 @@ int SortedListBSearch(
template <typename T>
int SortedListBSearch(const List<T>& list, T elem);
// Unwraps each handle in the source list to a pointer at
// the corresponding position in the destination list.
// Returns the destination list.
// Both list must have the same length.
template <class T>
List<T*>* UnwrapHandleList(List<T*>* destination, List<Handle<T> >* source);
} } // namespace v8::internal
......
src/objects.cc
View file @ ae6e6a68
......@@ -2190,6 +2190,14 @@ static bool ContainsMap(MapList* maps_list, Map* map) {
}
Handle<Map> Map::FindTransitionedMap(MapHandleList* candidates) {
MapList raw_candidates(candidates->length());
Map* result = FindTransitionedMap(UnwrapHandleList(&raw_candidates,
candidates));
return (result == NULL) ? Handle<Map>::null() : Handle<Map>(result);
}
Map* Map::FindTransitionedMap(MapList* candidates) {
ElementsKind elms_kind = elements_kind();
if (elms_kind == FAST_DOUBLE_ELEMENTS) {
......@@ -2397,6 +2405,15 @@ MaybeObject* Map::AddElementsTransition(ElementsKind elements_kind,
}
Handle<Map> JSObject::GetElementsTransitionMap(Handle<JSObject> object,
ElementsKind to_kind) {
Isolate* isolate = object->GetIsolate();
CALL_HEAP_FUNCTION(isolate,
object->GetElementsTransitionMap(to_kind),
Map);
}
MaybeObject* JSObject::GetElementsTransitionMap(ElementsKind to_kind) {
Map* current_map = map();
ElementsKind from_kind = current_map->elements_kind();
......@@ -5124,6 +5141,19 @@ void CodeCacheHashTable::RemoveByIndex(int index) {
}
void PolymorphicCodeCache::Update(Handle<PolymorphicCodeCache> cache,
MapHandleList* maps,
Code::Flags flags,
Handle<Code> code) {
Isolate* isolate = cache->GetIsolate();
List<Map*> raw_maps(maps->length());
CALL_HEAP_FUNCTION_VOID(
isolate,
(raw_maps.Clear(),
cache->Update(UnwrapHandleList(&raw_maps, maps), flags, *code)));
}
MaybeObject* PolymorphicCodeCache::Update(MapList* maps,
Code::Flags flags,
Code* code) {
......@@ -5152,6 +5182,13 @@ MaybeObject* PolymorphicCodeCache::Update(MapList* maps,
}
Handle<Object> PolymorphicCodeCache::Lookup(MapHandleList* maps,
Code::Flags flags) {
List<Map*> raw_maps(maps->length());
return Handle<Object>(Lookup(UnwrapHandleList(&raw_maps, maps), flags));
}
Object* PolymorphicCodeCache::Lookup(MapList* maps, Code::Flags flags) {
if (!cache()->IsUndefined()) {
PolymorphicCodeCacheHashTable* hash_table =
......
src/objects.h
View file @ ae6e6a68
......@@ -1800,6 +1800,8 @@ class JSObject: public JSReceiver {
// Returns a new map with all transitions dropped from the object's current
// map and the ElementsKind set.
static Handle<Map> GetElementsTransitionMap(Handle<JSObject> object,
ElementsKind to_kind);
MUST_USE_RESULT MaybeObject* GetElementsTransitionMap(
ElementsKind elements_kind);
......@@ -4355,10 +4357,12 @@ class Map: public HeapObject {
Map* transitioned_map);
// Returns the transitioned map for this map with the most generic
// elements_kind that's found in |candidates|, or NULL if no match is
// elements_kind that's found in |candidates|, or null handle if no match is
// found at all.
Handle<Map> FindTransitionedMap(MapHandleList* candidates);
Map* FindTransitionedMap(MapList* candidates);
// Dispatched behavior.
#ifdef OBJECT_PRINT
inline void MapPrint() {
......@@ -5859,9 +5863,18 @@ class PolymorphicCodeCache: public Struct {
public:
DECL_ACCESSORS(cache, Object)
static void Update(Handle<PolymorphicCodeCache> cache,
MapHandleList* maps,
Code::Flags flags,
Handle<Code> code);
MUST_USE_RESULT MaybeObject* Update(MapList* maps,
Code::Flags flags,
Code* code);
// Returns an undefined value if the entry is not found.
Handle<Object> Lookup(MapHandleList* maps, Code::Flags flags);
Object* Lookup(MapList* maps, Code::Flags flags);
static inline PolymorphicCodeCache* cast(Object* obj);
......
src/stub-cache.cc
View file @ ae6e6a68
......@@ -542,8 +542,23 @@ Handle<Code> StubCache::ComputeStoreField(Handle<String> name,
}
MaybeObject* StubCache::ComputeKeyedLoadOrStoreElement(
JSObject* receiver,
Handle<Code> KeyedLoadStubCompiler::CompileLoadElement(Handle<Map> map) {
CALL_HEAP_FUNCTION(isolate(),
(set_failure(NULL), CompileLoadElement(*map)),
Code);
}
Handle<Code> KeyedStoreStubCompiler::CompileStoreElement(Handle<Map> map) {
CALL_HEAP_FUNCTION(isolate(),
(set_failure(NULL),
CompileStoreElement(*map)),
Code);
}
Handle<Code> StubCache::ComputeKeyedLoadOrStoreElement(
Handle<JSObject> receiver,
KeyedIC::StubKind stub_kind,
StrictModeFlag strict_mode) {
Code::Flags flags =
......@@ -552,62 +567,92 @@ MaybeObject* StubCache::ComputeKeyedLoadOrStoreElement(
: Code::KEYED_STORE_IC,
NORMAL,
strict_mode);
String* name = NULL;
Handle<String> name;
switch (stub_kind) {
case KeyedIC::LOAD:
name = isolate()->heap()->KeyedLoadElementMonomorphic_symbol();
name = isolate()->factory()->KeyedLoadElementMonomorphic_symbol();
break;
case KeyedIC::STORE_NO_TRANSITION:
name = isolate()->heap()->KeyedStoreElementMonomorphic_symbol();
name = isolate()->factory()->KeyedStoreElementMonomorphic_symbol();
break;
default:
UNREACHABLE();
break;
}
Object* maybe_code = receiver->map()->FindInCodeCache(name, flags);
if (!maybe_code->IsUndefined()) return Code::cast(maybe_code);
Handle<Map> receiver_map(receiver->map());
Handle<Object> probe(receiver_map->FindInCodeCache(*name, flags));
if (probe->IsCode()) return Handle<Code>::cast(probe);
Map* receiver_map = receiver->map();
MaybeObject* maybe_new_code = NULL;
Handle<Code> code;
switch (stub_kind) {
case KeyedIC::LOAD: {
HandleScope scope(isolate_);
KeyedLoadStubCompiler compiler(isolate_);
maybe_new_code = compiler.CompileLoadElement(receiver_map);
code = compiler.CompileLoadElement(receiver_map);
break;
}
case KeyedIC::STORE_NO_TRANSITION: {
HandleScope scope(isolate_);
KeyedStoreStubCompiler compiler(isolate_, strict_mode);
maybe_new_code = compiler.CompileStoreElement(receiver_map);
code = compiler.CompileStoreElement(receiver_map);
break;
}
default:
UNREACHABLE();
break;
}
Code* code = NULL;
if (!maybe_new_code->To(&code)) return maybe_new_code;
ASSERT(!code.is_null());
if (stub_kind == KeyedIC::LOAD) {
PROFILE(isolate_,
CodeCreateEvent(Logger::KEYED_LOAD_IC_TAG,
Code::cast(code), 0));
PROFILE(isolate_, CodeCreateEvent(Logger::KEYED_LOAD_IC_TAG, *code, 0));
} else {
PROFILE(isolate_,
CodeCreateEvent(Logger::KEYED_STORE_IC_TAG,
Code::cast(code), 0));
}
ASSERT(code->IsCode());
Object* result;
{ MaybeObject* maybe_result =
receiver->UpdateMapCodeCache(name, Code::cast(code));
if (!maybe_result->ToObject(&result)) return maybe_result;
PROFILE(isolate_, CodeCreateEvent(Logger::KEYED_STORE_IC_TAG, *code, 0));
}
JSObject::UpdateMapCodeCache(receiver, name, code);
return code;
}
Handle<Code> KeyedLoadStubCompiler::CompileLoadPolymorphic(
MapHandleList* receiver_maps,
CodeHandleList* handler_stubs) {
MapList raw_receiver_maps(receiver_maps->length());
CodeList raw_handler_stubs(handler_stubs->length());
CALL_HEAP_FUNCTION(
isolate(),
(set_failure(NULL),
raw_receiver_maps.Clear(),
raw_handler_stubs.Clear(),
CompileLoadPolymorphic(UnwrapHandleList(&raw_receiver_maps,
receiver_maps),
UnwrapHandleList(&raw_handler_stubs,
handler_stubs))),
Code);
}
Handle<Code> KeyedStoreStubCompiler::CompileStorePolymorphic(
MapHandleList* receiver_maps,
CodeHandleList* handler_stubs,
MapHandleList* transitioned_maps) {
MapList raw_receiver_maps(receiver_maps->length());
CodeList raw_handler_stubs(handler_stubs->length());
MapList raw_transitioned_maps(transitioned_maps->length());
CALL_HEAP_FUNCTION(
isolate(),
(set_failure(NULL),
raw_receiver_maps.Clear(),
raw_handler_stubs.Clear(),
raw_transitioned_maps.Clear(),
CompileStorePolymorphic(UnwrapHandleList(&raw_receiver_maps,
receiver_maps),
UnwrapHandleList(&raw_handler_stubs,
handler_stubs),
UnwrapHandleList(&raw_transitioned_maps,
transitioned_maps))),
Code);
}
Handle<Code> StubCache::ComputeStoreNormal(StrictModeFlag strict_mode) {
return (strict_mode == kStrictMode)
? isolate_->builtins()->Builtins::StoreIC_Normal_Strict()
......
src/stub-cache.h
View file @ ae6e6a68
......@@ -168,10 +168,9 @@ class StubCache {
Handle<Map> transition,
StrictModeFlag strict_mode);
MUST_USE_RESULT MaybeObject* ComputeKeyedLoadOrStoreElement(
JSObject* receiver,
KeyedIC::StubKind stub_kind,
StrictModeFlag strict_mode);
Handle<Code> ComputeKeyedLoadOrStoreElement(Handle<JSObject> receiver,
KeyedIC::StubKind stub_kind,
StrictModeFlag strict_mode);
// ---
......@@ -687,8 +686,13 @@ class KeyedLoadStubCompiler: public StubCompiler {
MUST_USE_RESULT MaybeObject* CompileLoadFunctionPrototype(String* name);
Handle<Code> CompileLoadElement(Handle<Map> receiver_map);
MUST_USE_RESULT MaybeObject* CompileLoadElement(Map* receiver_map);
Handle<Code> CompileLoadPolymorphic(MapHandleList* receiver_maps,
CodeHandleList* handler_ics);
MUST_USE_RESULT MaybeObject* CompileLoadPolymorphic(
MapList* receiver_maps,
CodeList* handler_ics);
......@@ -769,8 +773,14 @@ class KeyedStoreStubCompiler: public StubCompiler {
Map* transition,
String* name);
Handle<Code> CompileStoreElement(Handle<Map> receiver_map);
MUST_USE_RESULT MaybeObject* CompileStoreElement(Map* receiver_map);
Handle<Code> CompileStorePolymorphic(MapHandleList* receiver_maps,
CodeHandleList* handler_stubs,
MapHandleList* transitioned_maps);
MUST_USE_RESULT MaybeObject* CompileStorePolymorphic(
MapList* receiver_maps,
CodeList* handler_stubs,
......
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