diff options
Diffstat (limited to 'deps/v8/src/stub-cache.cc')
| -rw-r--r-- | deps/v8/src/stub-cache.cc | 84 |
1 files changed, 31 insertions, 53 deletions
diff --git a/deps/v8/src/stub-cache.cc b/deps/v8/src/stub-cache.cc index bfed6bbac..411914719 100644 --- a/deps/v8/src/stub-cache.cc +++ b/deps/v8/src/stub-cache.cc @@ -120,8 +120,7 @@ Handle<Code> StubCache::ComputeLoadNonexistent(Handle<String> name, // name specific if there are global objects involved. Code::Flags flags = Code::ComputeMonomorphicFlags(Code::LOAD_IC, Code::NONEXISTENT); - Handle<Object> probe(receiver->map()->FindInCodeCache(*cache_name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*cache_name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); LoadStubCompiler compiler(isolate_); @@ -137,11 +136,10 @@ Handle<Code> StubCache::ComputeLoadNonexistent(Handle<String> name, Handle<Code> StubCache::ComputeLoadField(Handle<String> name, Handle<JSObject> receiver, Handle<JSObject> holder, - PropertyIndex field_index) { + int field_index) { ASSERT(IC::GetCodeCacheForObject(*receiver, *holder) == OWN_MAP); Code::Flags flags = Code::ComputeMonomorphicFlags(Code::LOAD_IC, Code::FIELD); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); LoadStubCompiler compiler(isolate_); @@ -162,8 +160,7 @@ Handle<Code> StubCache::ComputeLoadCallback(Handle<String> name, ASSERT(IC::GetCodeCacheForObject(*receiver, *holder) == OWN_MAP); Code::Flags flags = Code::ComputeMonomorphicFlags(Code::LOAD_IC, Code::CALLBACKS); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); LoadStubCompiler compiler(isolate_); @@ -183,8 +180,7 @@ Handle<Code> StubCache::ComputeLoadViaGetter(Handle<String> name, ASSERT(IC::GetCodeCacheForObject(*receiver, *holder) == OWN_MAP); Code::Flags flags = Code::ComputeMonomorphicFlags(Code::LOAD_IC, Code::CALLBACKS); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); LoadStubCompiler compiler(isolate_); @@ -204,8 +200,7 @@ Handle<Code> StubCache::ComputeLoadConstant(Handle<String> name, ASSERT(IC::GetCodeCacheForObject(*receiver, *holder) == OWN_MAP); Code::Flags flags = Code::ComputeMonomorphicFlags(Code::LOAD_IC, Code::CONSTANT_FUNCTION); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); LoadStubCompiler compiler(isolate_); @@ -224,8 +219,7 @@ Handle<Code> StubCache::ComputeLoadInterceptor(Handle<String> name, ASSERT(IC::GetCodeCacheForObject(*receiver, *holder) == OWN_MAP); Code::Flags flags = Code::ComputeMonomorphicFlags(Code::LOAD_IC, Code::INTERCEPTOR); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); LoadStubCompiler compiler(isolate_); @@ -251,8 +245,7 @@ Handle<Code> StubCache::ComputeLoadGlobal(Handle<String> name, ASSERT(IC::GetCodeCacheForObject(*receiver, *holder) == OWN_MAP); Code::Flags flags = Code::ComputeMonomorphicFlags(Code::LOAD_IC, Code::NORMAL); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); LoadStubCompiler compiler(isolate_); @@ -268,12 +261,11 @@ Handle<Code> StubCache::ComputeLoadGlobal(Handle<String> name, Handle<Code> StubCache::ComputeKeyedLoadField(Handle<String> name, Handle<JSObject> receiver, Handle<JSObject> holder, - PropertyIndex field_index) { + int field_index) { ASSERT(IC::GetCodeCacheForObject(*receiver, *holder) == OWN_MAP); Code::Flags flags = Code::ComputeMonomorphicFlags(Code::KEYED_LOAD_IC, Code::FIELD); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); KeyedLoadStubCompiler compiler(isolate_); @@ -293,8 +285,7 @@ Handle<Code> StubCache::ComputeKeyedLoadConstant(Handle<String> name, ASSERT(IC::GetCodeCacheForObject(*receiver, *holder) == OWN_MAP); Code::Flags flags = Code::ComputeMonomorphicFlags(Code::KEYED_LOAD_IC, Code::CONSTANT_FUNCTION); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); KeyedLoadStubCompiler compiler(isolate_); @@ -313,8 +304,7 @@ Handle<Code> StubCache::ComputeKeyedLoadInterceptor(Handle<String> name, ASSERT(IC::GetCodeCacheForObject(*receiver, *holder) == OWN_MAP); Code::Flags flags = Code::ComputeMonomorphicFlags(Code::KEYED_LOAD_IC, Code::INTERCEPTOR); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); KeyedLoadStubCompiler compiler(isolate_); @@ -334,8 +324,7 @@ Handle<Code> StubCache::ComputeKeyedLoadCallback( ASSERT(IC::GetCodeCacheForObject(*receiver, *holder) == OWN_MAP); Code::Flags flags = Code::ComputeMonomorphicFlags(Code::KEYED_LOAD_IC, Code::CALLBACKS); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); KeyedLoadStubCompiler compiler(isolate_); @@ -352,8 +341,7 @@ Handle<Code> StubCache::ComputeKeyedLoadArrayLength(Handle<String> name, Handle<JSArray> receiver) { Code::Flags flags = Code::ComputeMonomorphicFlags(Code::KEYED_LOAD_IC, Code::CALLBACKS); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); KeyedLoadStubCompiler compiler(isolate_); @@ -370,7 +358,7 @@ Handle<Code> StubCache::ComputeKeyedLoadStringLength(Handle<String> name, Code::Flags flags = Code::ComputeMonomorphicFlags(Code::KEYED_LOAD_IC, Code::CALLBACKS); Handle<Map> map(receiver->map()); - Handle<Object> probe(map->FindInCodeCache(*name, flags), isolate_); + Handle<Object> probe(map->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); KeyedLoadStubCompiler compiler(isolate_); @@ -387,8 +375,7 @@ Handle<Code> StubCache::ComputeKeyedLoadFunctionPrototype( Handle<JSFunction> receiver) { Code::Flags flags = Code::ComputeMonomorphicFlags(Code::KEYED_LOAD_IC, Code::CALLBACKS); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); KeyedLoadStubCompiler compiler(isolate_); @@ -409,8 +396,7 @@ Handle<Code> StubCache::ComputeStoreField(Handle<String> name, (transition.is_null()) ? Code::FIELD : Code::MAP_TRANSITION; Code::Flags flags = Code::ComputeMonomorphicFlags( Code::STORE_IC, type, strict_mode); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); StoreStubCompiler compiler(isolate_, strict_mode); @@ -452,7 +438,7 @@ Handle<Code> StubCache::ComputeKeyedLoadOrStoreElement( UNREACHABLE(); break; } - Handle<Object> probe(receiver_map->FindInCodeCache(*name, flags), isolate_); + Handle<Object> probe(receiver_map->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); Handle<Code> code; @@ -504,8 +490,7 @@ Handle<Code> StubCache::ComputeStoreGlobal(Handle<String> name, StrictModeFlag strict_mode) { Code::Flags flags = Code::ComputeMonomorphicFlags( Code::STORE_IC, Code::NORMAL, strict_mode); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); StoreStubCompiler compiler(isolate_, strict_mode); @@ -525,8 +510,7 @@ Handle<Code> StubCache::ComputeStoreCallback(Handle<String> name, ASSERT(v8::ToCData<Address>(callback->setter()) != 0); Code::Flags flags = Code::ComputeMonomorphicFlags( Code::STORE_IC, Code::CALLBACKS, strict_mode); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); StoreStubCompiler compiler(isolate_, strict_mode); @@ -546,8 +530,7 @@ Handle<Code> StubCache::ComputeStoreViaSetter(Handle<String> name, StrictModeFlag strict_mode) { Code::Flags flags = Code::ComputeMonomorphicFlags( Code::STORE_IC, Code::CALLBACKS, strict_mode); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); StoreStubCompiler compiler(isolate_, strict_mode); @@ -565,8 +548,7 @@ Handle<Code> StubCache::ComputeStoreInterceptor(Handle<String> name, StrictModeFlag strict_mode) { Code::Flags flags = Code::ComputeMonomorphicFlags( Code::STORE_IC, Code::INTERCEPTOR, strict_mode); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); StoreStubCompiler compiler(isolate_, strict_mode); @@ -586,8 +568,7 @@ Handle<Code> StubCache::ComputeKeyedStoreField(Handle<String> name, (transition.is_null()) ? Code::FIELD : Code::MAP_TRANSITION; Code::Flags flags = Code::ComputeMonomorphicFlags( Code::KEYED_STORE_IC, type, strict_mode); - Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(receiver->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); KeyedStoreStubCompiler compiler(isolate(), strict_mode, @@ -629,8 +610,7 @@ Handle<Code> StubCache::ComputeCallConstant(int argc, Code::Flags flags = Code::ComputeMonomorphicFlags(kind, Code::CONSTANT_FUNCTION, extra_state, cache_holder, argc); - Handle<Object> probe(map_holder->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(map_holder->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); CallStubCompiler compiler(isolate_, argc, kind, extra_state, cache_holder); @@ -652,7 +632,7 @@ Handle<Code> StubCache::ComputeCallField(int argc, Handle<String> name, Handle<Object> object, Handle<JSObject> holder, - PropertyIndex index) { + int index) { // Compute the check type and the map. InlineCacheHolderFlag cache_holder = IC::GetCodeCacheForObject(*object, *holder); @@ -668,8 +648,7 @@ Handle<Code> StubCache::ComputeCallField(int argc, Code::Flags flags = Code::ComputeMonomorphicFlags(kind, Code::FIELD, extra_state, cache_holder, argc); - Handle<Object> probe(map_holder->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(map_holder->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); CallStubCompiler compiler(isolate_, argc, kind, extra_state, cache_holder); @@ -706,8 +685,7 @@ Handle<Code> StubCache::ComputeCallInterceptor(int argc, Code::Flags flags = Code::ComputeMonomorphicFlags(kind, Code::INTERCEPTOR, extra_state, cache_holder, argc); - Handle<Object> probe(map_holder->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(map_holder->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); CallStubCompiler compiler(isolate(), argc, kind, extra_state, cache_holder); @@ -737,8 +715,7 @@ Handle<Code> StubCache::ComputeCallGlobal(int argc, Code::Flags flags = Code::ComputeMonomorphicFlags(kind, Code::NORMAL, extra_state, cache_holder, argc); - Handle<Object> probe(map_holder->map()->FindInCodeCache(*name, flags), - isolate_); + Handle<Object> probe(map_holder->map()->FindInCodeCache(*name, flags)); if (probe->IsCode()) return Handle<Code>::cast(probe); CallStubCompiler compiler(isolate(), argc, kind, extra_state, cache_holder); @@ -770,8 +747,10 @@ Code* StubCache::FindCallInitialize(int argc, CallICBase::Contextual::encode(mode == RelocInfo::CODE_TARGET_CONTEXT); Code::Flags flags = Code::ComputeFlags(kind, UNINITIALIZED, extra_state, Code::NORMAL, argc); + + // Use raw_unchecked... so we don't get assert failures during GC. UnseededNumberDictionary* dictionary = - isolate()->heap()->non_monomorphic_cache(); + isolate()->heap()->raw_unchecked_non_monomorphic_cache(); int entry = dictionary->FindEntry(isolate(), flags); ASSERT(entry != -1); Object* code = dictionary->ValueAt(entry); @@ -1562,7 +1541,6 @@ int CallOptimization::GetPrototypeDepthOfExpectedType( while (!object.is_identical_to(holder)) { if (object->IsInstanceOf(*expected_receiver_type_)) return depth; object = Handle<JSObject>(JSObject::cast(object->GetPrototype())); - if (!object->map()->is_hidden_prototype()) return kInvalidProtoDepth; ++depth; } if (holder->IsInstanceOf(*expected_receiver_type_)) return depth; |