diff options
Diffstat (limited to 'chromium/v8/src/type-info.cc')
| -rw-r--r-- | chromium/v8/src/type-info.cc | 352 |
1 files changed, 113 insertions, 239 deletions
diff --git a/chromium/v8/src/type-info.cc b/chromium/v8/src/type-info.cc index eed54ce2bcd..45ac1a33267 100644 --- a/chromium/v8/src/type-info.cc +++ b/chromium/v8/src/type-info.cc @@ -1,70 +1,37 @@ // 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 -// with the distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#include "v8.h" - -#include "ast.h" -#include "code-stubs.h" -#include "compiler.h" -#include "ic.h" -#include "macro-assembler.h" -#include "stub-cache.h" -#include "type-info.h" - -#include "ic-inl.h" -#include "objects-inl.h" +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. -namespace v8 { -namespace internal { +#include "src/v8.h" +#include "src/ast.h" +#include "src/code-stubs.h" +#include "src/compiler.h" +#include "src/ic.h" +#include "src/macro-assembler.h" +#include "src/stub-cache.h" +#include "src/type-info.h" -TypeInfo TypeInfo::FromValue(Handle<Object> value) { - if (value->IsSmi()) { - return TypeInfo::Smi(); - } else if (value->IsHeapNumber()) { - return TypeInfo::IsInt32Double(HeapNumber::cast(*value)->value()) - ? TypeInfo::Integer32() - : TypeInfo::Double(); - } else if (value->IsString()) { - return TypeInfo::String(); - } - return TypeInfo::Unknown(); -} +#include "src/ic-inl.h" +#include "src/objects-inl.h" + +namespace v8 { +namespace internal { TypeFeedbackOracle::TypeFeedbackOracle(Handle<Code> code, + Handle<FixedArray> feedback_vector, Handle<Context> native_context, - Isolate* isolate, Zone* zone) : native_context_(native_context), - isolate_(isolate), zone_(zone) { BuildDictionary(code); ASSERT(dictionary_->IsDictionary()); + // We make a copy of the feedback vector because a GC could clear + // the type feedback info contained therein. + // TODO(mvstanton): revisit the decision to copy when we weakly + // traverse the feedback vector at GC time. + feedback_vector_ = isolate()->factory()->CopyFixedArray(feedback_vector); } @@ -79,23 +46,23 @@ Handle<Object> TypeFeedbackOracle::GetInfo(TypeFeedbackId ast_id) { Object* value = dictionary_->ValueAt(entry); if (value->IsCell()) { Cell* cell = Cell::cast(value); - return Handle<Object>(cell->value(), isolate_); + return Handle<Object>(cell->value(), isolate()); } else { - return Handle<Object>(value, isolate_); + return Handle<Object>(value, isolate()); } } - return Handle<Object>::cast(isolate_->factory()->undefined_value()); + return Handle<Object>::cast(isolate()->factory()->undefined_value()); } -Handle<Cell> TypeFeedbackOracle::GetInfoCell( - TypeFeedbackId ast_id) { - int entry = dictionary_->FindEntry(IdToKey(ast_id)); - if (entry != UnseededNumberDictionary::kNotFound) { - Cell* cell = Cell::cast(dictionary_->ValueAt(entry)); - return Handle<Cell>(cell, isolate_); +Handle<Object> TypeFeedbackOracle::GetInfo(int slot) { + ASSERT(slot >= 0 && slot < feedback_vector_->length()); + Object* obj = feedback_vector_->get(slot); + if (!obj->IsJSFunction() || + !CanRetainOtherContext(JSFunction::cast(obj), *native_context_)) { + return Handle<Object>(obj, isolate()); } - return Handle<Cell>::null(); + return Handle<Object>::cast(isolate()->factory()->undefined_value()); } @@ -109,16 +76,6 @@ bool TypeFeedbackOracle::LoadIsUninitialized(TypeFeedbackId id) { } -bool TypeFeedbackOracle::LoadIsPreMonomorphic(TypeFeedbackId id) { - Handle<Object> maybe_code = GetInfo(id); - if (maybe_code->IsCode()) { - Handle<Code> code = Handle<Code>::cast(maybe_code); - return code->is_inline_cache_stub() && code->ic_state() == PREMONOMORPHIC; - } - return false; -} - - bool TypeFeedbackOracle::StoreIsUninitialized(TypeFeedbackId ast_id) { Handle<Object> maybe_code = GetInfo(ast_id); if (!maybe_code->IsCode()) return false; @@ -127,16 +84,6 @@ bool TypeFeedbackOracle::StoreIsUninitialized(TypeFeedbackId ast_id) { } -bool TypeFeedbackOracle::StoreIsPreMonomorphic(TypeFeedbackId ast_id) { - Handle<Object> maybe_code = GetInfo(ast_id); - if (maybe_code->IsCode()) { - Handle<Code> code = Handle<Code>::cast(maybe_code); - return code->ic_state() == PREMONOMORPHIC; - } - return false; -} - - bool TypeFeedbackOracle::StoreIsKeyedPolymorphic(TypeFeedbackId ast_id) { Handle<Object> maybe_code = GetInfo(ast_id); if (maybe_code->IsCode()) { @@ -148,31 +95,25 @@ bool TypeFeedbackOracle::StoreIsKeyedPolymorphic(TypeFeedbackId ast_id) { } -bool TypeFeedbackOracle::CallIsMonomorphic(TypeFeedbackId id) { - Handle<Object> value = GetInfo(id); - return value->IsAllocationSite() || value->IsJSFunction() || value->IsSmi() || - (value->IsCode() && Handle<Code>::cast(value)->ic_state() == MONOMORPHIC); +bool TypeFeedbackOracle::CallIsMonomorphic(int slot) { + Handle<Object> value = GetInfo(slot); + return value->IsAllocationSite() || value->IsJSFunction(); } -bool TypeFeedbackOracle::KeyedArrayCallIsHoley(TypeFeedbackId id) { - Handle<Object> value = GetInfo(id); - Handle<Code> code = Handle<Code>::cast(value); - return KeyedArrayCallStub::IsHoley(code); +bool TypeFeedbackOracle::CallNewIsMonomorphic(int slot) { + Handle<Object> info = GetInfo(slot); + return FLAG_pretenuring_call_new + ? info->IsJSFunction() + : info->IsAllocationSite() || info->IsJSFunction(); } -bool TypeFeedbackOracle::CallNewIsMonomorphic(TypeFeedbackId id) { - Handle<Object> info = GetInfo(id); - return info->IsAllocationSite() || info->IsJSFunction(); -} - - -byte TypeFeedbackOracle::ForInType(TypeFeedbackId id) { - Handle<Object> value = GetInfo(id); - return value->IsSmi() && - Smi::cast(*value)->value() == TypeFeedbackCells::kForInFastCaseMarker - ? ForInStatement::FAST_FOR_IN : ForInStatement::SLOW_FOR_IN; +byte TypeFeedbackOracle::ForInType(int feedback_vector_slot) { + Handle<Object> value = GetInfo(feedback_vector_slot); + return value.is_identical_to( + TypeFeedbackInfo::UninitializedSentinel(isolate())) + ? ForInStatement::FAST_FOR_IN : ForInStatement::SLOW_FOR_IN; } @@ -189,63 +130,48 @@ KeyedAccessStoreMode TypeFeedbackOracle::GetStoreMode( } -void TypeFeedbackOracle::CallReceiverTypes(TypeFeedbackId id, - Handle<String> name, - int arity, - CallKind call_kind, - SmallMapList* types) { - // Note: Currently we do not take string extra ic data into account - // here. - ContextualMode contextual_mode = call_kind == CALL_AS_FUNCTION - ? CONTEXTUAL - : NOT_CONTEXTUAL; - ExtraICState extra_ic_state = - CallIC::Contextual::encode(contextual_mode); - - Code::Flags flags = Code::ComputeMonomorphicFlags( - Code::CALL_IC, extra_ic_state, OWN_MAP, Code::NORMAL, arity); - CollectReceiverTypes(id, name, flags, types); -} - +Handle<JSFunction> TypeFeedbackOracle::GetCallTarget(int slot) { + Handle<Object> info = GetInfo(slot); + if (info->IsAllocationSite()) { + return Handle<JSFunction>(isolate()->native_context()->array_function()); + } -CheckType TypeFeedbackOracle::GetCallCheckType(TypeFeedbackId id) { - Handle<Object> value = GetInfo(id); - if (!value->IsSmi()) return RECEIVER_MAP_CHECK; - CheckType check = static_cast<CheckType>(Smi::cast(*value)->value()); - ASSERT(check != RECEIVER_MAP_CHECK); - return check; + return Handle<JSFunction>::cast(info); } -Handle<JSFunction> TypeFeedbackOracle::GetCallTarget(TypeFeedbackId id) { - Handle<Object> info = GetInfo(id); - if (info->IsAllocationSite()) { - return Handle<JSFunction>(isolate_->global_context()->array_function()); - } else { +Handle<JSFunction> TypeFeedbackOracle::GetCallNewTarget(int slot) { + Handle<Object> info = GetInfo(slot); + if (FLAG_pretenuring_call_new || info->IsJSFunction()) { return Handle<JSFunction>::cast(info); } + + ASSERT(info->IsAllocationSite()); + return Handle<JSFunction>(isolate()->native_context()->array_function()); } -Handle<JSFunction> TypeFeedbackOracle::GetCallNewTarget(TypeFeedbackId id) { - Handle<Object> info = GetInfo(id); +Handle<AllocationSite> TypeFeedbackOracle::GetCallAllocationSite(int slot) { + Handle<Object> info = GetInfo(slot); if (info->IsAllocationSite()) { - return Handle<JSFunction>(isolate_->global_context()->array_function()); - } else { - return Handle<JSFunction>::cast(info); + return Handle<AllocationSite>::cast(info); } + return Handle<AllocationSite>::null(); } -Handle<Cell> TypeFeedbackOracle::GetCallNewAllocationInfoCell( - TypeFeedbackId id) { - return GetInfoCell(id); +Handle<AllocationSite> TypeFeedbackOracle::GetCallNewAllocationSite(int slot) { + Handle<Object> info = GetInfo(slot); + if (FLAG_pretenuring_call_new || info->IsAllocationSite()) { + return Handle<AllocationSite>::cast(info); + } + return Handle<AllocationSite>::null(); } bool TypeFeedbackOracle::LoadIsBuiltin( TypeFeedbackId id, Builtins::Name builtin) { - return *GetInfo(id) == isolate_->builtins()->builtin(builtin); + return *GetInfo(id) == isolate()->builtins()->builtin(builtin); } @@ -260,13 +186,13 @@ bool TypeFeedbackOracle::LoadIsStub(TypeFeedbackId id, ICStub* stub) { void TypeFeedbackOracle::CompareType(TypeFeedbackId id, - Handle<Type>* left_type, - Handle<Type>* right_type, - Handle<Type>* combined_type) { + Type** left_type, + Type** right_type, + Type** combined_type) { Handle<Object> info = GetInfo(id); if (!info->IsCode()) { // For some comparisons we don't have ICs, e.g. LiteralCompareTypeof. - *left_type = *right_type = *combined_type = handle(Type::None(), isolate_); + *left_type = *right_type = *combined_type = Type::None(zone()); return; } Handle<Code> code = Handle<Code>::cast(info); @@ -274,8 +200,8 @@ void TypeFeedbackOracle::CompareType(TypeFeedbackId id, Handle<Map> map; Map* raw_map = code->FindFirstMap(); if (raw_map != NULL) { - map = Map::CurrentMapForDeprecated(handle(raw_map)); - if (!map.is_null() && CanRetainOtherContext(*map, *native_context_)) { + if (Map::CurrentMapForDeprecated(handle(raw_map)).ToHandle(&map) && + CanRetainOtherContext(*map, *native_context_)) { map = Handle<Map>::null(); } } @@ -283,20 +209,21 @@ void TypeFeedbackOracle::CompareType(TypeFeedbackId id, if (code->is_compare_ic_stub()) { int stub_minor_key = code->stub_info(); CompareIC::StubInfoToType( - stub_minor_key, left_type, right_type, combined_type, map, isolate()); + stub_minor_key, left_type, right_type, combined_type, map, zone()); } else if (code->is_compare_nil_ic_stub()) { - CompareNilICStub stub(code->extended_extra_ic_state()); - *combined_type = stub.GetType(isolate_, map); - *left_type = *right_type = stub.GetInputType(isolate_, map); + CompareNilICStub stub(isolate(), code->extra_ic_state()); + *combined_type = stub.GetType(zone(), map); + *left_type = *right_type = stub.GetInputType(zone(), map); } } void TypeFeedbackOracle::BinaryType(TypeFeedbackId id, - Handle<Type>* left, - Handle<Type>* right, - Handle<Type>* result, + Type** left, + Type** right, + Type** result, Maybe<int>* fixed_right_arg, + Handle<AllocationSite>* allocation_site, Token::Value op) { Handle<Object> object = GetInfo(id); if (!object->IsCode()) { @@ -304,41 +231,37 @@ void TypeFeedbackOracle::BinaryType(TypeFeedbackId id, // operations covered by the BinaryOpIC we should always have them. ASSERT(op < BinaryOpIC::State::FIRST_TOKEN || op > BinaryOpIC::State::LAST_TOKEN); - *left = *right = *result = handle(Type::None(), isolate_); + *left = *right = *result = Type::None(zone()); *fixed_right_arg = Maybe<int>(); + *allocation_site = Handle<AllocationSite>::null(); return; } Handle<Code> code = Handle<Code>::cast(object); ASSERT_EQ(Code::BINARY_OP_IC, code->kind()); - BinaryOpIC::State state(code->extended_extra_ic_state()); + BinaryOpIC::State state(isolate(), code->extra_ic_state()); ASSERT_EQ(op, state.op()); - *left = state.GetLeftType(isolate()); - *right = state.GetRightType(isolate()); - *result = state.GetResultType(isolate()); + *left = state.GetLeftType(zone()); + *right = state.GetRightType(zone()); + *result = state.GetResultType(zone()); *fixed_right_arg = state.fixed_right_arg(); -} - -Handle<Type> TypeFeedbackOracle::ClauseType(TypeFeedbackId id) { - Handle<Object> info = GetInfo(id); - Handle<Type> result(Type::None(), isolate_); - if (info->IsCode() && Handle<Code>::cast(info)->is_compare_ic_stub()) { - Handle<Code> code = Handle<Code>::cast(info); - CompareIC::State state = ICCompareStub::CompareState(code->stub_info()); - result = CompareIC::StateToType(isolate_, state); + AllocationSite* first_allocation_site = code->FindFirstAllocationSite(); + if (first_allocation_site != NULL) { + *allocation_site = handle(first_allocation_site); + } else { + *allocation_site = Handle<AllocationSite>::null(); } - return result; } -Handle<Type> TypeFeedbackOracle::CountType(TypeFeedbackId id) { +Type* TypeFeedbackOracle::CountType(TypeFeedbackId id) { Handle<Object> object = GetInfo(id); - if (!object->IsCode()) return handle(Type::None(), isolate_); + if (!object->IsCode()) return Type::None(zone()); Handle<Code> code = Handle<Code>::cast(object); ASSERT_EQ(Code::BINARY_OP_IC, code->kind()); - BinaryOpIC::State state(code->extended_extra_ic_state()); - return state.GetLeftType(isolate()); + BinaryOpIC::State state(isolate(), code->extra_ic_state()); + return state.GetLeftType(zone()); } @@ -346,12 +269,10 @@ void TypeFeedbackOracle::PropertyReceiverTypes( TypeFeedbackId id, Handle<String> name, SmallMapList* receiver_types, bool* is_prototype) { receiver_types->Clear(); - FunctionPrototypeStub proto_stub(Code::LOAD_IC); + FunctionPrototypeStub proto_stub(isolate(), Code::LOAD_IC); *is_prototype = LoadIsStub(id, &proto_stub); if (!*is_prototype) { - Code::Flags flags = Code::ComputeFlags( - Code::HANDLER, MONOMORPHIC, kNoExtraICState, - Code::NORMAL, Code::LOAD_IC); + Code::Flags flags = Code::ComputeHandlerFlags(Code::LOAD_IC); CollectReceiverTypes(id, name, flags, receiver_types); } } @@ -372,9 +293,7 @@ void TypeFeedbackOracle::KeyedPropertyReceiverTypes( void TypeFeedbackOracle::AssignmentReceiverTypes( TypeFeedbackId id, Handle<String> name, SmallMapList* receiver_types) { receiver_types->Clear(); - Code::Flags flags = Code::ComputeFlags( - Code::HANDLER, MONOMORPHIC, kNoExtraICState, - Code::NORMAL, Code::STORE_IC); + Code::Flags flags = Code::ComputeHandlerFlags(Code::STORE_IC); CollectReceiverTypes(id, name, flags, receiver_types); } @@ -408,7 +327,7 @@ void TypeFeedbackOracle::CollectReceiverTypes(TypeFeedbackId ast_id, if (FLAG_collect_megamorphic_maps_from_stub_cache && code->ic_state() == MEGAMORPHIC) { types->Reserve(4, zone()); - isolate_->stub_cache()->CollectMatchingMaps( + isolate()->stub_cache()->CollectMatchingMaps( types, name, flags, native_context_, zone()); } else { CollectReceiverTypes(ast_id, types); @@ -487,11 +406,10 @@ byte TypeFeedbackOracle::ToBooleanTypes(TypeFeedbackId id) { void TypeFeedbackOracle::BuildDictionary(Handle<Code> code) { DisallowHeapAllocation no_allocation; ZoneList<RelocInfo> infos(16, zone()); - HandleScope scope(isolate_); + HandleScope scope(isolate()); GetRelocInfos(code, &infos); CreateDictionary(code, &infos); ProcessRelocInfos(&infos); - ProcessTypeFeedbackCells(code); // Allocate handle in the parent scope. dictionary_ = scope.CloseAndEscape(dictionary_); } @@ -509,24 +427,20 @@ void TypeFeedbackOracle::GetRelocInfos(Handle<Code> code, void TypeFeedbackOracle::CreateDictionary(Handle<Code> code, ZoneList<RelocInfo>* infos) { AllowHeapAllocation allocation_allowed; - int cell_count = code->type_feedback_info()->IsTypeFeedbackInfo() - ? TypeFeedbackInfo::cast(code->type_feedback_info())-> - type_feedback_cells()->CellCount() - : 0; - int length = infos->length() + cell_count; - byte* old_start = code->instruction_start(); - dictionary_ = isolate()->factory()->NewUnseededNumberDictionary(length); - byte* new_start = code->instruction_start(); - RelocateRelocInfos(infos, old_start, new_start); + Code* old_code = *code; + dictionary_ = UnseededNumberDictionary::New(isolate(), infos->length()); + RelocateRelocInfos(infos, old_code, *code); } void TypeFeedbackOracle::RelocateRelocInfos(ZoneList<RelocInfo>* infos, - byte* old_start, - byte* new_start) { + Code* old_code, + Code* new_code) { for (int i = 0; i < infos->length(); i++) { RelocInfo* info = &(*infos)[i]; - info->set_pc(new_start + (info->pc() - old_start)); + info->set_host(new_code); + info->set_pc(new_code->instruction_start() + + (info->pc() - old_code->instruction_start())); } } @@ -539,15 +453,8 @@ void TypeFeedbackOracle::ProcessRelocInfos(ZoneList<RelocInfo>* infos) { TypeFeedbackId(static_cast<unsigned>((*infos)[i].data())); Code* target = Code::GetCodeFromTargetAddress(target_address); switch (target->kind()) { - case Code::CALL_IC: - if (target->ic_state() == MONOMORPHIC && - target->check_type() != RECEIVER_MAP_CHECK) { - SetInfo(ast_id, Smi::FromInt(target->check_type())); - break; - } case Code::LOAD_IC: case Code::STORE_IC: - case Code::KEYED_CALL_IC: case Code::KEYED_LOAD_IC: case Code::KEYED_STORE_IC: case Code::BINARY_OP_IC: @@ -564,47 +471,14 @@ void TypeFeedbackOracle::ProcessRelocInfos(ZoneList<RelocInfo>* infos) { } -void TypeFeedbackOracle::ProcessTypeFeedbackCells(Handle<Code> code) { - Object* raw_info = code->type_feedback_info(); - if (!raw_info->IsTypeFeedbackInfo()) return; - Handle<TypeFeedbackCells> cache( - TypeFeedbackInfo::cast(raw_info)->type_feedback_cells()); - for (int i = 0; i < cache->CellCount(); i++) { - TypeFeedbackId ast_id = cache->AstId(i); - Cell* cell = cache->GetCell(i); - Object* value = cell->value(); - if (value->IsSmi() || - value->IsAllocationSite() || - (value->IsJSFunction() && - !CanRetainOtherContext(JSFunction::cast(value), - *native_context_))) { - SetInfo(ast_id, cell); - } - } -} - - void TypeFeedbackOracle::SetInfo(TypeFeedbackId ast_id, Object* target) { ASSERT(dictionary_->FindEntry(IdToKey(ast_id)) == UnseededNumberDictionary::kNotFound); - MaybeObject* maybe_result = dictionary_->AtNumberPut(IdToKey(ast_id), target); - USE(maybe_result); -#ifdef DEBUG - Object* result = NULL; // Dictionary has been allocated with sufficient size for all elements. - ASSERT(maybe_result->ToObject(&result)); - ASSERT(*dictionary_ == result); -#endif -} - - -Representation Representation::FromType(TypeInfo info) { - if (info.IsUninitialized()) return Representation::None(); - if (info.IsSmi()) return Representation::Smi(); - if (info.IsInteger32()) return Representation::Integer32(); - if (info.IsDouble()) return Representation::Double(); - if (info.IsNumber()) return Representation::Double(); - return Representation::Tagged(); + DisallowHeapAllocation no_need_to_resize_dictionary; + HandleScope scope(isolate()); + USE(UnseededNumberDictionary::AtNumberPut( + dictionary_, IdToKey(ast_id), handle(target, isolate()))); } |